Plan 9 from Bell Labs 2013-08-04

rc/bin/loadfossil

@@ -46,7 +46,7 @@ proto=$3
 fossconf=$4
 
 if (test -e /srv/fossil -o -e /srv/fossil.open) {
-	echo $0: /srv/fossil* exists, not safe to start a new one >[1=2]
+	echo $0: /srv/fossil* exists, not safe to start a new fossil >[1=2]
 	exit fossil-already-running
 }
 

sys/lib/dist/pc/mkfile

@@ -83,8 +83,8 @@ cddisk:D: 9load /sys/src/9/pc/9pcflop.gz plan9.ini.cd /lib/vgadb
 usbdisk:D: /n/sources/plan9
 	cd $scr
 	mkusbboot -s 1900 -r /n/sources/plan9 && mv image $target
-	rm -f $target.gz
-	gzip -9 $target
+	rm -f $target.bz2
+	bzip2 $target && rm -f $target
 	pwd
 	ls -l $target*
 

sys/src/libip/parseip.c

@@ -73,7 +73,8 @@ parseip(uchar *to, char *from)
 	for(i = 0; i < IPaddrlen && ipcharok(*p); i+=2){
 		op = p;
 		x = strtoul(p, &p, 16);
-		if(*p == '.' || (*p == 0 && i == 0)){	/* ends with v4? */
+		if((*p == '.' && i <= IPaddrlen-4) || (*p == 0 && i == 0)){
+			/* ends with v4 */
 			p = v4parseip(to+i, op);
 			i += 4;
 			break;