Plan 9 from Bell Labs 2005-09-10

dist/replica/_plan9.db

@@ -9912,7 +9912,7 @@ sys/src/cmd/disk/prep/edit.c - 664 sys sys 1017854327 9714
 sys/src/cmd/disk/prep/edit.h - 664 sys sys 1015009215 994
 sys/src/cmd/disk/prep/fdisk.c - 664 sys sys 1050689604 21894
 sys/src/cmd/disk/prep/mkfile - 664 sys sys 1022450200 250
-sys/src/cmd/disk/prep/prep.c - 664 sys sys 1068820485 10636
+sys/src/cmd/disk/prep/prep.c - 664 sys sys 1126278202 10098
 sys/src/cmd/disk/rd9660.c - 664 sys sys 1021579990 7446
 sys/src/cmd/disk/sacfs - 20000000775 sys sys 964815355 0
 sys/src/cmd/disk/sacfs/mkfile - 664 sys sys 964815354 204
@@ -12230,7 +12230,7 @@ sys/src/cmd/mntgen.c - 664 sys sys 1106410349 3630
 sys/src/cmd/mount.c - 664 sys sys 1034195354 1508
 sys/src/cmd/ms2html.c - 664 sys sys 1121977162 40506
 sys/src/cmd/mtime.c - 664 sys sys 1036172302 450
-sys/src/cmd/mv.c - 664 sys sys 1014926695 4276
+sys/src/cmd/mv.c - 664 sys sys 1126278115 4241
 sys/src/cmd/ndb - 20000000775 sys sys 988249988 0
 sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1119276409 6866
 sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1060612175 7248
@@ -14381,10 +14381,10 @@ sys/src/libcontrol/text.c - 664 sys sys 1091982888 12388
 sys/src/libcontrol/textbutton.c - 664 sys sys 1088784891 7486
 sys/src/libcontrol/textbutton3.c - 664 sys sys 1088784891 9104
 sys/src/libdisk - 20000000775 sys sys 969512501 0
-sys/src/libdisk/disk.c - 664 sys sys 1032061278 6662
+sys/src/libdisk/disk.c - 664 sys sys 1126278243 6665
 sys/src/libdisk/mkfile - 664 sys sys 1035389777 269
 sys/src/libdisk/proto.c - 664 sys sys 1020313839 8808
-sys/src/libdisk/scsi.c - 664 sys sys 1014930428 6046
+sys/src/libdisk/scsi.c - 664 sys sys 1126278243 6023
 sys/src/libdisk/test.c - 664 sys sys 960347152 275
 sys/src/libdraw - 20000000775 sys sys 1014927873 0
 sys/src/libdraw/alloc.c - 664 sys sys 1014927873 4095
@@ -14962,3 +14962,10 @@ 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/cdfs - 775 sys sys 1126321689 161177
+386/bin/mv - 775 sys sys 1126321691 65489
+386/bin/disk/fdisk - 775 sys sys 1126321690 103794
+386/bin/disk/format - 775 sys sys 1126321690 89534
+386/bin/disk/mbr - 775 sys sys 1126321690 73689
+386/bin/disk/prep - 775 sys sys 1126321691 95831
+386/lib/libdisk.a - 664 sys sys 1126321691 42236

dist/replica/plan9.db

@@ -172,7 +172,7 @@
 386/bin/calendar - 775 sys sys 1125345963 80212
 386/bin/cat - 775 sys sys 1115950056 37447
 386/bin/cb - 775 sys sys 1125345963 77510
-386/bin/cdfs - 775 sys sys 1124939600 161202
+386/bin/cdfs - 775 sys sys 1126321689 161177
 386/bin/cfs - 775 sys sys 1115950056 128067
 386/bin/chgrp - 775 sys sys 1115950056 59285
 386/bin/chmod - 775 sys sys 1115950057 62281
@@ -201,17 +201,17 @@
 386/bin/disk - 20000000775 sys sys 984788664 0
 386/bin/disk/dump9660 - 775 sys sys 1125345967 152253
 386/bin/disk/exsort - 775 sys sys 1119496645 60226
-386/bin/disk/fdisk - 775 sys sys 1125345967 103785
-386/bin/disk/format - 775 sys sys 1125345967 89525
+386/bin/disk/fdisk - 775 sys sys 1126321690 103794
+386/bin/disk/format - 775 sys sys 1126321690 89534
 386/bin/disk/kfs - 775 sys sys 1119496646 248974
 386/bin/disk/kfscmd - 775 sys sys 1115950064 38222
 386/bin/disk/ksync - 775 sys sys 1020319074 302
-386/bin/disk/mbr - 775 sys sys 1125345968 73680
+386/bin/disk/mbr - 775 sys sys 1126321690 73689
 386/bin/disk/mk9660 - 775 sys sys 1020319074 144
 386/bin/disk/mkext - 775 sys sys 1125345968 82645
 386/bin/disk/mkfs - 775 sys sys 1125345968 87688
 386/bin/disk/mksacfs - 775 sys sys 1020319074 71451
