Browse Source

Plan 9 from Bell Labs 2008-05-22

David du Colombier 16 years ago
parent
commit
5185233bdd
4 changed files with 10 additions and 15 deletions
  1. 1 1
      dist/replica/_plan9.db
  2. 1 1
      dist/replica/plan9.db
  3. 1 0
      dist/replica/plan9.log
  4. 7 13
      sys/src/cmd/uniq.c

+ 1 - 1
dist/replica/_plan9.db

@@ -13656,7 +13656,7 @@ sys/src/cmd/troff2html/mkfile - 664 sys sys 1105631961 242
 sys/src/cmd/troff2html/troff2html.c - 664 sys sys 1132450028 14280
 sys/src/cmd/tweak.c - 664 sys sys 1166822151 38956
 sys/src/cmd/unicode.c - 664 sys sys 944961351 1953
-sys/src/cmd/uniq.c - 664 sys sys 944961351 2236
+sys/src/cmd/uniq.c - 664 sys sys 1211408347 2173
 sys/src/cmd/units.y - 664 sys sys 1014926801 10979
 sys/src/cmd/unix - 20000000775 sys sys 1128520305 0
 sys/src/cmd/unix/9pfreebsd - 20000000775 sys sys 1039727596 0

+ 1 - 1
dist/replica/plan9.db

@@ -13656,7 +13656,7 @@ sys/src/cmd/troff2html/mkfile - 664 sys sys 1105631961 242
 sys/src/cmd/troff2html/troff2html.c - 664 sys sys 1132450028 14280
 sys/src/cmd/tweak.c - 664 sys sys 1166822151 38956
 sys/src/cmd/unicode.c - 664 sys sys 944961351 1953
-sys/src/cmd/uniq.c - 664 sys sys 944961351 2236
+sys/src/cmd/uniq.c - 664 sys sys 1211408347 2173
 sys/src/cmd/units.y - 664 sys sys 1014926801 10979
 sys/src/cmd/unix - 20000000775 sys sys 1128520305 0
 sys/src/cmd/unix/9pfreebsd - 20000000775 sys sys 1039727596 0

+ 1 - 0
dist/replica/plan9.log

@@ -19677,3 +19677,4 @@
 1211256004 11 c 386/bin/venti/syncindex - 775 sys sys 1211255730 267334
 1211256004 12 c 386/bin/venti/venti - 775 sys sys 1211255746 706064
 1211256004 13 c 386/bin/venti/wrarena - 775 sys sys 1211255752 284303
+1211409030 0 c sys/src/cmd/uniq.c - 664 sys sys 1211408347 2173

+ 7 - 13
sys/src/cmd/uniq.c

@@ -28,6 +28,7 @@ main(int argc, char *argv[])
 {
 	int f;
 
+	argv0 = argv[0];
 	bsize = SIZE;
 	b1 = malloc(bsize);
 	b2 = malloc(bsize);
@@ -49,16 +50,12 @@ main(int argc, char *argv[])
 			continue;
 		}
 		f = open(argv[1], 0);
-		if(f < 0) {
-			fprint(2, "cannot open %s\n", argv[1]);
-			exits("open");
-		}
+		if(f < 0)
+			sysfatal("cannot open %s", argv[1]);
 		break;
 	}
-	if(argc > 2) {
-		fprint(2, "unexpected argument %s\n", argv[2]);
-		exits("arg");
-	}
+	if(argc > 2)
+		sysfatal("unexpected argument %s", argv[2]);
 	Binit(&fin, f, OREAD);
 	Binit(&fout, 1, OWRITE);
 
@@ -94,10 +91,8 @@ gline(char *buf)
 	p = Brdline(&fin, '\n');
 	if(p == 0)
 		return 1;
-	if(fin.rdline >= bsize-1) {
-		fprint(2, "line too long\n");
-		exits("too long");
-	}
+	if(fin.rdline >= bsize-1)
+		sysfatal("line too long");
 	memmove(buf, p, fin.rdline);
 	buf[fin.rdline-1] = 0;
 	return 0;
@@ -106,7 +101,6 @@ gline(char *buf)
 void
 pline(char *buf)
 {
-
 	switch(mode) {
 
 	case 'u':