Plan 9 from Bell Labs 2005-01-12

dist/replica/_plan9.db

@@ -2777,7 +2777,7 @@ lib/ndb/consoledb - 664 sys sys 960222421 95
 lib/ndb/dhcp - 20000000775 sys sys 959260749 0
 lib/ndb/dnsdump - 664 sys sys 1032057649 61
 lib/ndb/local - 664 sys sys 1077723747 292
-lib/ndb/local.complicated - 664 sys sys 1032354376 2740
+lib/ndb/local.complicated - 664 sys sys 1105461604 2976
 lib/ndb/nfs - 664 sys sys 954036707 113
 lib/news - 20000000775 sys sys 944943954 0
 lib/sky - 20000000775 sys sys 1079376081 0
@@ -9550,7 +9550,7 @@ sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
 sys/src/cmd/join.c - 664 sys sys 944961364 7488
 sys/src/cmd/jpg - 20000000775 sys sys 988249983 0
 sys/src/cmd/jpg/bmp.c - 664 sys sys 1079970078 4217
-sys/src/cmd/jpg/bmp.h - 664 sys sys 1079970081 975
+sys/src/cmd/jpg/bmp.h - 664 sys sys 1105455271 1034
 sys/src/cmd/jpg/close.c - 664 sys sys 944961292 1930
 sys/src/cmd/jpg/gif.c - 664 sys sys 1045505400 8844
 sys/src/cmd/jpg/ico.c - 664 sys sys 1072107030 8799
@@ -9562,7 +9562,7 @@ sys/src/cmd/jpg/multichan.c - 664 sys sys 1039753047 825
 sys/src/cmd/jpg/onechan.c - 664 sys sys 1039753044 3732
 sys/src/cmd/jpg/png.c - 664 sys sys 1014926432 4655
 sys/src/cmd/jpg/ppm.c - 664 sys sys 944961292 4190
-sys/src/cmd/jpg/readbmp.c - 664 sys sys 1079970079 13697
+sys/src/cmd/jpg/readbmp.c - 664 sys sys 1105455271 13691
 sys/src/cmd/jpg/readgif.c - 664 sys sys 1014926433 10306
 sys/src/cmd/jpg/readjpg.c - 664 sys sys 1032060302 33009
 sys/src/cmd/jpg/readpng.c - 664 sys sys 1068773222 6914
@@ -12453,3 +12453,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/bmp - 775 sys sys 1105502893 157210

dist/replica/plan9.db

@@ -163,7 +163,7 @@
 386/bin/bitsy/params - 775 sys sys 1104121990 58776
 386/bin/bitsy/pencal - 775 sys sys 1104121991 117190
 386/bin/bitsy/prompter - 775 sys sys 1104121991 285657
-386/bin/bmp - 775 sys sys 1104121992 157210
+386/bin/bmp - 775 sys sys 1105502893 157210
 386/bin/bunzip2 - 775 sys sys 1104121992 97499
 386/bin/bzip2 - 775 sys sys 1104121992 114034
 386/bin/cal - 775 sys sys 1104121993 67886
@@ -2777,7 +2777,7 @@ lib/ndb/consoledb - 664 sys sys 960222421 95
 lib/ndb/dhcp - 20000000775 sys sys 959260749 0
 lib/ndb/dnsdump - 664 sys sys 1032057649 61
 lib/ndb/local - 664 sys sys 1077723747 292
-lib/ndb/local.complicated - 664 sys sys 1032354376 2740
+lib/ndb/local.complicated - 664 sys sys 1105461604 2976
 lib/ndb/nfs - 664 sys sys 954036707 113
 lib/news - 20000000775 sys sys 944943954 0
 lib/sky - 20000000775 sys sys 1079376081 0
@@ -9550,7 +9550,7 @@ sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
 sys/src/cmd/join.c - 664 sys sys 944961364 7488
 sys/src/cmd/jpg - 20000000775 sys sys 988249983 0
 sys/src/cmd/jpg/bmp.c - 664 sys sys 1079970078 4217
-sys/src/cmd/jpg/bmp.h - 664 sys sys 1079970081 975
+sys/src/cmd/jpg/bmp.h - 664 sys sys 1105455271 1034
 sys/src/cmd/jpg/close.c - 664 sys sys 944961292 1930
 sys/src/cmd/jpg/gif.c - 664 sys sys 1045505400 8844
 sys/src/cmd/jpg/ico.c - 664 sys sys 1072107030 8799
