d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A trivial enhancement to ctm_rmail to support the -v option and pass it

Browse Source 
through to cvs when unpacking the delta..  (I read the output.. :-)
This commit is contained in:
peter 1995-12-26 02:49:53 +00:00
parent 8dd11ac8d7
commit db42dac3f5
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/ctm/ctm_rmail/ctm_rmail.1
View File

@ -21,7 +21,7 @@ deltas via mail
.Ar ctm-delta
.Ar mail-alias
.Nm ctm_rmail
.Op Fl Df
.Op Fl Dfv
.Op Fl l Ar log
.Op Fl p Ar piecedir
.Op Fl d Ar deltadir
@ -47,9 +47,9 @@ optionally call
.Xr ctm
to apply it to the source tree.
At the moment,
only two source trees are distributed, and both by the same site. These are
several source trees are distributed, and by several sites. These include
the FreeBSD-current source and CVS trees, distributed by
.Li ref.tfs.com .
.Li freefall.FreeBSD.org .
.Pp
Command line arguments for
.Nm ctm_smail :
@ -148,6 +148,13 @@ Don't worry about zillions of background
processes loading your machine, since locking is used to prevent more than one
.Xr ctm
invocation at a time.
.It Fl v
Pass the
.Fl v
flag to the
.Xr ctm
command when applying the complete deltas, causing a more informative
output. Note that you need to make your own arrangements to capture it.
.El
.Pp
The file arguments (or

5
usr.sbin/ctm/ctm_rmail/ctm_rmail.c
View File

@ -29,6 +29,7 @@ char *piece_dir = NULL; /* Where to store pieces of deltas. */
char *delta_dir = NULL; /* Where to store completed deltas. */
char *base_dir = NULL; /* The tree to apply deltas to. */
int delete_after = 0; /* Delete deltas after ctm applies them. */
int apply_verbose = 0; /* Run with '-v' */
void apply_complete(void);
int read_piece(char *input_file);
@ -63,6 +64,7 @@ main(int argc, char **argv)
OPTIONS("[-Df] [-p piecedir] [-d deltadir] [-b basedir] [-l log] [file ...]")
FLAG('D', delete_after)
FLAG('f', fork_ctm)
FLAG('v', apply_verbose)
STRING('p', piece_dir)
STRING('d', delta_dir)
STRING('b', base_dir)
@ -194,7 +196,8 @@ apply_complete()
if (stat(fname, &sb) < 0)
break;
sprintf(buf, "(cd %s && ctm %s%s) 2>&1", base_dir, here, fname);
sprintf(buf, "(cd %s && ctm %s%s%s) 2>&1", base_dir,
apply_verbose ? "-v " : "", here, fname);
if ((ctm = popen(buf, "r")) == NULL)
{
err("ctm failed to apply %s", delta);