Index: options.c
===================================================================
RCS file: /cvs/src/bin/pax/options.c,v
retrieving revision 1.91
diff -u -p -r1.91 options.c
--- options.c 18 May 2015 20:26:16 -0000 1.91
+++ options.c 11 Sep 2015 00:12:19 -0000
@@ -668,9 +668,7 @@ tar_options(int argc, char **argv)
"b:cef:hjmopqruts:vwxzBC:HI:LNOPXZ014578")) != -1) {
switch (c) {
case 'b':
- /*
- * specify blocksize in 512-byte blocks
- */
+ /* specify blocksize in 512-byte blocks */
if ((wrblksz = (int)str_offt(optarg)) <= 0) {
paxwarn(1, "Invalid block size %s", optarg);
tar_usage();
@@ -678,25 +676,17 @@ tar_options(int argc, char **argv)
wrblksz *= 512; /* XXX - check for int oflow */
break;
case 'c':
- /*
- * create an archive
- */
+ /* create an archive */
act = ARCHIVE;
break;
case 'e':
- /*
- * stop after first error
- */
+ /* stop after first error */
maxflt = 0;
break;
case 'f':
- /*
- * filename where the archive is stored
- */
+ /* filename where the archive is stored */
if ((optarg[0] == '-') && (optarg[1]== '\0')) {
- /*
- * treat a - as stdin
- */
+ /* treat a - as stdin */
fstdin = 1;
arcname = NULL;
break;
@@ -705,21 +695,15 @@ tar_options(int argc, char **argv)
arcname = optarg;
break;
case 'h':
- /*
- * follow symlinks
- */
+ /* follow symlinks */
Lflag = 1;
break;
case 'j':
- /*
- * use bzip2. Non standard option.
- */
+ /* use bzip2. Non standard option. */
gzip_program = BZIP2_CMD;
break;
case 'm':
- /*
- * do not preserve modification time
- */
+ /* do not preserve modification time */
pmtime = 0;
break;
case 'O':
@@ -730,79 +714,56 @@ tar_options(int argc, char **argv)
tar_nodir = 1;
break;
case 'p':
- /*
- * preserve uid/gid and file mode, regardless of umask
- */
+ /* preserve uid/gid and file mode, regardless of umask
*/
pmode = 1;
pids = 1;
break;
case 'q':
- /*
- * select first match for a pattern only
- */
+ /* select first match for a pattern only */
nflag = 1;
break;
case 'r':
case 'u':
- /*
- * append to the archive
- */
+ /* append to the archive */
act = APPND;
break;
case 's':
- /*
- * file name substitution name pattern
- */
+ /* file name substitution name pattern */
if (rep_add(optarg) < 0) {
tar_usage();
break;
}
break;
case 't':
- /*
- * list contents of the tape
- */
+ /* list contents of the tape */
act = LIST;
break;
case 'v':
- /*
- * verbose operation mode
- */
+ /* verbose operation mode */
vflag++;
break;
case 'w':
- /*
- * interactive file rename
- */
+ /* interactive file rename */
iflag = 1;
break;
case 'x':
- /*
- * extract an archive, preserving mode,
- * and mtime if possible.
- */
+ /* extract an archive, preserving mode, and mtime if
possible. */
act = EXTRACT;
pmtime = 1;
break;
case 'z':
- /*
- * use gzip. Non standard option.
- */
+ /* use gzip. Non standard option. */
gzip_program = GZIP_CMD;
break;
case 'B':
- /*
- * Nothing to do here, this is pax default
- */
+ /* Nothing to do here, this is pax default */
break;
case 'C':
havechd++;
chdname = optarg;
break;
case 'H':
- /*
- * follow command line symlinks only
- */
+ /* follow command line symlinks only */
Hflag = 1;
break;
case 'I':
@@ -824,9 +785,7 @@ tar_options(int argc, char **argv)
incfiles[nincfiles - 1].dir = chdname;
break;
case 'L':
- /*
- * follow symlinks
- */
+ /* follow symlinks */
Lflag = 1;
break;
case 'N':
@@ -834,21 +793,15 @@ tar_options(int argc, char **argv)
Nflag = 1;
break;
case 'P':
- /*
- * do not remove leading '/' from pathnames
- */
+ /* do not remove leading '/' from pathnames */
rmleadslash = 0;
break;
case 'X':
- /*
- * do not pass over mount points in the file system
- */
+ /* do not pass over mount points in the file system */
Xflag = 1;
break;
case 'Z':
- /*
- * use compress.
- */
+ /* use compress. */
gzip_program = COMPRESS_CMD;
break;
case '0':