Browse Source

Plan 9 from Bell Labs 2006-09-25

David du Colombier 17 years ago
parent
commit
c58da95357
4 changed files with 6 additions and 5 deletions
  1. 1 1
      dist/replica/_plan9.db
  2. 1 1
      dist/replica/plan9.db
  3. 1 0
      dist/replica/plan9.log
  4. 3 3
      sys/src/cmd/compress/compress.c

+ 1 - 1
dist/replica/_plan9.db

@@ -9891,7 +9891,7 @@ sys/src/cmd/cmp.c - 664 sys sys 1157581072 2491
 sys/src/cmd/colors.c - 664 sys sys 951763912 3186
 sys/src/cmd/comm.c - 664 sys sys 1093979717 2140
 sys/src/cmd/compress - 20000000775 sys sys 1157679448 0
-sys/src/cmd/compress/compress.c - 664 sys sys 1157679448 31907
+sys/src/cmd/compress/compress.c - 664 sys sys 1159150971 31929
 sys/src/cmd/compress/mkfile - 664 sys sys 1157679443 118
 sys/src/cmd/con - 20000000775 sys sys 944961996 0
 sys/src/cmd/con/con.c - 664 sys sys 1143759347 15227

+ 1 - 1
dist/replica/plan9.db

@@ -9891,7 +9891,7 @@ sys/src/cmd/cmp.c - 664 sys sys 1157581072 2491
 sys/src/cmd/colors.c - 664 sys sys 951763912 3186
 sys/src/cmd/comm.c - 664 sys sys 1093979717 2140
 sys/src/cmd/compress - 20000000775 sys sys 1157679448 0
-sys/src/cmd/compress/compress.c - 664 sys sys 1157679448 31907
+sys/src/cmd/compress/compress.c - 664 sys sys 1159150971 31929
 sys/src/cmd/compress/mkfile - 664 sys sys 1157679443 118
 sys/src/cmd/con - 20000000775 sys sys 944961996 0
 sys/src/cmd/con/con.c - 664 sys sys 1143759347 15227

+ 1 - 0
dist/replica/plan9.log

@@ -30492,3 +30492,4 @@
 1158980406 0 c sys/src/9/port/devfs.c - 664 sys sys 1158979963 10897
 1158984007 0 c sys/src/cmd/dd.c - 664 sys sys 1158983783 11831
 1159039806 0 c 386/bin/dd - 775 sys sys 1159039156 45991
+1159151407 0 c sys/src/cmd/compress/compress.c - 664 sys sys 1159150971 31929

+ 3 - 3
sys/src/cmd/compress/compress.c

@@ -972,13 +972,13 @@ char *ifname, *ofname;
 			fprintf(stderr, "%s: ", ifname);
 		fprintf(stderr, " -- not a regular file: unchanged");
 		exit_stat = 1;
-	} else if (exit_stat == 2 && (!force)) {
+	} else if (exit_stat == 2 && !force) {
 		/* No compression: remove file.Z */
 		if (!quiet)
 			fprintf(stderr, " -- file unchanged");
 	} else {			/* Successful Compression */
 		exit_stat = 0;
-		mode = statbuf.st_mode & 07777;
+		mode = statbuf.st_mode & 0777;
 		if (chmod(ofname, mode))		/* Copy modes */
 			perror(ofname);
 		/* Copy ownership */
@@ -987,9 +987,9 @@ char *ifname, *ofname;
 		timep[1] = statbuf.st_mtime;
 		/* Update last accessed and modified times */
 		utime(ofname, timep);
-
 //		if (unlink(ifname))	/* Remove input file */
 //			perror(ifname);
+		return;			/* success */
 	}
 
 	/* Unsuccessful return -- one of the tests failed */