-386/bin/disk/prep - 775 sys sys 1125345969 97870
+386/bin/disk/prep - 775 sys sys 1126321691 95831
 386/bin/disk/sacfs - 775 sys sys 1020319075 79882
 386/bin/dossrv - 775 sys sys 1125345969 137747
 386/bin/du - 775 sys sys 1115950066 73573
@@ -327,7 +327,7 @@
 386/bin/mount - 775 sys sys 1115950094 73011
 386/bin/ms2html - 775 sys sys 1125345996 103576
 386/bin/mtime - 775 sys sys 1115950094 59139
-386/bin/mv - 775 sys sys 1115950095 65521
+386/bin/mv - 775 sys sys 1126321691 65489
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1125345996 149228
 386/bin/ndb/csquery - 775 sys sys 1125345996 61467
@@ -542,7 +542,7 @@
 386/lib/libc.a - 664 sys sys 1124766768 502522
 386/lib/libcomplete.a - 664 sys sys 1115950151 6370
 386/lib/libcontrol.a - 664 sys sys 1115950152 274922
-386/lib/libdisk.a - 664 sys sys 1115950152 42234
+386/lib/libdisk.a - 664 sys sys 1126321691 42236
 386/lib/libdraw.a - 664 sys sys 1115950153 373428
 386/lib/libflate.a - 664 sys sys 1115950153 76872
 386/lib/libframe.a - 664 sys sys 1115950153 66060
@@ -9912,7 +9912,7 @@ sys/src/cmd/disk/prep/edit.c - 664 sys sys 1017854327 9714
 sys/src/cmd/disk/prep/edit.h - 664 sys sys 1015009215 994
 sys/src/cmd/disk/prep/fdisk.c - 664 sys sys 1050689604 21894
 sys/src/cmd/disk/prep/mkfile - 664 sys sys 1022450200 250
-sys/src/cmd/disk/prep/prep.c - 664 sys sys 1068820485 10636
+sys/src/cmd/disk/prep/prep.c - 664 sys sys 1126278202 10098
 sys/src/cmd/disk/rd9660.c - 664 sys sys 1021579990 7446
 sys/src/cmd/disk/sacfs - 20000000775 sys sys 964815355 0
 sys/src/cmd/disk/sacfs/mkfile - 664 sys sys 964815354 204
@@ -12230,7 +12230,7 @@ sys/src/cmd/mntgen.c - 664 sys sys 1106410349 3630
 sys/src/cmd/mount.c - 664 sys sys 1034195354 1508
 sys/src/cmd/ms2html.c - 664 sys sys 1121977162 40506
 sys/src/cmd/mtime.c - 664 sys sys 1036172302 450
-sys/src/cmd/mv.c - 664 sys sys 1014926695 4276
+sys/src/cmd/mv.c - 664 sys sys 1126278115 4241
 sys/src/cmd/ndb - 20000000775 sys sys 988249988 0
 sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1119276409 6866
 sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1060612175 7248
@@ -14381,10 +14381,10 @@ sys/src/libcontrol/text.c - 664 sys sys 1091982888 12388
 sys/src/libcontrol/textbutton.c - 664 sys sys 1088784891 7486
 sys/src/libcontrol/textbutton3.c - 664 sys sys 1088784891 9104
 sys/src/libdisk - 20000000775 sys sys 969512501 0
-sys/src/libdisk/disk.c - 664 sys sys 1032061278 6662
+sys/src/libdisk/disk.c - 664 sys sys 1126278243 6665
 sys/src/libdisk/mkfile - 664 sys sys 1035389777 269
 sys/src/libdisk/proto.c - 664 sys sys 1020313839 8808
-sys/src/libdisk/scsi.c - 664 sys sys 1014930428 6046
+sys/src/libdisk/scsi.c - 664 sys sys 1126278243 6023
 sys/src/libdisk/test.c - 664 sys sys 960347152 275
 sys/src/libdraw - 20000000775 sys sys 1014927873 0
 sys/src/libdraw/alloc.c - 664 sys sys 1014927873 4095

dist/replica/plan9.log

@@ -21253,3 +21253,14 @@
 1126150216 0 c 386/bin/aux/trampoline - 775 sys sys 1126148864 83645
 1126150216 1 c 386/bin/ip/ipconfig - 775 sys sys 1126148865 137742
 1126211429 0 c sys/games/lib/fortunes - 664 sys sys 1126211316 255804
