Plan 9 from Bell Labs 2005-05-03

dist/replica/_plan9.db

@@ -411,7 +411,7 @@
 386/bin/syscall - 775 sys sys 1104122060 73536
 386/bin/tail - 775 sys sys 1104122060 65938
 386/bin/tar - 775 sys sys 1113794395 96205
-386/bin/tbl - 775 sys sys 1104122061 113124
+386/bin/tbl - 775 sys sys 1115003380 113176
 386/bin/tcs - 775 sys sys 1104122062 256588
 386/bin/tee - 775 sys sys 1104122062 38428
 386/bin/telco - 775 sys sys 1108354564 103315
@@ -7228,7 +7228,7 @@ sys/src/cmd/8l/optab.c - 664 sys sys 1111156413 16231
 sys/src/cmd/8l/pass.c - 664 sys sys 1095107668 13675
 sys/src/cmd/8l/span.c - 664 sys sys 1107721554 23294
 sys/src/cmd/9660srv - 20000000775 sys sys 944960735 0
-sys/src/cmd/9660srv/9660srv.c - 664 sys sys 1014924873 17018
+sys/src/cmd/9660srv/9660srv.c - 664 sys sys 1115039888 17143
 sys/src/cmd/9660srv/dat.h - 664 sys sys 1091904429 2097
 sys/src/cmd/9660srv/data.c - 664 sys sys 944960735 373
 sys/src/cmd/9660srv/fns.h - 664 sys sys 1019425186 428
@@ -11381,7 +11381,7 @@ sys/src/cmd/upas/ned/mkfile - 664 sys sys 1060041738 233
 sys/src/cmd/upas/ned/nedmail.c - 664 sys sys 1114697983 44543
 sys/src/cmd/upas/pop3 - 20000000775 sys sys 1015009816 0
 sys/src/cmd/upas/pop3/mkfile - 664 sys sys 1064589604 186
-sys/src/cmd/upas/pop3/pop3.c - 664 sys sys 1076176207 14301
+sys/src/cmd/upas/pop3/pop3.c - 664 sys sys 1115039848 14327
 sys/src/cmd/upas/q - 20000000775 sys sys 988250019 0
 sys/src/cmd/upas/q/mkfile - 664 sys sys 1064589601 262
 sys/src/cmd/upas/q/qer.c - 664 sys sys 1014926528 3179
@@ -12963,4 +12963,5 @@ 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/tbl - 775 sys sys 1115003380 113176
+386/bin/9660srv - 775 sys sys 1115089909 104037
+386/bin/upas/pop3 - 775 sys sys 1115089909 259875

dist/replica/plan9.db

@@ -17,7 +17,7 @@
 386/bin/8a - 775 sys sys 1108285260 115096
 386/bin/8c - 775 sys sys 1113620963 358011
 386/bin/8l - 775 sys sys 1107835553 115728
-386/bin/9660srv - 775 sys sys 1113794389 103976
+386/bin/9660srv - 775 sys sys 1115089909 104037
 386/bin/aan - 775 sys sys 1108354539 130710
 386/bin/acid - 775 sys sys 1114484867 389719
 386/bin/acme - 775 sys sys 1111637282 428512
@@ -453,7 +453,7 @@
 386/bin/upas/msgcat - 775 sys sys 1064598353 38
 386/bin/upas/msgtok - 775 sys sys 1064598354 75149
 386/bin/upas/nedmail - 775 sys sys 1114744259 156346
-386/bin/upas/pop3 - 775 sys sys 1113794399 259820
+386/bin/upas/pop3 - 775 sys sys 1115089909 259875
 386/bin/upas/qer - 775 sys sys 1113794399 99878
 386/bin/upas/ratfs - 775 sys sys 1108354565 111342
 386/bin/upas/runq - 775 sys sys 1113794400 113527
@@ -7228,7 +7228,7 @@ sys/src/cmd/8l/optab.c - 664 sys sys 1111156413 16231
 sys/src/cmd/8l/pass.c - 664 sys sys 1095107668 13675
 sys/src/cmd/8l/span.c - 664 sys sys 1107721554 23294
 sys/src/cmd/9660srv - 20000000775 sys sys 944960735 0
-sys/src/cmd/9660srv/9660srv.c - 664 sys sys 1014924873 17018
+sys/src/cmd/9660srv/9660srv.c - 664 sys sys 1115039888 17143
 sys/src/cmd/9660srv/dat.h - 664 sys sys 1091904429 2097
 sys/src/cmd/9660srv/data.c - 664 sys sys 944960735 373
 sys/src/cmd/9660srv/fns.h - 664 sys sys 1019425186 428
@@ -11381,7 +11381,7 @@ sys/src/cmd/upas/ned/mkfile - 664 sys sys 1060041738 233
 sys/src/cmd/upas/ned/nedmail.c - 664 sys sys 1114697983 44543
 sys/src/cmd/upas/pop3 - 20000000775 sys sys 1015009816 0
 sys/src/cmd/upas/pop3/mkfile - 664 sys sys 1064589604 186
-sys/src/cmd/upas/pop3/pop3.c - 664 sys sys 1076176207 14301
+sys/src/cmd/upas/pop3/pop3.c - 664 sys sys 1115039848 14327
 sys/src/cmd/upas/q - 20000000775 sys sys 988250019 0
 sys/src/cmd/upas/q/mkfile - 664 sys sys 1064589601 262
 sys/src/cmd/upas/q/qer.c - 664 sys sys 1014926528 3179

dist/replica/plan9.log

@@ -14861,3 +14861,7 @@
 1114968697 0 c sys/src/cmd/tbl/t1.c - 664 sys sys 1114967760 1604
 1114983105 0 c sys/src/9/pc/sdata.c - 664 sys sys 1114981770 51181
 1115004709 0 c 386/bin/tbl - 775 sys sys 1115003380 113176
+1115040711 0 c sys/src/cmd/9660srv/9660srv.c - 664 sys sys 1115039888 17143
+1115040711 1 c sys/src/cmd/upas/pop3/pop3.c - 664 sys sys 1115039848 14327
+1115091132 0 c 386/bin/9660srv - 775 sys sys 1115089909 104037
+1115091132 1 c 386/bin/upas/pop3 - 775 sys sys 1115089909 259875

sys/src/cmd/9660srv/9660srv.c

@@ -707,6 +707,11 @@ rzdir(Xfs *fs, Dir *d, int fmt, Drec *dp)
 			s += fs->suspoff;
 			sysl -= fs->suspoff;
 			for(; sysl >= 4 && have != (Hname|Hmode); sysl -= l, s += l){
+				if(s[0] == 0 && ((ulong)s & 1)){
+					/* MacOS pads individual entries, contrary to spec */
+					s++;
+					sysl--;
+				}
 				l = s[2];
 				if(s[0] == 'P' && s[1] == 'X' && s[3] == 1){
 					/* posix file attributes */

sys/src/cmd/upas/pop3/pop3.c

@@ -244,8 +244,9 @@ readmbox(char *box)
 		for(;;){
 			p = Brdline(b, '\n');
 			if(p == nil){
-				if(Blinelen(b) == 0)
+				if((n = Blinelen(b)) == 0)
 					break;
+				Bseek(b, n, 1);
 			}else
 				lines++;
 		}