Browse Source

Plan 9 from Bell Labs 2006-09-15

David du Colombier 17 years ago
parent
commit
414a0af793
6 changed files with 16 additions and 10 deletions
  1. 4 4
      dist/replica/_plan9.db
  2. 4 4
      dist/replica/plan9.db
  3. 4 0
      dist/replica/plan9.log
  4. 1 1
      sys/man/1/2a
  5. 1 1
      sys/man/1/2l
  6. 2 0
      sys/src/cmd/join.c

+ 4 - 4
dist/replica/_plan9.db

@@ -315,7 +315,7 @@
 386/bin/ip/tftpd - 775 sys sys 1157916204 132137
 386/bin/ip/traceroute - 775 sys sys 1148500665 74067
 386/bin/ip/udpecho - 775 sys sys 1148500666 43190
-386/bin/join - 775 sys sys 1148500666 114393
+386/bin/join - 775 sys sys 1158261630 114476
 386/bin/jpg - 775 sys sys 1150062739 175017
 386/bin/kbmap - 775 sys sys 1155491753 144109
 386/bin/kprof - 775 sys sys 1148500667 105499
@@ -7253,9 +7253,9 @@ sys/log/timesync.d - 20000000775 sys sys 947099701 0
 sys/man - 20000000775 sys sys 1012278794 0
 sys/man/1 - 20000000775 sys sys 1018897631 0
 sys/man/1/0intro - 664 sys sys 1101668050 9625
-sys/man/1/2a - 664 sys sys 1143293894 1192
+sys/man/1/2a - 664 sys sys 1158281866 1196
 sys/man/1/2c - 664 sys sys 1143293856 8288
-sys/man/1/2l - 664 sys sys 1143293894 4372
+sys/man/1/2l - 664 sys sys 1158281887 4376
 sys/man/1/INDEX - 664 sys sys 1141357442 3040
 sys/man/1/INDEX.html - 664 sys sys 1141352366 16517
 sys/man/1/acid - 664 sys sys 1134233059 9730
@@ -12444,7 +12444,7 @@ sys/src/cmd/ip/telnetd.c - 664 sys sys 1135487948 11772
 sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
 sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
 sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
-sys/src/cmd/join.c - 664 sys sys 944961364 7488
+sys/src/cmd/join.c - 664 sys sys 1158251357 7550
 sys/src/cmd/jpg - 20000000775 sys sys 988249983 0
 sys/src/cmd/jpg/bmp.c - 664 sys sys 1108852826 4222
 sys/src/cmd/jpg/bmp.h - 664 sys sys 1105455271 1034

+ 4 - 4
dist/replica/plan9.db

@@ -315,7 +315,7 @@
 386/bin/ip/tftpd - 775 sys sys 1157916204 132137
 386/bin/ip/traceroute - 775 sys sys 1148500665 74067
 386/bin/ip/udpecho - 775 sys sys 1148500666 43190
-386/bin/join - 775 sys sys 1148500666 114393
+386/bin/join - 775 sys sys 1158261630 114476
 386/bin/jpg - 775 sys sys 1150062739 175017
 386/bin/kbmap - 775 sys sys 1155491753 144109
 386/bin/kprof - 775 sys sys 1148500667 105499
@@ -7253,9 +7253,9 @@ sys/log/timesync.d - 20000000775 sys sys 947099701 0
 sys/man - 20000000775 sys sys 1012278794 0
 sys/man/1 - 20000000775 sys sys 1018897631 0
 sys/man/1/0intro - 664 sys sys 1101668050 9625
-sys/man/1/2a - 664 sys sys 1143293894 1192
+sys/man/1/2a - 664 sys sys 1158281866 1196
 sys/man/1/2c - 664 sys sys 1143293856 8288
-sys/man/1/2l - 664 sys sys 1143293894 4372
+sys/man/1/2l - 664 sys sys 1158281887 4376
 sys/man/1/INDEX - 664 sys sys 1141357442 3040
 sys/man/1/INDEX.html - 664 sys sys 1141352366 16517
 sys/man/1/acid - 664 sys sys 1134233059 9730
@@ -12444,7 +12444,7 @@ sys/src/cmd/ip/telnetd.c - 664 sys sys 1135487948 11772
 sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
 sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
 sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
-sys/src/cmd/join.c - 664 sys sys 944961364 7488
+sys/src/cmd/join.c - 664 sys sys 1158251357 7550
 sys/src/cmd/jpg - 20000000775 sys sys 988249983 0
 sys/src/cmd/jpg/bmp.c - 664 sys sys 1108852826 4222
 sys/src/cmd/jpg/bmp.h - 664 sys sys 1105455271 1034

+ 4 - 0
dist/replica/plan9.log

@@ -30443,3 +30443,7 @@
 1158102006 1 c sys/src/boot/pc/bootp.c - 664 sys sys 1158100619 12438
 1158183005 0 c 386/9loaddebug - 775 sys sys 1158181386 315977
 1158202806 0 c sys/man/1/pr - 664 sys sys 1158202686 1819
+1158251406 0 c sys/src/cmd/join.c - 664 sys sys 1158251357 7550
+1158262206 0 c 386/bin/join - 775 sys sys 1158261630 114476
+1158282007 0 c sys/man/1/2a - 664 sys sys 1158281866 1196
+1158282007 1 c sys/man/1/2l - 664 sys sys 1158281887 4376

+ 1 - 1
sys/man/1/2a

@@ -1,6 +1,6 @@
 .TH 2A 1 
 .SH NAME
-0a, 1a, 2a, 5a, 7a, 8a, ka, qa, va \- assemblers
+0a, 1a, 2a, 5a, 6a, 7a, 8a, ka, qa, va \- assemblers
 .SH SYNOPSIS
 .B 2a
 [

+ 1 - 1
sys/man/1/2l

@@ -1,6 +1,6 @@
 .TH 2L 1 
 .SH NAME
-0l, 1l, 2l, 5l, 7l, 8l, kl, ql, vl \- loaders
+0l, 1l, 2l, 5l, 6l, 7l, 8l, kl, ql, vl \- loaders
 .SH SYNOPSIS
 .B 2l
 [

+ 2 - 0
sys/src/cmd/join.c

@@ -114,6 +114,8 @@ proceed:
 			error("field number too big in -o","");
 	if (argc != 3)
 		error("usage: join [-1 x -2 y] [-o list] file1 file2","");
+	if (j1 < 1  || j2 < 1)
+		error("invalid field indices", "");
 	j1--;
 	j2--;	/* everyone else believes in 0 origin */
 	s1 = ppi[F1][j1];