20080809-2014

forsyth committed 17 years ago

Commit ea36ff61 parent ce0a0c37 files · +157 −183Browse files

Unified · Split

7 files

CHANGES +3 −0
appl/cmd/disk/mkext.b +10 −35
appl/cmd/disk/mkfs.b +47 −93
dis/disk/mkext.dis +0 −0
dis/disk/mkfs.dis +0 −0
include/version.h +1 −1
man/8/mkfs +98 −56

@@ -1,3 +1,6 @@
	1	+20090809
	2	+ bring mkfs(8) up to date (issue 176)
	3	+ remove -q options from mkfs and mkext (-q was a transitional option to suppress quoting of file names)
1	4	20090806
2	5	increase `backlog' value in all listen calls in hosted Inferno (emu//ipif.c) [powerman]
3	6	20090805

appl/cmd/disk/mkext.b+10−35

@@ -30,17 +30,10 @@ tflag := 0; · 29 unmodified lines
30	30	hflag := 0;
31	31	vflag := 0;
32	32	fflag := 0;
33		−qflag := 1;
34	33	stderr: ref Sys->FD;
35	34	bout: ref Iobuf;
36	35	argv0 := "mkext";
37	36
38		−usage()
39		−{
40		− fprint(stderr, "Usage: mkext [-h] [-u] [-v] [-f] [-t] [-q] [-d dest-fs] [file ...]\n");
41		− raise "fail:usage";
42		−}
43		−
44	37	init(nil: ref Draw->Context, args: list of string)
45	38	{
46	39	sys = load Sys Sys->PATH;
@@ -59,12 +52,11 @@ init(nil: ref Draw->Context, args: list of string) · 12 unmodified lines
59	52
60	53	destdir := "";
61	54	arg->init(args);
	55	+ arg->setusage("mkext [-h] [-d destdir] [-T] [-u] [-v] [file ...]");
62	56	while((c := arg->opt()) != 0)
63	57	case c {
64	58	'd' =>
65		− destdir = arg->arg();
66		− if(destdir == nil)
67		− error("destination directory name missing");
	59	+ destdir = arg->earg();
68	60	'f' =>
69	61	fflag = 1;
70	62
@@ -75,14 +67,13 @@ init(nil: ref Draw->Context, args: list of string) · 4 unmodified lines
75	67	error(sys->sprint("can't access standard output: %r"));
76	68	'u' =>
77	69	uflag = 1;
78		− 't' =>
	70	+ tflag = 1;
	71	+ 't' or 'T' =>
79	72	tflag = 1;
80	73	'v' =>
81	74	vflag = 1;
82		− 'q' =>
83		− qflag = 0;
84	75	* =>
85		− usage();
	76	+ arg->usage();
86	77	}
87	78	args = arg->argv();
88	79
@@ -94,14 +85,8 @@ init(nil: ref Draw->Context, args: list of string) · 5 unmodified lines
94	85	fprint(stderr, "done\n");
95	86	quit(nil);
96	87	}
97		− fields: list of string;
98		− nf: int;
99		− if(qflag){
100		− fields = str->unquoted(p);
101		− nf = len fields;
102		− }else
103		− (nf, fields) = sys->tokenize(p, " \t\n");
104		− if(nf != NFLDS){
	88	+ fields := str->unquoted(p);
	89	+ if(len fields != NFLDS){
105	90	warn("too few fields in file header");
106	91	continue;
107	92	}
@@ -126,8 +111,8 @@ init(nil: ref Draw->Context, args: list of string) · 18 unmodified lines
126	111	}
127	112	name = destdir+name;
128	113	if(hflag){
129		− bout.puts(sys->sprint("%s %s %s %s %ud %bd\n",
130		− quoted(name), octal(mode), uid, gid, mtime, bytes));
	114	+ bout.puts(sys->sprint("%q %s %s %s %ud %bd\n",
	115	+ name, octal(mode), uid, gid, mtime, bytes));
131	116	if(bytes != big 0)
132	117	seekpast(bytes);
133	118	continue;
@@ -212,7 +197,6 @@ mkdir(name: string, mode: int, mtime: int, uid: string, gid: string) · 78 unmodified lines
212	197	if(uflag){
213	198	d.uid = uid;
214	199	d.gid = gid;
215		− d.mtime = mtime;
216	200	}
217	201	d.mode = mode;
218	202	if(sys->wstat(name, d) < 0)
@@ -272,7 +256,7 @@ extract(name: string, mode: int, mtime: int, uid: string, gid: string, bytes: bi · 53 unmodified lines
272	256	if(p == nil)
273	257	p = name;
274	258	d.name = p;
275		− if(tflag \|\| uflag)
	259	+ if(tflag)
276	260	d.mtime = mtime;
277	261	if(uflag){
278	262	d.uid = uid;
@@ -366,12 +350,3 @@ create(name : string, rw : int, mode : int) : ref Sys->FD · 87 unmodified lines
366	350	}
367	351	return fd;
368	352	}
369		−
370		−quoted(s: string): string
371		−{
372		− if(qflag)
373		− for(i:=0; i<len s; i++)
374		− if((c := s[i]) == ' ' \|\| c == '\t' \|\| c == '\n' \|\| c == '\'')
375		− return str->quoted(s :: nil);
376		− return s;
377		−}

appl/cmd/disk/mkfs.b+47−93

@@ -55,7 +55,6 @@ modes: int; · 54 unmodified lines
55	55	ream: int;
56	56	debug: int;
57	57	xflag: int;
58		−qflag := 1;
59	58	sfd: ref Sys->FD;
60	59	fskind: int; # Kfs, Fs, Archive
61	60	user: string;
@@ -63,12 +62,6 @@ stderr: ref Sys->FD; · 1 unmodified line
63	62	usrid, grpid : string;
64	63	setuid: int;
65	64
66		−usage()
67		−{
68		− fprint(stderr, "usage: %s [-apqrvx] [-d root] [-n kfsname] [-s src-fs] [-u userfile] [-z n] proto ...\n", prog);
69		− quit("usage");
70		−}
71		−
72	65	init(nil: ref Draw->Context, args: list of string)
73	66	{
74	67	sys = load Sys Sys->PATH;
@@ -80,7 +73,7 @@ init(nil: ref Draw->Context, args: list of string) · 5 unmodified lines
80	73
81	74	stderr = sys->fildes(2);
82	75	if(arg == nil)
83		− error(sys->sprint("can't load %s: %r", Arg->PATH));
	76	+ error(sys->sprint("can't load %q: %r", Arg->PATH));
84	77
85	78	user = getuser();
86	79	if(user == nil)
@@ -95,6 +88,7 @@ init(nil: ref Draw->Context, args: list of string) · 8 unmodified lines
95	88	users = nil;
96	89	fskind = Kfs; # i suspect Inferno default should be different
97	90	arg->init(args);
	91	+ arg->setusage("mkfs [-aprvxS] [-d root] [-n kfscmdname] [-s src-fs] [-u userfile] [-z n] [-G group] [-U user] proto ...");
98	92	while((c := arg->opt()) != 0)
99	93	case c {
100	94	'a' =>
@@ -105,49 +99,52 @@ init(nil: ref Draw->Context, args: list of string) · 4 unmodified lines
105	99	error(sys->sprint("can't open standard output for archive: %r"));
106	100	'd' =>
107	101	fskind = Fs;
108		− newroot = reqarg("destination directory (-d)");
	102	+ newroot = arg->earg();
109	103	'D' =>
110	104	debug = 1;
111	105	'n' =>
112		− name = reqarg("kfs instance name (-n)");
	106	+ name = arg->earg();
113	107	'p' =>
114	108	modes = 1;
115	109	'q' =>
116		− qflag = 0;
	110	+ ;
117	111	'r' =>
118	112	ream = 1;
119	113	's' =>
120		− oldroot = reqarg("source directory (-d)");
	114	+ oldroot = arg->earg();
121	115	'u' =>
122		− users = reqarg("/adm/users file (-u)");
	116	+ users = arg->earg();
123	117	'v' =>
124	118	verb = 1;
125	119	'x' =>
126	120	xflag = 1;
127	121	'z' =>
128		− (buflen, nil) = str->toint(reqarg("buffer length (-z)"), 10);
	122	+ (buflen, nil) = str->toint(arg->earg(), 10);
129	123	buflen -= 8; # qid.path and tag at end of each kfs block
130	124	'U' =>
131		− usrid = reqarg("user name (-U)");
	125	+ usrid = arg->earg();
132	126	'G' =>
133		− grpid = reqarg("group name (-G)");
	127	+ grpid = arg->earg();
134	128	'S' =>
135	129	setuid = 1;
136	130	* =>
137		− usage();
	131	+ arg->usage();
138	132	}
139	133
140	134	args = arg->argv();
141	135	if(args == nil)
142		− usage();
	136	+ arg->usage();
143	137
144	138	buf = array [buflen] of byte;
145	139	zbuf = array [buflen] of { * => byte 0 };
146	140
147		− mountkfs(name);
	141	+ if(name != nil)
	142	+ openkfscmd(name);
148	143	kfscmd("allow");
149		− proto = "users";
150		− setusers();
	144	+ if(users != nil){
	145	+ proto = "users"; # for diagnostics
	146	+ setusers();
	147	+ }
151	148	cputype = getenv("cputype");
152	149	if(cputype == nil)
153	150	cputype = "dis";
@@ -159,7 +156,7 @@ init(nil: ref Draw->Context, args: list of string) · 5 unmodified lines
159	156
160	157	b = bufio->open(proto, Sys->OREAD);
161	158	if(b == nil){
162		− fprint(stderr, "%s: can't open %s: %r: skipping\n", prog, proto);
	159	+ fprint(stderr, "%s: can't open %q: %r: skipping\n", prog, proto);
163	160	errs++;
164	161	continue;
165	162	}
@@ -190,15 +187,6 @@ quit(why: string) · 24 unmodified lines
190	187	exit;
191	188	}
192	189
193		−reqarg(what: string): string
194		−{
195		− if((o := arg->arg()) == nil){
196		− sys->fprint(stderr, "%s: missing %s\n", prog, what);
197		− quit("usage");
198		− }
199		− return o;
200		−}
201		−
202	190	mkfs(me: ref File, level: int)
203	191	{
204	192	(child, fp) := getfile(me);
@@ -227,7 +215,7 @@ mktree(me: ref File, rec: int, filesonly: int) · 22 unmodified lines
227	215	{
228	216	fd := sys->open(oldfile, Sys->OREAD);
229	217	if(fd == nil){
230		− warn(sys->sprint("can't open %s: %r", oldfile));
	218	+ warn(sys->sprint("can't open %q: %r", oldfile));
231	219	return;
232	220	}
233	221
@@ -282,7 +270,7 @@ mkfile(f: ref File): int · 48 unmodified lines
282	270	{
283	271	(i, dir) := sys->stat(oldfile);
284	272	if(i < 0){
285		− warn(sys->sprint("can't stat file %s: %r", oldfile));
	273	+ warn(sys->sprint("can't stat file %q: %r", oldfile));
286	274	skipdir();
287	275	return 0;
288	276	}
@@ -294,7 +282,7 @@ copyfile(f: ref File, d: ref Dir, permonly: int): int · 5 unmodified lines
294	282	mode: int;
295	283
296	284	if(xflag && bout != nil){
297		− bout.puts(sys->sprint("%s\t%d\t%bd\n", quoted(f.new), d.mtime, d.length));
	285	+ bout.puts(sys->sprint("%q\t%d\t%bd\n", f.new, d.mtime, d.length));
298	286	return (d.mode & Sys->DMDIR) != 0;
299	287	}
300	288	d.name = f.elem;
@@ -329,7 +317,7 @@ copyfile(f: ref File, d: ref Dir, permonly: int): int · 28 unmodified lines
329	317	mkdir(d);
330	318	else {
331	319	if(verb)
332		− fprint(stderr, "%s\n", f.new);
	320	+ fprint(stderr, "%q\n", f.new);
333	321	copy(d);
334	322	}
335	323	}else if(modes){
@@ -338,7 +326,7 @@ copyfile(f: ref File, d: ref Dir, permonly: int): int · 2 unmodified lines
338	326	nd.mtime = d.mtime;
339	327	nd.gid = d.gid;
340	328	if(sys->wstat(newfile, nd) < 0)
341		− warn(sys->sprint("can't set modes for %s: %r", f.new));
	329	+ warn(sys->sprint("can't set modes for %q: %r", f.new));
342	330	# do the uid separately since different file systems object
343	331	nd = sys->nulldir;
344	332	nd.uid = d.uid;
@@ -368,7 +356,7 @@ copy(d: ref Dir) · 23 unmodified lines
368	356
369	357	f := sys->open(oldfile, Sys->OREAD);
370	358	if(f == nil){
371		− warn(sys->sprint("can't open %s: %r", oldfile));
	359	+ warn(sys->sprint("can't open %q: %r", oldfile));
372	360	return;
373	361	}
374	362	t = nil;
@@ -381,7 +369,7 @@ copy(d: ref Dir) · 6 unmodified lines
381	369	cptmp := dname+"__mkfstmp";
382	370	t = sys->create(cptmp, Sys->OWRITE, 8r666);
383	371	if(t == nil){
384		− warn(sys->sprint("can't create %s: %r", newfile));
	372	+ warn(sys->sprint("can't create %q: %r", newfile));
385	373	return;
386	374	}
387	375	}
@@ -389,7 +377,7 @@ copy(d: ref Dir) · 1 unmodified line
389	377	for(tot := big 0;; tot += big n){
390	378	n = sys->read(f, buf, buflen);
391	379	if(n < 0){
392		− warn(sys->sprint("can't read %s: %r", oldfile));
	380	+ warn(sys->sprint("can't read %q: %r", oldfile));
393	381	break;
394	382	}
395	383	if(n == 0)
@@ -399,9 +387,9 @@ copy(d: ref Dir) · 3 unmodified lines
399	387	error(sys->sprint("write error: %r"));
400	388	}else if(buf[0:buflen] == zbuf[0:buflen]){
401	389	if(sys->seek(t, big buflen, 1) < big 0)
402		− error(sys->sprint("can't write zeros to %s: %r", newfile));
	390	+ error(sys->sprint("can't write zeros to %q: %r", newfile));
403	391	}else if(sys->write(t, buf, n) < n)
404		− error(sys->sprint("can't write %s: %r", newfile));
	392	+ error(sys->sprint("can't write %q: %r", newfile));
405	393	}
406	394	f = nil;
407	395	if(tot != d.length){
@@ -420,11 +408,11 @@ copy(d: ref Dir) · 12 unmodified lines
420	408	nd.mode = d.mode;
421	409	nd.mtime = d.mtime;
422	410	if(sys->fwstat(t, nd) < 0)
423		− error(sys->sprint("can't move tmp file to %s: %r", newfile));
	411	+ error(sys->sprint("can't move tmp file to %q: %r", newfile));
424	412	nd = sys->nulldir;
425	413	nd.gid = d.gid;
426	414	if(sys->fwstat(t, nd) < 0)
427		− warn(sys->sprint("can't set group id of %s to %s: %r", newfile, d.gid));
	415	+ warn(sys->sprint("can't set group id of %q to %q: %r", newfile, d.gid));
428	416	nd.gid = nil;
429	417	nd.uid = d.uid;
430	418	sys->fwstat(t, nd);
@@ -444,16 +432,16 @@ mkdir(d: ref Dir) · 13 unmodified lines
444	432	if(fd == nil){
445	433	(i, d1) := sys->stat(newfile);
446	434	if(i < 0 \|\| !(d1.mode & Sys->DMDIR))
447		− error(sys->sprint("can't create %s", newfile));
	435	+ error(sys->sprint("can't create %q", newfile));
448	436	if(sys->wstat(newfile, nd) < 0)
449		− warn(sys->sprint("can't set modes for %s: %r", newfile));
	437	+ warn(sys->sprint("can't set modes for %q: %r", newfile));
450	438	nd = sys->nulldir;
451	439	nd.uid = d.uid;
452	440	sys->wstat(newfile, nd);
453	441	return;
454	442	}
455	443	if(sys->fwstat(fd, nd) < 0)
456		− warn(sys->sprint("can't set modes for %s: %r", newfile));
	444	+ warn(sys->sprint("can't set modes for %q: %r", newfile));
457	445	nd = sys->nulldir;
458	446	nd.uid = d.uid;
459	447	sys->fwstat(fd, nd);
@@ -461,8 +449,8 @@ mkdir(d: ref Dir) · 1 unmodified line
461	449
462	450	arch(d: ref Dir)
463	451	{
464		− bout.puts(sys->sprint("%s %s %s %s %ud %bd\n",
465		− quoted(newfile), octal(d.mode), d.uid, d.gid, d.mtime, d.length));
	452	+ bout.puts(sys->sprint("%q %uo %q %q %ud %bd\n",
	453	+ newfile, d.mode, d.uid, d.gid, d.mtime, d.length));
466	454	}
467	455
468	456	mkpath(prefix, elem: string): string
@@ -543,11 +531,11 @@ getfile(old: ref File): (ref File, big) · 74 unmodified lines
543	531	f = ref File;
544	532	(elem, p) = getname(p);
545	533	if(debug)
546		− fprint(stderr, "getfile: %s root %s\n", elem, old.new);
	534	+ fprint(stderr, "getfile: %q root %q\n", elem, old.new);
547	535	f.new = mkpath(old.new, elem);
548	536	(nil, f.elem) = str->splitr(f.new, "/");
549	537	if(f.elem == nil)
550		− error(sys->sprint("can't find file name component of %s", f.new));
	538	+ error(sys->sprint("can't find file name component of %q", f.new));
551	539	(f.mode, p) = getmode(p);
552	540	(f.uid, p) = getname(p);
553	541	if(f.uid == nil)
@@ -585,7 +573,7 @@ getname(p: string): (string, string) · 31 unmodified lines
585	573	for(; (c = p[0]) != '\n' && (c != ' ' && c != '\t' \|\| quoted); p = p[1:]){
586	574	if(quoted && c == '\'' && p[1] == '\'')
587	575	p = p[1:];
588		− else if(c == '\'' && qflag){
	576	+ else if(c == '\''){
589	577	quoted = !quoted;
590	578	continue;
591	579	}
@@ -594,7 +582,7 @@ getname(p: string): (string, string) · 2 unmodified lines
594	582	if(len s > 0 && s[0] == '$'){
595	583	s = getenv(s[1:]);
596	584	if(s == nil)
597		− error(sys->sprint("can't read environment variable %s", s));
	585	+ error(sys->sprint("can't read environment variable %q", s));
598	586	}
599	587	return (s, p);
600	588	}
@@ -654,13 +642,6 @@ getmode(p: string): (int, string) · 53 unmodified lines
654	642	return (m\|v, p);
655	643	}
656	644
657		−quoted(s: string): string
658		−{
659		− if(qflag)
660		− return sys->sprint("%q", s);
661		− return s;
662		−}
663		−
664	645	setusers()
665	646	{
666	647	if(fskind != Kfs)
@@ -693,30 +674,14 @@ setusers() · 26 unmodified lines
693	674	modes = m;
694	675	}
695	676
696		−# this isn't right for the current #K
697		−mountkfs(name: string)
	677	+openkfscmd(name: string)
698	678	{
699		− kname: string;
700		−
701	679	if(fskind != Kfs)
702	680	return;
703		− if(name != nil)
704		− kname = sys->sprint("/srv/kfs.%s", name);
705		− else
706		− kname = "/srv/kfs";
707		− fd := sys->open(kname, Sys->ORDWR);
708		− if(fd == nil){
709		− fprint(stderr, "%s: can't open %s: %r\n", prog, kname);
710		− quit("open kfs");
711		− }
712		− if(sys->mount(fd, nil, "/n/kfs", Sys->MREPL\|Sys->MCREATE, "") < 0){
713		− fprint(stderr, "%s: can't mount kfs on /n/kfs: %r\n", prog);
714		− quit("mount kfs");
715		− }
716		− kname += ".cmd";
	681	+ kname := sys->sprint("/chan/kfs.%s.cmd", name);
717	682	sfd = sys->open(kname, Sys->ORDWR);
718	683	if(sfd == nil){
719		− fprint(stderr, "%s: can't open %s: %r\n", prog, kname);
	684	+ fprint(stderr, "%s: can't open %q: %r\n", prog, kname);
720	685	quit("open kfscmd");
721	686	}
722	687	}
@@ -747,7 +712,7 @@ kfscmd(cmd: string) · 24 unmodified lines
747	712
748	713	error(s: string)
749	714	{
750		− fprint(stderr, "%s: %s: %d: %s\n", prog, proto, lineno, s);
	715	+ fprint(stderr, "%s: %s:%d: %s\n", prog, proto, lineno, s);
751	716	kfscmd("disallow");
752	717	kfscmd("sync");
753	718	quit("error");
@@ -755,24 +720,13 @@ error(s: string) · 1 unmodified line
755	720
756	721	warn(s: string)
757	722	{
758		− fprint(stderr, "%s: %s: %d: %s\n", prog, proto, lineno, s);
	723	+ fprint(stderr, "%s: %s:%d: %s\n", prog, proto, lineno, s);
759	724	}
760	725
761	726	printfile(f: ref File)
762	727	{
763	728	if(f.old != nil)
764		− fprint(stderr, "%s from %s %s %s %s\n", f.new, f.old, f.uid, f.gid, octal(f.mode));
	729	+ fprint(stderr, "%q from %q %q %q %uo\n", f.new, f.old, f.uid, f.gid, f.mode);
765	730	else
766		− fprint(stderr, "%s %s %s %s\n", f.new, f.uid, f.gid, octal(f.mode));
767		−}
768		−
769		−octal(i: int): string
770		−{
771		− s := "";
772		− do {
773		− t: string;
774		− t[0] = '0' + (i&7);
775		− s = t+s;
776		− } while((i = (i>>3)&~(7<<29)) != 0);
777		− return s;
	731	+ fprint(stderr, "%q %q %q %uo\n", f.new, f.uid, f.gid, f.mode);
778	732	}

dis/disk/mkext.dis+0−0

Binary file not shown.

dis/disk/mkfs.dis+0−0

Binary file not shown.

include/version.h+1−1

@@ -1 +1 @@
1		−#define VERSION "Fourth Edition (20090806)"
	1	+#define VERSION "Fourth Edition (20090809)"

man/8/mkfs+98−56

@@ -3,7 +3,9 @@ · 2 unmodified lines
3	3	mkfs, mkext \- archive or update a file system
4	4	.SH SYNOPSIS
5	5	.B disk/mkfs
6		−.RB [ -aprvx ]
	6	+.RB [ -aprvxS ]
	7	+.RB [ -d
	8	+.IR dest ]
7	9	.RB [ -n
8	10	.IR name ]
9	11	.RB [ -s
@@ -12,15 +14,23 @@ mkfs, mkext \- archive or update a file system · 2 unmodified lines
12	14	.IR users ]
13	15	.RB [ -z
14	16	.IR n ]
	17	+.RB [ -G
	18	+.IR group ]
	19	+.RB [ -U
	20	+.IR user ]
15	21	.I proto ...
16	22	.PP
17	23	.B disk/mkext
18	24	.RB [ -d
19	25	.IR name ]
20		−.RB [ -u ]
	26	+.RB [ -f ]
21	27	.RB [ -h ]
	28	+.RB [ -T ]
	29	+.RB [ -u ]
22	30	.RB [ -v ]
	31	+[
23	32	.I file ...
	33	+]
24	34	.SH DESCRIPTION
25	35	.I Mkfs
26	36	copies files from the file tree
@@ -30,24 +40,22 @@ copies files from the file tree · 3 unmodified lines
30	40	to a
31	41	.B kfs
32	42	file system (see
33		−.IR kfs (4)).
34		−The kfs service is mounted on
35		−.BR /n/kfs ,
36		−and
37		−.BR /adm/users ,
38		−if it exists, is copied to
39		−.BR /n/kfs/adm/users .
	43	+.IR kfs (4))
	44	+assumed to be mounted on
	45	+.I dest
	46	+(default:
	47	+.BR /n/kfs ).
40	48	The
41	49	.I proto
42	50	files are read,
43	51	and any files specified in them that are out of date are copied to
44		−.BR /n/kfs .
	52	+.IR dest .
45	53	See
46	54	.IR proto (6)
47	55	for the description of file system prototype files.
48	56	.PP
49	57	.I Mkfs
50		−copies only those files that are out of date.
	58	+by default copies only those files that are out of date.
51	59	Such a file is first copied into a temporary
52	60	file in the appropriate destination directory
53	61	and then moved to the destination file.
@@ -61,88 +69,122 @@ are not updated and not removed. · 7 unmodified lines
61	69	The options to
62	70	.I mkfs
63	71	are:
64		−.TF "s source"
	72	+.TF "-s source"
65	73	.TP
66		−.B a
	74	+.B -a
67	75	Instead of writing to a
68	76	.B kfs
69	77	file system, write an archive file to standard output, suitable for
70	78	.IR mkext .
71	79	All files in
72		−.IR proto ,
73		−not just those out of date, are archived.
	80	+.I proto
	81	+are archived,
	82	+not just those out of date.
74	83	.TP
75		−.B x
	84	+.B -x
76	85	For use with
77	86	.BR -a ,
78	87	this option writes a list of file names, dates, and sizes to standard output
79	88	rather than producing an archive file.
80	89	.TP
81		−.BI "n " name
	90	+.BI -n " name"
82	91	Use
83		−.RI kfs. name
84		−as the name of the kfs service (default
85		−.BR kfs ).
	92	+.BI kfs. name .cmd
	93	+as the name of the command file for the
	94	+.IR kfs (4)
	95	+assumed to be mounted on
	96	+.IR dest .
86	97	.TP
87		−.B p
	98	+.B -p
88	99	Update the permissions of a file even if it is up to date.
89	100	.TP
90		−.B r
	101	+.B -r
91	102	Copy all files.
92	103	.TP
93		−.BI "s " source
	104	+.BI -s " source"
94	105	Copy from files rooted at the tree
95	106	.IR source .
96	107	.TP
97		−.BI "u " users
98		−Copy file
	108	+.BI -u " users"
	109	+Before copying any other file, copy file
99	110	.I users
100	111	into
101		−.B /adm/users
102		−in the new system.
	112	+.IB dest /adm/users ,
	113	+and if the
	114	+.B -n
	115	+option was given, also issue the
	116	+.IR kfs (4)
	117	+command
	118	+.B users
	119	+to update
	120	+.IR kfs 's
	121	+own user list.
103	122	.TP
104		−.B v
	123	+.B -v
105	124	Print the names of all of the files as they are copied.
106	125	.TP
107		−.BI "z " n
108		−Copy files assuming kfs block
	126	+.BI -z " n"
	127	+Copy files assuming
	128	+.I kfs
	129	+is using a block size of
109	130	.I n
110		−(default 1024)
111		−bytes long.
	131	+bytes
	132	+(default 1024).
112	133	If a block contains only 0-valued bytes, it is not copied.
	134	+.TP
	135	+.B -S
	136	+For use with the
	137	+.B -d
	138	+option,
	139	+make owner and group of each file copied match the original.
	140	+.TP
	141	+.BI -G " group"
	142	+Force all files copied to have the given
	143	+.IR group .
	144	+.TP
	145	+.BI -U " user"
	146	+Force all files copied to be owned by the given
	147	+.IR user .
113	148	.PD
114	149	.PP
115	150	.I Mkext
116		−unpacks archive files made by the
	151	+unpacks an archive created by the
117	152	.B -a
118	153	option of
119		−.IR mkfs .
120		−The
121		−.B -d
122		−option specifies a directory (default
123		−.BR /n/kfs )
124		−to serve as the root of the unpacked file system.
125		−The
126		−.B -u
127		−option, to be used only when initializing a new
128		−.IR kfs (4)
129		−file system, sets the owners of the files created to correspond to
130		−those in the archive and restores the modification times of the files.
131		−(This is only permitted at the initial load of the files into a file
132		−system.)
133		−Each file on the command line is unpacked in one pass through the archive.
134		−If the file is a directory,
	154	+.IR mkfs ,
	155	+read from the standard input.
	156	+If one or more files are specified on the command line,
	157	+only those files are unpacked.
	158	+If a
	159	+.I file
	160	+is a directory,
135	161	all files and subdirectories of that directory are also unpacked.
136	162	When a file is unpacked, the entire path is created if it
137	163	does not exist.
138	164	If no files are specified, the entire archive is unpacked;
139	165	in this case, missing intermediate directories are not created.
140		−The
141		−.B -v
142		−option prints the names and sizes of files as they are extracted;
	166	+The options are:
	167	+.TP
	168	+.BI -d " dir"
	169	+Treat
	170	+.I dir
	171	+(default
	172	+.LR / )
	173	+as the root directory when unpacking the archive.
	174	+.TP
143	175	.B -h
144		−prints headers for the files on standard output
	176	+Print headers for the files on standard output
145	177	instead of unpacking the files.
	178	+.TP
	179	+.B -T
	180	+Restore the modification times of the files.
	181	+.TP
	182	+.B -u
	183	+Set the owners of the files created to correspond to
	184	+those in the archive and restore the modification times of the files.
	185	+.TP
	186	+.B -v
	187	+Print the names and sizes of files as they are extracted.
146	188	.SH EXAMPLES
147	189	.PP
148	190	Make an archive to establish a new file system
@@ -153,7 +195,7 @@ is not referenced by · 4 unmodified lines
153	195	.IP
154	196	.EX
155	197	bind '#U' /n/local
156		−disk/mkfs -a -u files/adm.users -s /n/local proto > arch
	198	+disk/mkfs -a -s /n/local proto > arch
157	199	.EE
158	200	.PP
159	201	Unpack that archive on another machine:
@@ -168,8 +210,8 @@ disk/mkext -u -d /n/remote < arch · 8 unmodified lines
168	210	.B /lib/proto
169	211	directory of prototype files.
170	212	.TP
171		−.B /lib/proto/portproto
172		−generic prototype file.
	213	+.B /lib/proto/all
	214	+contains a single + (archive any directory structure)
173	215	.SH SOURCE
174	216	.B /appl/cmd/disk/mkfs.b
175	217	.br