Browse Source

Plan 9 from Bell Labs 2005-06-18

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

+ 2 - 1
dist/replica/_plan9.db

@@ -12707,7 +12707,7 @@ sys/src/cmd/proof/main.c - 664 sys sys 955242172 3268
 sys/src/cmd/proof/mkfile - 664 sys sys 944961622 180
 sys/src/cmd/proof/proof.h - 664 sys sys 955223407 919
 sys/src/cmd/proof/screen.c - 664 sys sys 1014926867 6659
-sys/src/cmd/ps.c - 664 sys sys 1014926697 2352
+sys/src/cmd/ps.c - 664 sys sys 1119012350 2403
 sys/src/cmd/pwd.c - 664 sys sys 1067722792 287
 sys/src/cmd/qa - 20000000775 sys sys 954037936 0
 sys/src/cmd/qa/a.h - 664 sys sys 1089299169 3252
@@ -15051,3 +15051,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/ps - 775 sys sys 1119063981 66688

+ 2 - 2
dist/replica/plan9.db

@@ -365,7 +365,7 @@
 386/bin/primes - 775 sys sys 1115950104 38793
 386/bin/prof - 775 sys sys 1115950104 106950
 386/bin/proof - 775 sys sys 1115950105 178410
-386/bin/ps - 775 sys sys 1115950105 65805
+386/bin/ps - 775 sys sys 1119063981 66688
 386/bin/pwd - 775 sys sys 1115950105 36897
 386/bin/ramfs - 775 sys sys 1115950105 89167
 386/bin/rc - 775 sys sys 1115950106 143210
@@ -12707,7 +12707,7 @@ sys/src/cmd/proof/main.c - 664 sys sys 955242172 3268
 sys/src/cmd/proof/mkfile - 664 sys sys 944961622 180
 sys/src/cmd/proof/proof.h - 664 sys sys 955223407 919
 sys/src/cmd/proof/screen.c - 664 sys sys 1014926867 6659
-sys/src/cmd/ps.c - 664 sys sys 1014926697 2352
+sys/src/cmd/ps.c - 664 sys sys 1119012350 2403
 sys/src/cmd/pwd.c - 664 sys sys 1067722792 287
 sys/src/cmd/qa - 20000000775 sys sys 954037936 0
 sys/src/cmd/qa/a.h - 664 sys sys 1089299169 3252

+ 2 - 0
dist/replica/plan9.log

@@ -19502,3 +19502,5 @@
 1118892691 1 c 386/bin/games/5s - 775 sys sys 1118891246 178075
 1118892691 2 c 386/bin/hget - 775 sys sys 1118891247 231963
 1118892691 3 c 386/bin/auth/changeuser - 775 sys sys 1118891246 97026
+1119013317 0 c sys/src/cmd/ps.c - 664 sys sys 1119012350 2403
+1119065410 0 c 386/bin/ps - 775 sys sys 1119063981 66688

+ 7 - 7
sys/src/cmd/ps.c

@@ -57,7 +57,7 @@ ps(char *s)
 	int i, n, fd;
 	char buf[64];
 	int basepri, pri;
-	long utime, stime, size;
+	ulong utime, stime, size;
 	char pbuf[8];
 #define NAMELEN 28
 	char status[2*NAMELEN+12+9*12+1];
@@ -82,16 +82,16 @@ ps(char *s)
 		return;
 	*p = 0;
 	status[2*NAMELEN+12-1] = 0;
-	utime = atol(status+2*NAMELEN+12)/1000;
-	stime = atol(status+2*NAMELEN+12+1*12)/1000;
-	size  = atol(status+2*NAMELEN+12+6*12);
+	utime = strtoul(status+2*NAMELEN+12, 0, 0)/1000;
+	stime = strtoul(status+2*NAMELEN+12+1*12, 0, 0)/1000;
+	size  = strtoul(status+2*NAMELEN+12+6*12, 0, 0);
 	if(pflag){
-		basepri = atol(status+2*NAMELEN+12+7*12);
-		pri = atol(status+2*NAMELEN+12+8*12);
+		basepri = strtoul(status+2*NAMELEN+12+7*12, 0, 0);
+		pri = strtoul(status+2*NAMELEN+12+8*12, 0, 0);
 		sprint(pbuf, " %2d %2d", basepri, pri);
 	} else
 		pbuf[0] = 0;
-	Bprint(&bout, "%-10s %8s %4ld:%.2ld %3ld:%.2ld%s %7ldK %-.8s ",
+	Bprint(&bout, "%-10s %8s %4lud:%.2lud %3lud:%.2lud%s %7ludK %-.8s ",
 			status+NAMELEN,
 			s,
 			utime/60, utime%60,