+1126279844 0 c sys/src/cmd/disk/prep/prep.c - 664 sys sys 1126278202 10098
+1126279844 1 c sys/src/cmd/mv.c - 664 sys sys 1126278115 4241
+1126279844 2 c sys/src/libdisk/disk.c - 664 sys sys 1126278243 6665
+1126279844 3 c sys/src/libdisk/scsi.c - 664 sys sys 1126278243 6023
+1126323053 0 c 386/bin/cdfs - 775 sys sys 1126321689 161177
+1126323053 1 c 386/bin/mv - 775 sys sys 1126321691 65489
+1126323053 2 c 386/bin/disk/fdisk - 775 sys sys 1126321690 103794
+1126323053 3 c 386/bin/disk/format - 775 sys sys 1126321690 89534
+1126323053 4 c 386/bin/disk/mbr - 775 sys sys 1126321690 73689
+1126323053 5 c 386/bin/disk/prep - 775 sys sys 1126321691 95831
+1126323053 6 c 386/lib/libdisk.a - 664 sys sys 1126321691 42236

sys/src/cmd/disk/prep/prep.c

@@ -25,7 +25,6 @@ static int	docache;
 static int	donvram;
 
 static void	autoxpart(Edit*);
-static vlong	memsize(void);
 static Part	*mkpart(char*, vlong, vlong, int);
 static void	rdpart(Edit*);
 static void	wrpart(Edit*);
@@ -270,38 +269,6 @@ cmdokname(Edit*, char *elem)
 	return nil;
 }
 
-/*
- *  return memory size in bytes
- */
-static vlong
-memsize(void)
-{
-	int fd, n, by2pg;
-	char *p;
-	char buf[128];
-	vlong mem;
-
-	p = getenv("cputype");
-	if(p && (strcmp(p, "68020") == 0 || strcmp(p, "alpha") == 0))
-		by2pg = 8*1024;
-	else
-		by2pg = 4*1024;
-
-	mem = 64*1024*1024;
-	fd = open("/dev/swap", OREAD);
-	if(fd < 0)
-		return mem;
-	n = read(fd, buf, sizeof(buf)-1);
-	close(fd);
-	if(n <= 0)
-		return mem;
-	buf[n] = 0;
-	p = strchr(buf, '/');
-	if(p)
-		mem = strtoul(p+1, 0, 0) * (vlong)by2pg;
-	return mem;
-}
-
 static Part*
 mkpart(char *name, vlong start, vlong end, int changed)
 {

sys/src/cmd/mv.c

@@ -37,7 +37,7 @@ main(int argc, char *argv[])
 	}
 	failed = 0;
 	for(i=1; i < argc-1; i++)
-		if (mv(argv[i], todir, toelem) < 0)
+		if(mv(argv[i], todir, toelem) < 0)
 			failed++;
 	if(failed)
 		exits("failure");
@@ -117,19 +117,18 @@ mv(char *from, char *todir, char *toelem)
 		close(fdf);
 		return -1;
 	}
-	if ((stat = copy1(fdf, fdt, fromname, toname)) != -1) {
+	stat = copy1(fdf, fdt, fromname, toname);
+	close(fdf);
+	if(stat >= 0){
 		nulldir(&null);
 		null.mtime = dirb->mtime;
 		null.mode = dirb->mode;
 		dirfwstat(fdt, &null);	/* ignore errors; e.g. user none always fails */
-		if (remove(fromname) < 0) {
+		if(remove(fromname) < 0){
 			fprint(2, "mv: can't remove %s: %r\n", fromname);
-			close(fdf);
-			close(fdt);
-			return -1;
+			stat = -1;
 		}
 	}
-	close(fdf);
 	close(fdt);
 	return stat;
 }
@@ -140,19 +139,19 @@ copy1(int fdf, int fdt, char *from, char *to)
 	char buf[8192];
 	long n, n1;
 
-	for(;;) {
+	for(;;){
 		n = read(fdf, buf, sizeof buf);
-		if(n >= 0) {
+		if(n >= 0){
 			if(n == 0)
 				break;
 			n1 = write(fdt, buf, n);
-			if(n1 != n) {
+			if(n1 != n){
 				fprint(2, "mv: error writing %s: %r\n", to);
 				return -1;
 			}
 		}
 	}
-	if(n < 0) {
+	if(n < 0){
 		fprint(2, "mv: error reading %s: %r\n", from);
 		return -1;
 	}

sys/src/libdisk/disk.c

@@ -272,7 +272,7 @@ opendisk(char *disk, int rdonly, int noctl)
 	char *p, *q;
 	Disk *d;
 
-	d = malloc(sizeof(*d));
+	d = mallocz(sizeof(*d), 1);
 	if(d == nil)
 		return nil;
 
@@ -347,4 +347,3 @@ opendisk(char *disk, int rdonly, int noctl)
 	d->type = Tfile;
 	return openfile(d);
 }
-

sys/src/libdisk/scsi.c

@@ -308,13 +308,12 @@ openscsi(char *dev)
 	if((p = strdup(buf+8)) == nil)
 		goto Error;
 
-	s = malloc(sizeof(*s));
+	s = mallocz(sizeof(*s), 1);
 	if(s == nil) {
 	Error1:
 		free(p);
 		goto Error;
 	}
-	memset(s, 0, sizeof(*s));
 
 	s->rawfd = rawfd;
 	s->inquire = p;