Browse Source

Plan 9 from Bell Labs 2012-05-30

David du Colombier 12 years ago
parent
commit
07d18e4c67
3 changed files with 3 additions and 3 deletions
  1. 1 1
      sys/src/9/pc/archmp.c
  2. 1 1
      sys/src/cmd/lp/lpsend.c
  3. 1 1
      sys/src/libndb/dnsquery.c

+ 1 - 1
sys/src/9/pc/archmp.c

@@ -48,7 +48,7 @@ mpsearch(void)
 	}
 	else{
 		p = ((bda[0x14]<<8)|bda[0x13])*1024;
-		if(mp = mpscan(KADDR(p-1024), 1024))
+		if(p != 0 && (mp = mpscan(KADDR(p-1024), 1024)) != nil)
 			return mp;
 	}
 	return mpscan(KADDR(0xF0000), 0x10000);

+ 1 - 1
sys/src/cmd/lp/lpsend.c

@@ -217,7 +217,7 @@ recvACK(int netfd)
 		if (*jobbuf == '\0')
 			error(1, "read failed\n");
 		else
-			error(1, "received <0x%x> instead\n", *jobbuf);
+			error(1, "received <%#x> instead\n", (uchar)*jobbuf);
 		rv = 0;
 	} else rv = 1;
 	alarm(0);

+ 1 - 1
sys/src/libndb/dnsquery.c

@@ -81,7 +81,7 @@ mkptrname(char *ip, char *rip, int rlen)
 	char *p, *np;
 	int len;
 
-	if(strstr(ip, "in-addr.arpa") || strstr(ip, "IN-ADDR.ARPA")){
+	if(cistrstr(ip, "in-addr.arpa") || cistrstr(ip, "ip6.arpa")){
 		nstrcpy(rip, ip, rlen);
 		return;
 	}