@@ -9562,7 +9562,7 @@ sys/src/cmd/jpg/multichan.c - 664 sys sys 1039753047 825
 sys/src/cmd/jpg/onechan.c - 664 sys sys 1039753044 3732
 sys/src/cmd/jpg/png.c - 664 sys sys 1014926432 4655
 sys/src/cmd/jpg/ppm.c - 664 sys sys 944961292 4190
-sys/src/cmd/jpg/readbmp.c - 664 sys sys 1079970079 13697
+sys/src/cmd/jpg/readbmp.c - 664 sys sys 1105455271 13691
 sys/src/cmd/jpg/readgif.c - 664 sys sys 1014926433 10306
 sys/src/cmd/jpg/readjpg.c - 664 sys sys 1032060302 33009
 sys/src/cmd/jpg/readpng.c - 664 sys sys 1068773222 6914

dist/replica/plan9.log

@@ -18340,3 +18340,7 @@
 1105194679 0 c lib/vgadb - 664 sys sys 1105192978 28703
 1105194679 1 c sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364
 1105407037 0 c sys/games/lib/fortunes - 664 sys sys 1105406030 251918
+1105455647 0 c sys/src/cmd/jpg/bmp.h - 664 sys sys 1105455271 1034
+1105455647 1 c sys/src/cmd/jpg/readbmp.c - 664 sys sys 1105455271 13691
+1105462848 0 c lib/ndb/local.complicated - 664 sys sys 1105461604 2976
+1105504262 0 c 386/bin/bmp - 775 sys sys 1105502893 157210

lib/ndb/local.complicated

@@ -20,15 +20,24 @@ dom=
 	ns=G.ROOT-SERVERS.NET
 	ns=H.ROOT-SERVERS.NET
 	ns=I.ROOT-SERVERS.NET
+	ns=J.ROOT-SERVERS.NET
+	ns=K.ROOT-SERVERS.NET
+	ns=L.ROOT-SERVERS.NET
+	ns=M.ROOT-SERVERS.NET
 dom=A.ROOT-SERVERS.NET ip=198.41.0.4
-dom=B.ROOT-SERVERS.NET ip=128.9.0.107
+dom=B.ROOT-SERVERS.NET ip=192.228.79.201
 dom=C.ROOT-SERVERS.NET ip=192.33.4.12
 dom=D.ROOT-SERVERS.NET ip=128.8.10.90
 dom=E.ROOT-SERVERS.NET ip=192.203.230.10
-dom=F.ROOT-SERVERS.NET ip=192.5.5.241 ip=39.13.229.241
+dom=F.ROOT-SERVERS.NET ip=192.5.5.241
 dom=G.ROOT-SERVERS.NET ip=192.112.36.4
 dom=H.ROOT-SERVERS.NET ip=128.63.2.53
 dom=I.ROOT-SERVERS.NET ip=192.36.148.17
+dom=J.ROOT-SERVERS.NET ip=192.58.128.30
+dom=K.ROOT-SERVERS.NET ip=193.0.14.129
+dom=L.ROOT-SERVERS.NET ip=198.32.64.12
+dom=M.ROOT-SERVERS.NET ip=202.12.27.33
+
 
 
 #  select one of the following two entries:

sys/src/cmd/jpg/bmp.h

@@ -11,9 +11,11 @@ typedef struct {
 	uchar alpha;
 } Rgb;
 
+#define Filehdrsz	14
+
 typedef struct {
         short	type;
-        long	size;
+        long	size;		/* file size, not structure size */
         short	reserved1;
         short	reserved2;
         long	offbits;

sys/src/cmd/jpg/readbmp.c

@@ -489,7 +489,7 @@ ReadBMP(Biobuf *b, int *width, int *height)
 
 	if(num_coltab) {
 		int i; 
-		Bseek(b, bmih.size + sizeof(Infohdr), 0);
+		Bseek(b, bmih.size + Filehdrsz, 0);
 
 		for(i = 0; i < num_coltab; i++) {
 			clut[i].blue  = (uchar)Bgetc(b);