Browse Source

Plan 9 from Bell Labs 2004-12-27

David du Colombier 19 years ago
parent
commit
da588ae96d

+ 3 - 3
dist/replica/_plan9.db

@@ -11645,11 +11645,11 @@ sys/src/libc/arm/tas.s - 664 sys sys 984709514 62
 sys/src/libc/arm/vlop.s - 664 sys sys 984709514 262
 sys/src/libc/arm/vlrt.c - 664 sys sys 1067719009 8950
 sys/src/libc/fmt - 20000000775 sys sys 1014927318 0
-sys/src/libc/fmt/dofmt.c - 664 sys sys 1084468557 8555
+sys/src/libc/fmt/dofmt.c - 664 sys sys 1104099108 8565
 sys/src/libc/fmt/dorfmt.c - 664 sys sys 1014927313 777
 sys/src/libc/fmt/errfmt.c - 664 sys sys 1016731560 175
 sys/src/libc/fmt/fltfmt.c - 664 sys sys 1034952854 4339
-sys/src/libc/fmt/fmt.c - 664 sys sys 1028218352 2935
+sys/src/libc/fmt/fmt.c - 664 sys sys 1104100968 3102
 sys/src/libc/fmt/fmtdef.h - 664 sys sys 1018029975 1808
 sys/src/libc/fmt/fmtfd.c - 664 sys sys 1014927314 508
 sys/src/libc/fmt/fmtlock.c - 664 sys sys 1014927314 134
@@ -12269,7 +12269,7 @@ sys/src/libsec/port/md4.c - 664 sys sys 1015013579 4260
 sys/src/libsec/port/md4test.c - 664 sys sys 984710522 537
 sys/src/libsec/port/md5.c - 664 sys sys 1084318868 3254
 sys/src/libsec/port/md5block.c - 664 sys sys 985124885 5015
-sys/src/libsec/port/md5pickle.c - 664 sys sys 1081199854 716
+sys/src/libsec/port/md5pickle.c - 664 sys sys 1104105067 716
 sys/src/libsec/port/mkfile - 664 sys sys 1044931345 879
 sys/src/libsec/port/nfastrand.c - 664 sys sys 1063853595 354
 sys/src/libsec/port/primetest.c - 664 sys sys 984710523 2486

+ 3 - 3
dist/replica/plan9.db

@@ -11645,11 +11645,11 @@ sys/src/libc/arm/tas.s - 664 sys sys 984709514 62
 sys/src/libc/arm/vlop.s - 664 sys sys 984709514 262
 sys/src/libc/arm/vlrt.c - 664 sys sys 1067719009 8950
 sys/src/libc/fmt - 20000000775 sys sys 1014927318 0
-sys/src/libc/fmt/dofmt.c - 664 sys sys 1084468557 8555
+sys/src/libc/fmt/dofmt.c - 664 sys sys 1104099108 8565
 sys/src/libc/fmt/dorfmt.c - 664 sys sys 1014927313 777
 sys/src/libc/fmt/errfmt.c - 664 sys sys 1016731560 175
 sys/src/libc/fmt/fltfmt.c - 664 sys sys 1034952854 4339
-sys/src/libc/fmt/fmt.c - 664 sys sys 1028218352 2935
+sys/src/libc/fmt/fmt.c - 664 sys sys 1104100968 3102
 sys/src/libc/fmt/fmtdef.h - 664 sys sys 1018029975 1808
 sys/src/libc/fmt/fmtfd.c - 664 sys sys 1014927314 508
 sys/src/libc/fmt/fmtlock.c - 664 sys sys 1014927314 134
@@ -12269,7 +12269,7 @@ sys/src/libsec/port/md4.c - 664 sys sys 1015013579 4260
 sys/src/libsec/port/md4test.c - 664 sys sys 984710522 537
 sys/src/libsec/port/md5.c - 664 sys sys 1084318868 3254
 sys/src/libsec/port/md5block.c - 664 sys sys 985124885 5015
-sys/src/libsec/port/md5pickle.c - 664 sys sys 1081199854 716
+sys/src/libsec/port/md5pickle.c - 664 sys sys 1104105067 716
 sys/src/libsec/port/mkfile - 664 sys sys 1044931345 879
 sys/src/libsec/port/nfastrand.c - 664 sys sys 1063853595 354
 sys/src/libsec/port/primetest.c - 664 sys sys 984710523 2486

+ 3 - 0
dist/replica/plan9.log

@@ -17769,3 +17769,6 @@
 1103949008 2 c 386/bin/auth/secstored - 775 sys sys 1103947527 196591
 1103949008 3 c 386/bin/auth/secuser - 775 sys sys 1103947528 152264
 1103983214 0 c lib/face/48x48x4/.dict - 664 sys sys 1103981657 2530
+1104100237 0 c sys/src/libc/fmt/dofmt.c - 664 sys sys 1104099108 8565
+1104102037 0 c sys/src/libc/fmt/fmt.c - 664 sys sys 1104100968 3102
+1104105638 0 c sys/src/libsec/port/md5pickle.c - 664 sys sys 1104105067 716

+ 1 - 1
sys/src/libc/fmt/dofmt.c

@@ -424,7 +424,7 @@ _ifmt(Fmt *f)
 				n++;
 		}
 	}
-	if((fl & FmtZero) && !(fl & FmtLeft)){
+	if((fl & FmtZero) && !(fl & (FmtLeft|FmtPrec))){
 		for(w = f->width; n < w && p > buf+3; n++)
 			*p-- = '0';
 		f->width = 0;

+ 9 - 0
sys/src/libc/fmt/fmt.c

@@ -179,6 +179,15 @@ _fmtdispatch(Fmt *f, void *fmt, int isrunes)
 		case '*':
 			i = va_arg(f->args, int);
 			if(i < 0){
+				/*
+				 * negative precision =>
+				 * ignore the precision.
+				 */
+				if(f->flags & FmtPrec){
+					f->flags &= ~FmtPrec;
+					f->prec = 0;
+					continue;
+				}
 				i = -i;
 				f->flags |= FmtLeft;
 			}

+ 1 - 1
sys/src/libsec/port/md5pickle.c

@@ -11,7 +11,7 @@ md5pickle(MD5state *s)
 	p = malloc(m);
 	if(p == nil)
 		return p;
-	n = sprint(p, "%16.16ullx %8.8ux %8.8ux %8.8ux %8.8ux ",
+	n = sprint(p, "%16.16llux %8.8ux %8.8ux %8.8ux %8.8ux ",
 		s->len,
 		s->state[0], s->state[1], s->state[2],
 		s->state[3]);