 @@ -1,1694 +1,1694 @@
-/*	$NetBSD: options.c,v 1.105 2009/07/13 19:05:39 roy Exp $	*/
+/*	$NetBSD: options.c,v 1.106 2009/12/14 05:04:48 dholland Exp $	*/
 /*-
  * Copyright (c) 1992 Keith Muller.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Keith Muller of the University of California, San Diego.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if !defined(lint)
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.105 2009/07/13 19:05:39 roy Exp $");
+__RCSID("$NetBSD: options.c,v 1.106 2009/12/14 05:04:48 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
 #if HAVE_NBTOOL_CONFIG_H
 #include "compat_getopt.h"
 #else
 #include <getopt.h>
 #endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <paths.h>
 #include "pax.h"
 #include "options.h"
 #include "cpio.h"
 #include "tar.h"
 #include "extern.h"
 #ifndef SMALL
 #include "mtree.h"
 #endif	/* SMALL */
 /*
  * Routines which handle command line options
  */
 static int nopids;		/* tar mode: suppress "pids" for -p option */
 static char flgch[] = FLGCH;	/* list of all possible flags (pax) */
 static OPLIST *ophead = NULL;	/* head for format specific options -x */
 static OPLIST *optail = NULL;	/* option tail */
 static int no_op(void);
 static void printflg(unsigned int);
 static int c_frmt(const void *, const void *);
 static off_t str_offt(char *);
 static char *get_line(FILE *fp);
 static void pax_options(int, char **);
 static void pax_usage(void);
 static void tar_options(int, char **);
 static void tar_usage(void);
 #ifndef NO_CPIO
 static void cpio_options(int, char **);
 static void cpio_usage(void);
 #endif
 /* errors from get_line */
 #define GETLINE_FILE_CORRUPT 1
 #define GETLINE_OUT_OF_MEM 2
 static int get_line_error;
 #define BZIP2_CMD	"bzip2"		/* command to run as bzip2 */
 #define GZIP_CMD	"gzip"		/* command to run as gzip */
 #define COMPRESS_CMD	"compress"	/* command to run as compress */
 /*
  * Long options.
  */
 #define	OPT_USE_COMPRESS_PROGRAM	0
 #define	OPT_CHECKPOINT			1
 #define	OPT_UNLINK			2
 #define	OPT_HELP			3
 #define	OPT_ATIME_PRESERVE		4
 #define	OPT_IGNORE_FAILED_READ		5
 #define	OPT_REMOVE_FILES		6
 #define	OPT_NULL			7
 #define	OPT_TOTALS			8
 #define	OPT_VERSION			9
 #define	OPT_EXCLUDE			10
 #define	OPT_BLOCK_COMPRESS		11
 #define	OPT_NORECURSE			12
 #define	OPT_FORCE_LOCAL			13
 #define	OPT_INSECURE			14
 #define	OPT_STRICT			15
 #define	OPT_SPARSE			16
 #if !HAVE_NBTOOL_CONFIG_H
 #define	OPT_CHROOT			17
 #endif
 /*
  *	Format specific routine table - MUST BE IN SORTED ORDER BY NAME
  *	(see pax.h for description of each function)
+ *
  *	name, blksz, hdsz, udev, hlk, blkagn, inhead, id, st_read,
  *	read, end_read, st_write, write, end_write, trail,
  *	subtrail, rd_data, wr_data, options
  */
 FSUB fsub[] = {
 #ifndef NO_CPIO
 /* 0: OLD BINARY CPIO */
 	{ "bcpio", 5120, sizeof(HD_BCPIO), 1, 0, 0, 1, bcpio_id, cpio_strd,
 	bcpio_rd, bcpio_endrd, cpio_stwr, bcpio_wr, cpio_endwr, NULL,
 	cpio_subtrail, rd_wrfile, wr_rdfile, bad_opt },
 /* 1: OLD OCTAL CHARACTER CPIO */
 	{ "cpio", 5120, sizeof(HD_CPIO), 1, 0, 0, 1, cpio_id, cpio_strd,
 	cpio_rd, cpio_endrd, cpio_stwr, cpio_wr, cpio_endwr, NULL,
 	cpio_subtrail, rd_wrfile, wr_rdfile, bad_opt },
 /* 2: SVR4 HEX CPIO */
 	{ "sv4cpio", 5120, sizeof(HD_VCPIO), 1, 0, 0, 1, vcpio_id, cpio_strd,
 	vcpio_rd, vcpio_endrd, cpio_stwr, vcpio_wr, cpio_endwr, NULL,
 	cpio_subtrail, rd_wrfile, wr_rdfile, bad_opt },
 /* 3: SVR4 HEX CPIO WITH CRC */
 	{ "sv4crc", 5120, sizeof(HD_VCPIO), 1, 0, 0, 1, crc_id, crc_strd,
 	vcpio_rd, vcpio_endrd, crc_stwr, vcpio_wr, cpio_endwr, NULL,
 	cpio_subtrail, rd_wrfile, wr_rdfile, bad_opt },
 #endif
 /* 4: OLD TAR */
 	{ "tar", 10240, BLKMULT, 0, 1, BLKMULT, 0, tar_id, no_op,
 	tar_rd, tar_endrd, no_op, tar_wr, tar_endwr, tar_trail,
 	NULL, rd_wrfile, wr_rdfile, tar_opt },
 /* 5: POSIX USTAR */
 	{ "ustar", 10240, BLKMULT, 0, 1, BLKMULT, 0, ustar_id, ustar_strd,
 	ustar_rd, tar_endrd, ustar_stwr, ustar_wr, tar_endwr, tar_trail,
 	NULL, rd_wrfile, wr_rdfile, bad_opt }
 };
 #ifndef NO_CPIO
 #define F_BCPIO		0	/* old binary cpio format */
 #define F_CPIO		1	/* old octal character cpio format */
 #define F_SV4CPIO	2	/* SVR4 hex cpio format */
 #define F_SV4CRC	3	/* SVR4 hex with crc cpio format */
 #define F_TAR		4	/* old V7 UNIX tar format */
 #define F_USTAR		5	/* ustar format */
 #else
 #define F_TAR		0	/* old V7 UNIX tar format */
 #define F_USTAR		1	/* ustar format */
 #endif
 #define DEFLT		F_USTAR	/* default write format from list above */
 /*
  * ford is the archive search order used by get_arc() to determine what kind
  * of archive we are dealing with. This helps to properly id archive formats
  * some formats may be subsets of others....
  */
 int ford[] = {F_USTAR, F_TAR,
 #ifndef NO_CPIO
     F_SV4CRC, F_SV4CPIO, F_CPIO, F_BCPIO,
 #endif
     -1};
 /*
  * filename record separator
  */
 int sep = '\n';
 /*
  * Do we have -C anywhere?
  */
 int havechd = 0;
 /*
  * options()
  *	figure out if we are pax, tar or cpio. Call the appropriate options
  *	parser
  */
 void
 options(int argc, char **argv)
+{
 	/*
 	 * Are we acting like pax, tar or cpio (based on argv[0])
 	 */
 	if ((argv0 = strrchr(argv[0], '/')) != NULL)
 		argv0++;
 	else
 		argv0 = argv[0];
 	if (strstr(argv0, NM_TAR)) {
 		argv0 = NM_TAR;
 		tar_options(argc, argv);
 #ifndef NO_CPIO
 	} else if (strstr(argv0, NM_CPIO)) {
 		argv0 = NM_CPIO;
 		cpio_options(argc, argv);
 #endif
 	} else {
 		argv0 = NM_PAX;
 		pax_options(argc, argv);
+	}
+}
 struct option pax_longopts[] = {
 	{ "insecure",		no_argument,		0,
 						OPT_INSECURE },
 	{ "force-local",	no_argument,		0,
 						OPT_FORCE_LOCAL },
 	{ 0,			0,			0,
 },
 };
 /*
  * pax_options()
  *	look at the user specified flags. set globals as required and check if
  *	the user specified a legal set of flags. If not, complain and exit
  */
 static void
 pax_options(int argc, char **argv)
+{
 	int c;
 	size_t i;
 	u_int64_t flg = 0;
 	u_int64_t bflg = 0;
 	char *pt;
 	FSUB tmp;
 	/*
 	 * process option flags
 	 */
 	while ((c = getopt_long(argc, argv,
 	    "0ab:cdf:ijklno:p:rs:tuvwx:zAB:DE:G:HLMN:OPT:U:VXYZ",
 	    pax_longopts, NULL)) != -1) {
 		switch (c) {
 		case '0':
 			sep = '\0';
 			break;
 		case 'a':
 			/*
 			 * append
 			 */
 			flg |= AF;
 			break;
 		case 'b':
 			/*
 			 * specify blocksize
 			 */
 			flg |= BF;
 			if ((wrblksz = (int)str_offt(optarg)) <= 0) {
 				tty_warn(1, "Invalid block size %s", optarg);
 				pax_usage();
+			}
 			break;
 		case 'c':
 			/*
 			 * inverse match on patterns
 			 */
 			cflag = 1;
 			flg |= CF;
 			break;
 		case 'd':
 			/*
 			 * match only dir on extract, not the subtree at dir
 			 */
 			dflag = 1;
 			flg |= DF;
 			break;
 		case 'f':
 			/*
 			 * filename where the archive is stored
 			 */
 			arcname = optarg;
 			flg |= FF;
 			break;
 		case 'i':
 			/*
 			 * interactive file rename
 			 */
 			iflag = 1;
 			flg |= IF;
 			break;
 		case 'j':
 			/*
 			 * pass through bzip2
 			 */
 			jflag = 1;
 			gzip_program = BZIP2_CMD;
 			break;
 		case 'k':
 			/*
 			 * do not clobber files that exist
 			 */
 			kflag = 1;
 			flg |= KF;
 			break;
 		case 'l':
 			/*
 			 * try to link src to dest with copy (-rw)
 			 */
 			lflag = 1;
 			flg |= LF;
 			break;
 		case 'n':
 			/*
 			 * select first match for a pattern only
 			 */
 			nflag = 1;
 			flg |= NF;
 			break;
 		case 'o':
 			/*
 			 * pass format specific options
 			 */
 			flg |= OF;
 			if (opt_add(optarg) < 0)
 				pax_usage();
 			break;
 		case 'p':
 			/*
 			 * specify file characteristic options
 			 */
 			for (pt = optarg; *pt != '\0'; ++pt) {
 				switch(*pt) {
 				case 'a':
 					/*
 					 * do not preserve access time
 					 */
 					patime = 0;
 					break;
 				case 'e':
 					/*
 					 * preserve user id, group id, file
 					 * mode, access/modification times
 					 * and file flags.
 					 */
 					pids = 1;
 					pmode = 1;
 					patime = 1;
 					pmtime = 1;
 					pfflags = 1;
 					break;
 #if 0
 				case 'f':
 					/*
 					 * do not preserve file flags
 					 */
 					pfflags = 0;
 					break;
 #endif
 				case 'm':
 					/*
 					 * do not preserve modification time
 					 */
 					pmtime = 0;
 					break;
 				case 'o':
 					/*
 					 * preserve uid/gid
 					 */
 					pids = 1;
 					break;
 				case 'p':
 					/*
 					 * preserve file mode bits
 					 */
 					pmode = 1;
 					break;
 				default:
 					tty_warn(1, "Invalid -p string: %c",
 					    *pt);
 					pax_usage();
 					break;
+				}
+			}
 			flg |= PF;
 			break;
 		case 'r':
 			/*
 			 * read the archive
 			 */
 			flg |= RF;
 			break;
 		case 's':
 			/*
 			 * file name substitution name pattern
 			 */
 			if (rep_add(optarg) < 0) {
 				pax_usage();
 				break;
+			}
 			flg |= SF;
 			break;
 		case 't':
 			/*
 			 * preserve access time on filesystem nodes we read
 			 */
 			tflag = 1;
 			flg |= TF;
 			break;
 		case 'u':
 			/*
 			 * ignore those older files
 			 */
 			uflag = 1;
 			flg |= UF;
 			break;
 		case 'v':
 			/*
 			 * verbose operation mode
 			 */
 			vflag = 1;
 			flg |= VF;
 			break;
 		case 'w':
 			/*
 			 * write an archive
 			 */
 			flg |= WF;
 			break;
 		case 'x':
 			/*
 			 * specify an archive format on write
 			 */
 			tmp.name = optarg;
 			frmt = (FSUB *)bsearch((void *)&tmp, (void *)fsub,
 			    sizeof(fsub)/sizeof(FSUB), sizeof(FSUB), c_frmt);
 			if (frmt != NULL) {
 				flg |= XF;
 				break;
+			}
 			tty_warn(1, "Unknown -x format: %s", optarg);
 			(void)fputs("pax: Known -x formats are:", stderr);
 			for (i = 0; i < (sizeof(fsub)/sizeof(FSUB)); ++i)
 				(void)fprintf(stderr, " %s", fsub[i].name);
 			(void)fputs("\n\n", stderr);
 			pax_usage();
 			break;
 		case 'z':
 			/*
 			 * use gzip.  Non standard option.
 			 */
 			gzip_program = GZIP_CMD;
 			break;
 		case 'A':
 			Aflag = 1;
 			flg |= CAF;
 			break;
 		case 'B':
 			/*
 			 * non-standard option on number of bytes written on a
 			 * single archive volume.
 			 */
 			if ((wrlimit = str_offt(optarg)) <= 0) {
 				tty_warn(1, "Invalid write limit %s", optarg);
 				pax_usage();
+			}
 			if (wrlimit % BLKMULT) {
 				tty_warn(1,
 				    "Write limit is not a %d byte multiple",
 				    BLKMULT);
 				pax_usage();
+			}
 			flg |= CBF;
 			break;
 		case 'D':
 			/*
 			 * On extraction check file inode change time before the
 			 * modification of the file name. Non standard option.
 			 */
 			Dflag = 1;
 			flg |= CDF;
 			break;
 		case 'E':
 			/*
 			 * non-standard limit on read faults
 			 * 0 indicates stop after first error, values
 			 * indicate a limit, "none" try forever
 			 */
 			flg |= CEF;
 			if (strcmp(none, optarg) == 0)
 				maxflt = -1;
 			else if ((maxflt = atoi(optarg)) < 0) {
 				tty_warn(1,
 				    "Error count value must be positive");
 				pax_usage();
+			}
 			break;
 		case 'G':
 			/*
 			 * non-standard option for selecting files within an
 			 * archive by group (gid or name)
 			 */
 			if (grp_add(optarg) < 0) {
 				pax_usage();
 				break;
+			}
 			flg |= CGF;
 			break;
 		case 'H':
 			/*
 			 * follow command line symlinks only
 			 */
 			Hflag = 1;
 			flg |= CHF;
 			break;
 		case 'L':
 			/*
 			 * follow symlinks
 			 */
 			Lflag = 1;
 			flg |= CLF;
 			break;
 #ifdef SMALL
 		case 'M':
 		case 'N':
 			tty_warn(1, "Support for -%c is not compiled in", c);
 			exit(1);
 #else	/* !SMALL */
 		case 'M':
 			/*
 			 * Treat list of filenames on stdin as an
 			 * mtree(8) specfile.  Non standard option.
 			 */
 			Mflag = 1;
 			flg |= CMF;
 			break;
 		case 'N':
 			/*
 			 * Use alternative directory for user db lookups.
 			 */
 			if (!setup_getid(optarg)) {
 				tty_warn(1,
 			    "Unable to use user and group databases in `%s'",
 				    optarg);
 				pax_usage();
+			}
 			break;
 #endif	/* !SMALL */
 		case 'O':
 			/*
 			 * Force one volume.  Non standard option.
 			 */
 			force_one_volume = 1;
 			break;
 		case 'P':
 			/*
 			 * do NOT follow symlinks (default)
 			 */
 			Lflag = 0;
 			flg |= CPF;
 			break;
 		case 'T':
 			/*
 			 * non-standard option for selecting files within an
 			 * archive by modification time range (lower,upper)
 			 */
 			if (trng_add(optarg) < 0) {
 				pax_usage();
 				break;
+			}
 			flg |= CTF;
 			break;
 		case 'U':
 			/*
 			 * non-standard option for selecting files within an
 			 * archive by user (uid or name)
 			 */
 			if (usr_add(optarg) < 0) {
 				pax_usage();
 				break;
+			}
 			flg |= CUF;
 			break;
 		case 'V':
 			/*
 			 * somewhat verbose operation mode (no listing)
 			 */
 			Vflag = 1;
 			flg |= VSF;
 			break;
 		case 'X':
 			/*
 			 * do not pass over mount points in the file system
 			 */
 			Xflag = 1;
 			flg |= CXF;
 			break;
 		case 'Y':
 			/*
 			 * On extraction check file inode change time after the
 			 * modification of the file name. Non standard option.
 			 */
 			Yflag = 1;
 			flg |= CYF;
 			break;
 		case 'Z':
 			/*
 			 * On extraction check modification time after the
 			 * modification of the file name. Non standard option.
 			 */
 			Zflag = 1;
 			flg |= CZF;
 			break;
 		case OPT_INSECURE:
 			secure = 0;
 			break;
 		case OPT_FORCE_LOCAL:
 			forcelocal = 0;
 			break;
 		case '?':
 		default:
 			pax_usage();
 			break;
+		}
+	}
 	/*
 	 * figure out the operation mode of pax read,write,extract,copy,append
 	 * or list. check that we have not been given a bogus set of flags
 	 * for the operation mode.
 	 */
 	if (ISLIST(flg)) {
 		act = LIST;
 		listf = stdout;
 		bflg = flg & BDLIST;
 	} else if (ISEXTRACT(flg)) {
 		act = EXTRACT;
 		bflg = flg & BDEXTR;
 	} else if (ISARCHIVE(flg)) {
 		act = ARCHIVE;
 		bflg = flg & BDARCH;
 	} else if (ISAPPND(flg)) {
 		act = APPND;
 		bflg = flg & BDARCH;
 	} else if (ISCOPY(flg)) {
 		act = COPY;
 		bflg = flg & BDCOPY;
 	} else
 		pax_usage();
 	if (bflg) {
 		printflg(flg);
 		pax_usage();
+	}
 	/*
 	 * if we are writing (ARCHIVE) we use the default format if the user
 	 * did not specify a format. when we write during an APPEND, we will
 	 * adopt the format of the existing archive if none was supplied.
 	 */
 	if (!(flg & XF) && (act == ARCHIVE))
 		frmt = &(fsub[DEFLT]);
 	/*
 	 * process the args as they are interpreted by the operation mode
 	 */
 	switch (act) {
 	case LIST:
 	case EXTRACT:
 		for (; optind < argc; optind++)
-			if (pat_add(argv[optind], NULL, NOGLOB_MTCH) < 0)
+			if (pat_add(argv[optind], NULL, 0) < 0)
 				pax_usage();
 		break;
 	case COPY:
 		if (optind >= argc) {
 			tty_warn(0, "Destination directory was not supplied");
 			pax_usage();
+		}
 		--argc;
 		dirptr = argv[argc];
 		if (mkpath(dirptr) < 0)
 			exit(1);
 		/* FALLTHROUGH */
 	case ARCHIVE:
 	case APPND:
 		for (; optind < argc; optind++)
 			if (ftree_add(argv[optind], 0) < 0)
 				pax_usage();
 		/*
 		 * no read errors allowed on updates/append operation!
 		 */
 		maxflt = 0;
 		break;
+	}
+}
 /*
  * tar_options()
  *	look at the user specified flags. set globals as required and check if
  *	the user specified a legal set of flags. If not, complain and exit
  */
 struct option tar_longopts[] = {
 	{ "block-size",		required_argument,	0,	'b' },
 	{ "bunzip2",		no_argument,		0,	'j' },
 	{ "bzip2",		no_argument,		0,	'j' },
 	{ "create",		no_argument,		0,	'c' },	/* F */
 	/* -e -- no corresponding long option */
 	{ "file",		required_argument,	0,	'f' },
 	{ "dereference",	no_argument,		0,	'h' },
 	{ "keep-old-files",	no_argument,		0,	'k' },
 	{ "one-file-system",	no_argument,		0,	'l' },
 	{ "modification-time",	no_argument,		0,	'm' },
 	{ "old-archive",	no_argument,		0,	'o' },
 	{ "portability",	no_argument,		0,	'o' },
 	{ "same-permissions",	no_argument,		0,	'p' },
 	{ "preserve-permissions", no_argument,		0,	'p' },
 	{ "preserve",		no_argument,		0,	'p' },
 	{ "fast-read",		no_argument,		0,	'q' },
 	{ "append",		no_argument,		0,	'r' },	/* F */
 	{ "update",		no_argument,		0,	'u' },	/* F */
 	{ "list",		no_argument,		0,	't' },	/* F */
 	{ "verbose",		no_argument,		0,	'v' },
 	{ "interactive",	no_argument,		0,	'w' },
 	{ "confirmation",	no_argument,		0,	'w' },
 	{ "extract",		no_argument,		0,	'x' },	/* F */
 	{ "get",		no_argument,		0,	'x' },	/* F */
 	{ "gzip",		no_argument,		0,	'z' },
 	{ "gunzip",		no_argument,		0,	'z' },
 	{ "read-full-blocks",	no_argument,		0,	'B' },
 	{ "directory",		required_argument,	0,	'C' },
 	{ "to-stdout",		no_argument,		0,	'O' },
 	{ "absolute-paths",	no_argument,		0,	'P' },
 	{ "sparse",		no_argument,		0,	'S' },
 	{ "files-from",		required_argument,	0,	'T' },
 	{ "summary",		no_argument,		0,	'V' },
 	{ "stats",		no_argument,		0,	'V' },
 	{ "exclude-from",	required_argument,	0,	'X' },
 	{ "compress",		no_argument,		0,	'Z' },
 	{ "uncompress",		no_argument,		0,	'Z' },
 	{ "strict",		no_argument,		0,
 						OPT_STRICT },
 	{ "atime-preserve",	no_argument,		0,
 						OPT_ATIME_PRESERVE },
 	{ "unlink",		no_argument,		0,
 						OPT_UNLINK },
 	{ "use-compress-program", required_argument,	0,
 						OPT_USE_COMPRESS_PROGRAM },
 	{ "force-local",	no_argument,		0,
 						OPT_FORCE_LOCAL },
 	{ "insecure",		no_argument,		0,
 						OPT_INSECURE },
 	{ "exclude",		required_argument,	0,
 						OPT_EXCLUDE },
 	{ "no-recursion",	no_argument,		0,
 						OPT_NORECURSE },
 #if !HAVE_NBTOOL_CONFIG_H
 	{ "chroot",		no_argument,		0,
 						OPT_CHROOT },
 #endif
 #if 0 /* Not implemented */
 	{ "catenate",		no_argument,		0,	'A' },	/* F */
 	{ "concatenate",	no_argument,		0,	'A' },	/* F */
 	{ "diff",		no_argument,		0,	'd' },	/* F */
 	{ "compare",		no_argument,		0,	'd' },	/* F */
 	{ "checkpoint",		no_argument,		0,
 						OPT_CHECKPOINT },
 	{ "help",		no_argument,		0,
 						OPT_HELP },
 	{ "info-script",	required_argument,	0,	'F' },
 	{ "new-volume-script",	required_argument,	0,	'F' },
 	{ "incremental",	no_argument,		0,	'G' },
 	{ "listed-incremental",	required_argument,	0,	'g' },
 	{ "ignore-zeros",	no_argument,		0,	'i' },
 	{ "ignore-failed-read",	no_argument,		0,
 						OPT_IGNORE_FAILED_READ },
 	{ "starting-file",	no_argument,		0,	'K' },
 	{ "tape-length",	required_argument,	0,	'L' },
 	{ "multi-volume",	no_argument,		0,	'M' },
 	{ "after-date",		required_argument,	0,	'N' },
 	{ "newer",		required_argument,	0,	'N' },
 	{ "record-number",	no_argument,		0,	'R' },
 	{ "remove-files",	no_argument,		0,
 						OPT_REMOVE_FILES },
 	{ "same-order",		no_argument,		0,	's' },
 	{ "preserve-order",	no_argument,		0,	's' },
 	{ "null",		no_argument,		0,
 						OPT_NULL },
 	{ "totals",		no_argument,		0,
 						OPT_TOTALS },
 	{ "volume-name",	required_argument,	0,	'V' }, /* XXX */
 	{ "label",		required_argument,	0,	'V' }, /* XXX */
 	{ "version",		no_argument,		0,
 						OPT_VERSION },
 	{ "verify",		no_argument,		0,	'W' },
 	{ "block-compress",	no_argument,		0,
 						OPT_BLOCK_COMPRESS },
 #endif
 	{ 0,			0,			0,	0 },
 };
 static void
 tar_set_action(int op)
+{
 	if (act != ERROR && act != op)
 		tar_usage();
 	act = op;
+}
 static void
 tar_options(int argc, char **argv)
+{
 	int c;
 	int fstdin = 0;
 	int Oflag = 0;
 	int nincfiles = 0;
 	int incfiles_max = 0;
 	struct incfile {
 		char *file;
 		char *dir;
 	};
 	struct incfile *incfiles = NULL;
 	/*
 	 * Set default values.
 	 */
 	rmleadslash = 1;
 	is_gnutar = 1;
 	/*
 	 * process option flags
 	 */
 	while ((c = getoldopt(argc, argv,
 	    "+b:cef:hjklmopqrs:tuvwxzBC:HI:OPST:X:Z014578",
 	    tar_longopts, NULL))
 	    != -1)  {
 		switch(c) {
 		case 'b':
 			/*
 			 * specify blocksize in 512-byte blocks
 			 */
 			if ((wrblksz = (int)str_offt(optarg)) <= 0) {
 				tty_warn(1, "Invalid block size %s", optarg);
 				tar_usage();
+			}
 			wrblksz *= 512;		/* XXX - check for int oflow */
 			break;
 		case 'c':
 			/*
 			 * create an archive
 			 */
 			tar_set_action(ARCHIVE);
 			break;
 		case 'e':
 			/*
 			 * stop after first error
 			 */
 			maxflt = 0;
 			break;
 		case 'f':
 			/*
 			 * filename where the archive is stored
 			 */
 			if ((optarg[0] == '-') && (optarg[1]== '\0')) {
 				/*
 				 * treat a - as stdin
 				 */
 				fstdin = 1;
 				arcname = NULL;
 				break;
+			}
 			fstdin = 0;
 			arcname = optarg;
 			break;
 		case 'h':
 			/*
 			 * follow symlinks
 			 */
 			Lflag = 1;
 			break;
 		case 'j':
 			/*
 			 * pass through bzip2. not a standard option
 			 */
 			jflag = 1;
 			gzip_program = BZIP2_CMD;
 			break;
 		case 'k':
 			/*
 			 * do not clobber files that exist
 			 */
 			kflag = 1;
 			break;
 		case 'l':
 			/*
 			 * do not pass over mount points in the file system
 			 */
 			Xflag = 1;
 			break;
 		case 'm':
 			/*
 			 * do not preserve modification time
 			 */
 			pmtime = 0;
 			break;
 		case 'o':
 			/*
 			 * This option does several things based on whether
 			 * this is a create or extract operation.
 			 */
 			if (act == ARCHIVE) {
 				/* GNU tar: write V7 format archives. */
 				Oflag = 1;
 				/* 4.2BSD: don't add directory entries. */
 				if (opt_add("write_opt=nodir") < 0)
 					tar_usage();
 			} else {
 				/* SUS: don't preserve owner/group. */
 				pids = 0;
 				nopids = 1;
+			}
 			break;
 		case 'O':
 			Oflag = 1;
 			break;
 		case 'p':
 			/*
 			 * preserve user id, group id, file
 			 * mode, access/modification times
 			 */
 			if (!nopids)
 				pids = 1;
 			pmode = 1;
 			patime = 1;
 			pmtime = 1;
 			break;
 		case 'q':
 			/*
 			 * select first match for a pattern only
 			 */
 			nflag = 1;
 			break;
 		case 'r':
 		case 'u':
 			/*
 			 * append to the archive
 			 */
 			tar_set_action(APPND);
 			break;
 		case 's':
 			/*
 			 * file name substitution name pattern
 			 */
 			if (rep_add(optarg) < 0) {
 				tar_usage();
 				break;
+			}
 			break;
 		case 't':
 			/*
 			 * list contents of the tape
 			 */
 			tar_set_action(LIST);
 			break;
 		case 'v':
 			/*
 			 * verbose operation mode
 			 */
 			vflag = 1;
 			break;
 		case 'w':
 			/*
 			 * interactive file rename
 			 */
 			iflag = 1;
 			break;
 		case 'x':
 			/*
 			 * extract an archive, preserving mode,
 			 * and mtime if possible.
 			 */
 			tar_set_action(EXTRACT);
 			pmtime = 1;
 			break;
 		case 'z':
 			/*
 			 * use gzip.  Non standard option.
 			 */
 			zflag = 1;
 			gzip_program = GZIP_CMD;
 			break;
 		case 'B':
 			/*
 			 * Nothing to do here, this is pax default
 			 */
 			break;
 		case 'C':
 			havechd++;
 			chdname = optarg;
 			break;
 		case 'H':
 			/*
 			 * follow command line symlinks only
 			 */
 			Hflag = 1;
 			break;
 		case 'I':
 		case 'T':
 			if (++nincfiles > incfiles_max) {
 				incfiles_max = nincfiles + 3;
 				incfiles = realloc(incfiles,
 				    sizeof(*incfiles) * incfiles_max);
 				if (incfiles == NULL) {
 					tty_warn(0, "Unable to allocate space "
 					    "for option list");
 					exit(1);
+				}
+			}
 			incfiles[nincfiles - 1].file = optarg;
 			incfiles[nincfiles - 1].dir = chdname;
 			break;
 		case 'P':
 			/*
 			 * do not remove leading '/' from pathnames
 			 */
 			rmleadslash = 0;
 			Aflag = 1;
 			break;
 		case 'S':
 			/* do nothing; we already generate sparse files */
 			break;
 		case 'V':
 			/*
 			 * semi-verbose operation mode (no listing)
 			 */
 			Vflag = 1;
 			break;
 		case 'X':
 			/*
 			 * GNU tar compat: exclude the files listed in optarg
 			 */
 			if (tar_gnutar_X_compat(optarg) != 0)
 				tar_usage();
 			break;
 		case 'Z':
 			/*
 			 * use compress.
 			 */
 			zflag = 1;
 			gzip_program = COMPRESS_CMD;
 			break;
 		case '0':
 			arcname = DEV_0;
 			break;
 		case '1':
 			arcname = DEV_1;
 			break;
 		case '4':
 			arcname = DEV_4;
 			break;
 		case '5':
 			arcname = DEV_5;
 			break;
 		case '7':
 			arcname = DEV_7;
 			break;
 		case '8':
 			arcname = DEV_8;
 			break;
 		case OPT_ATIME_PRESERVE:
 			patime = 1;
 			break;
 		case OPT_UNLINK:
 			/* Just ignore -- we always unlink first. */
 			break;
 		case OPT_USE_COMPRESS_PROGRAM:
 			zflag = 1;
 			gzip_program = optarg;
 			break;
 		case OPT_FORCE_LOCAL:
 			forcelocal = 1;
 			break;
 		case OPT_INSECURE:
 			secure = 0;
 			break;
 		case OPT_STRICT:
 			/* disable gnu extensions */
 			is_gnutar = 0;
 			break;
 		case OPT_EXCLUDE:
 			if (tar_gnutar_minus_minus_exclude(optarg) != 0)
 				tar_usage();
 			break;
 		case OPT_NORECURSE:
 			dflag = 1;
 			break;
 #if !HAVE_NBTOOL_CONFIG_H
 		case OPT_CHROOT:
 			do_chroot = 1;
 			break;
 #endif
 		default:
 			tar_usage();
 			break;
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	/* Tar requires an action. */
 	if (act == ERROR)
 		tar_usage();
 	/* Traditional tar behaviour (pax uses stderr unless in list mode) */
 	if (fstdin == 1 && act == ARCHIVE)
 		listf = stderr;
 	else
 		listf = stdout;
 	/* Traditional tar behaviour (pax wants to read file list from stdin) */
 	if ((act == ARCHIVE || act == APPND) && argc == 0 && nincfiles == 0)
 		exit(0);
 	/*
 	 * if we are writing (ARCHIVE) specify tar, otherwise run like pax
 	 * (unless -o specified)
 	 */
 	if (act == ARCHIVE || act == APPND)
 		frmt = &(fsub[Oflag ? F_TAR : F_USTAR]);
 	else if (Oflag) {
 		if (act == EXTRACT)
 			to_stdout = 1;
 		else {
 			tty_warn(1, "The -O/-o options are only valid when "
 			    "writing or extracting an archive");
 			tar_usage();
+		}
+	}
 	/*
 	 * process the args as they are interpreted by the operation mode
 	 */
 	switch (act) {
 	case LIST:
 	case EXTRACT:
 	default:
+		{
 			int sawpat = 0;
 			int dirisnext = 0;
 			char *file, *dir = NULL;
 			int mustfreedir = 0;
 			while (nincfiles || *argv != NULL) {
 				/*
 				 * If we queued up any include files,
 				 * pull them in now.  Otherwise, check
 				 * for -I and -C positional flags.
 				 * Anything else must be a file to
 				 * extract.
 				 */
 				if (nincfiles) {
 					file = incfiles->file;
 					dir = incfiles->dir;
 					mustfreedir = 0;
 					incfiles++;
 					nincfiles--;
 				} else if (strcmp(*argv, "-I") == 0) {
 					if (*++argv == NULL)
 						break;
 					file = *argv++;
 					dir = chdname;
 					mustfreedir = 0;
 				} else {
 					file = NULL;
 					dir = NULL;
 					mustfreedir = 0;
+				}
 				if (file != NULL) {
 					FILE *fp;
 					char *str;
 					if (strcmp(file, "-") == 0)
 						fp = stdin;
 					else if ((fp = fopen(file, "r")) == NULL) {
 						tty_warn(1, "Unable to open file '%s' for read", file);
 						tar_usage();
+					}
 					while ((str = get_line(fp)) != NULL) {
 						if (dirisnext) {
 							if (dir && mustfreedir)
 								free(dir);
 							dir = str;
 							mustfreedir = 1;
 							dirisnext = 0;
 							continue;
+						}
 						if (strcmp(str, "-C") == 0) {
 							havechd++;
 							dirisnext = 1;
 							free(str);
 							continue;
+						}
 						if (strncmp(str, "-C ", 3) == 0) {
 							havechd++;
 							if (dir && mustfreedir)
 								free(dir);
 							dir = strdup(str + 3);
 							mustfreedir = 1;
 							free(str);
 							continue;
+						}
 						if (pat_add(str, dir, NOGLOB_MTCH) < 0)
 							tar_usage();
 						sawpat = 1;
+					}
 					/* Bomb if given -C w/out a dir. */
 					if (dirisnext)
 						tar_usage();
 					if (dir && mustfreedir)
 						free(dir);
 					if (strcmp(file, "-") != 0)
 						fclose(fp);
 					if (get_line_error) {
 						tty_warn(1, "Problem with file '%s'", file);
 						tar_usage();
+					}
 				} else if (strcmp(*argv, "-C") == 0) {
 					if (*++argv == NULL)
  						break;
 					chdname = *argv++;
 					havechd++;
 				} else if (pat_add(*argv++, chdname, 0) < 0)
 					tar_usage();
 				else
 					sawpat = 1;
+			}
 			/*
 			 * if patterns were added, we are doing	chdir()
 			 * on a file-by-file basis, else, just one
 			 * global chdir (if any) after opening input.
 			 */
 			if (sawpat > 0)
 				chdname = NULL;
+		}
 		break;
 	case ARCHIVE:
 	case APPND:
 		if (chdname != NULL) {	/* initial chdir() */
 			if (ftree_add(chdname, 1) < 0)
 				tar_usage();
+		}
 		while (nincfiles || *argv != NULL) {
 			char *file, *dir;
 			/*
 			 * If we queued up any include files, pull them in
 			 * now.  Otherwise, check for -I and -C positional
 			 * flags.  Anything else must be a file to include
 			 * in the archive.
 			 */
 			if (nincfiles) {
 				file = incfiles->file;
 				dir = incfiles->dir;
 				incfiles++;
 				nincfiles--;
 			} else if (strcmp(*argv, "-I") == 0) {
 				if (*++argv == NULL)
 					break;
 				file = *argv++;
 				dir = NULL;
 			} else {
 				file = NULL;
 				dir = NULL;
+			}
 			if (file != NULL) {
 				FILE *fp;
 				char *str;
 				int dirisnext = 0;
 				/* Set directory if needed */
 				if (dir) {
 					if (ftree_add(dir, 1) < 0)
 						tar_usage();
+				}
 				if (strcmp(file, "-") == 0)
 					fp = stdin;
 				else if ((fp = fopen(file, "r")) == NULL) {
 					tty_warn(1, "Unable to open file '%s' for read", file);
 					tar_usage();
+				}
 				while ((str = get_line(fp)) != NULL) {
 					if (dirisnext) {
 						if (ftree_add(str, 1) < 0)
 							tar_usage();
 						dirisnext = 0;
 						continue;
+					}
 					if (strcmp(str, "-C") == 0) {
 						dirisnext = 1;
 						continue;
+					}
 					if (strncmp(str, "-C ", 3) == 0) {
 						if (ftree_add(str + 3, 1) < 0)
 							tar_usage();
 						continue;
+					}
 					if (ftree_add(str, 0) < 0)
 						tar_usage();
+				}
 				/* Bomb if given -C w/out a dir. */
 				if (dirisnext)
 					tar_usage();
 				if (strcmp(file, "-") != 0)
 					fclose(fp);
 				if (get_line_error) {
 					tty_warn(1, "Problem with file '%s'",
 					    file);
 					tar_usage();
+				}
 			} else if (strcmp(*argv, "-C") == 0) {
 				if (*++argv == NULL)
 					break;
 				if (ftree_add(*argv++, 1) < 0)
 					tar_usage();
 			} else if (ftree_add(*argv++, 0) < 0)
 				tar_usage();
+		}
 		/*
 		 * no read errors allowed on updates/append operation!
 		 */
 		maxflt = 0;
 		break;
+	}
 	if (!fstdin && ((arcname == (char *)NULL) || (*arcname == '\0'))) {
 		arcname = getenv("TAPE");
 		if ((arcname == NULL) || (*arcname == '\0'))
 			arcname = _PATH_DEFTAPE;
+	}
+}
 int
 mkpath(path)
 	char *path;
+{
 	char *slash;
 	int done = 0;
 	slash = path;
 	while (!done) {
 		slash += strspn(slash, "/");
 		slash += strcspn(slash, "/");
 		done = (*slash == '\0');
 		*slash = '\0';
 		if (domkdir(path, 0777) == -1)
 			goto out;
 		if (!done)
 			*slash = '/';
+	}
 	return 0;
 out:
 	/* Can't create or or not a directory */
 	syswarn(1, errno, "Cannot create directory `%s'", path);
 	return -1;
+}
 #ifndef NO_CPIO
 struct option cpio_longopts[] = {
 	{ "reset-access-time",	no_argument,		0,	'a' },
 	{ "make-directories",	no_argument,		0, 	'd' },
 	{ "nonmatching",	no_argument,		0,	'f' },
 	{ "extract",		no_argument,		0,	'i' },
 	{ "link",		no_argument,		0,	'l' },
 	{ "preserve-modification-time", no_argument,	0,	'm' },
 	{ "create",		no_argument,		0,	'o' },
 	{ "pass-through",	no_argument,		0,	'p' },
 	{ "rename",		no_argument,		0,	'r' },
 	{ "list",		no_argument,		0,	't' },
 	{ "unconditional",	no_argument,		0,	'u' },
 	{ "verbose",		no_argument,		0,	'v' },
 	{ "append",		no_argument,		0,	'A' },
 	{ "pattern-file",	required_argument,	0,	'E' },
 	{ "file",		required_argument,	0,	'F' },
 	{ "force-local",	no_argument,		0,
 						OPT_FORCE_LOCAL },
 	{ "format",		required_argument,	0,	'H' },
 	{ "dereference",	no_argument,		0,	'L' },
 	{ "swap-halfwords",	no_argument,		0,	'S' },
 	{ "summary",		no_argument,		0,	'V' },
 	{ "stats",		no_argument,		0,	'V' },
 	{ "insecure",		no_argument,		0,
 						OPT_INSECURE },
 	{ "sparse",		no_argument,		0,
 						OPT_SPARSE },
 #ifdef notyet
 /* Not implemented */
 	{ "null",		no_argument,		0,	'0' },
 	{ "swap",		no_argument,		0,	'b' },
 	{ "numeric-uid-gid",	no_argument,		0,	'n' },
 	{ "swap-bytes",		no_argument,		0,	's' },
 	{ "message",		required_argument,	0,	'M' },
 	{ "owner",		required_argument,	0	'R' },
 	{ "dot",		no_argument,		0,	'V' }, /* xxx */
 	{ "block-size",		required_argument,	0,
 						OPT_BLOCK_SIZE },
 	{ "no-absolute-pathnames", no_argument,		0,
 						OPT_NO_ABSOLUTE_PATHNAMES },
 	{ "no-preserve-owner",	no_argument,		0,
 						OPT_NO_PRESERVE_OWNER },
 	{ "only-verify-crc",	no_argument,		0,
 						OPT_ONLY_VERIFY_CRC },
 	{ "rsh-command",	required_argument,	0,
 						OPT_RSH_COMMAND },
 	{ "version",		no_argument,		0,
 						OPT_VERSION },
 #endif
 	{ 0,			0,			0,	0 },
 };
 static void
 cpio_set_action(int op)
+{
 	if ((act == APPND && op == ARCHIVE) || (act == ARCHIVE && op == APPND))
 		act = APPND;
 	else if (act != ERROR && act != op)
 		cpio_usage();
 	else
 		act = op;
+}
 /*
  * cpio_options()
  *	look at the user specified flags. set globals as required and check if
  *	the user specified a legal set of flags. If not, complain and exit
  */
 static void
 cpio_options(int argc, char **argv)
+{
 	FSUB tmp;
 	u_int64_t flg = 0;
 	u_int64_t bflg = 0;
 	int c;
 	size_t i;
 	FILE *fp;
 	char *str;
 	uflag = 1;
 	kflag = 1;
 	pids = 1;
 	pmode = 1;
 	pmtime = 0;
 	arcname = NULL;
 	dflag = 1;
 	nodirs = 1;
 	/*
 	 * process option flags
 	 */
 	while ((c = getoldopt(argc, argv,
 	    "+abcdfiklmoprstuvzABC:E:F:H:I:LM:O:R:SVZ6",
 	    cpio_longopts, NULL)) != -1) {
 		switch(c) {
 		case 'a':
 			/*
 			 * preserve access time on filesystem nodes we read
 			 */
 			tflag = 1;
 			flg |= TF;
 			break;
 #ifdef notyet
 		case 'b':
 			/*
 			 * swap bytes and half-words when reading data
 			 */
 			break;
 #endif
 		case 'c':
 			/*
 			 * ASCII cpio header
 			 */
 			frmt = &fsub[F_SV4CPIO];
 			break;
 		case 'd':
 			/*
 			 * create directories as needed
 			 * pax does this by default ..
 			 */
 			nodirs = 0;
 			break;
 		case 'f':
 			/*
 			 * inverse match on patterns
 			 */
 			cflag = 1;
 			flg |= CF;
 			break;
 		case 'i':
 			/*
 			 * read the archive
 			 */
 			cpio_set_action(EXTRACT);
 			flg |= RF;
 			break;
 #ifdef notyet
 		case 'k':
 			break;
 #endif
 		case 'l':
 			/*
 			 * try to link src to dest with copy (-rw)
 			 */
 			lflag = 1;
 			flg |= LF;
 			break;
 		case 'm':
 			/*
 			 * preserve mtime
 			 */
 			flg |= PF;
 			pmtime = 1;
 			break;
 		case 'o':
 			/*
 			 * write an archive
 			 */
 			cpio_set_action(ARCHIVE);
 			frmt = &(fsub[F_SV4CRC]);
 			flg |= WF;
 			break;
 		case 'p':
 			/*
 			 * cpio -p is like pax -rw
 			 */
 			cpio_set_action(COPY);
 			flg |= RF | WF;
 			break;
 		case 'r':
 			/*
 			 * interactive file rename
 			 */
 			iflag = 1;
 			flg |= IF;
 			break;
 #ifdef notyet
 		case 's':
 			/*
 			 * swap bytes after reading data
 			 */
 			break;
 #endif
 		case 't':
 			/*
 			 * list contents of archive
 			 */
 			cpio_set_action(LIST);
 			listf = stdout;
 			flg &= ~RF;
 			break;
 		case 'u':
 			/*
 			 * don't ignore those older files
 			 */
 			uflag = 0;
 			kflag = 0;
 			flg |= UF;
 			break;
 		case 'v':
 			/*
 			 * verbose operation mode
 			 */
 			vflag = 1;
 			flg |= VF;
 			break;
 		case 'z':
 			/*
 			 * use gzip.  Non standard option.
 			 */
 			gzip_program = GZIP_CMD;
 			break;
 		case 'A':
 			/*
 			 * append to an archive
 			 */
 			cpio_set_action(APPND);
 			flg |= AF;
 			break;
 		case 'B':
 			/*
 			 * set blocksize to 5120
 			 */
 			blksz = 5120;
 			break;
 		case 'C':
 			/*
 			 * specify blocksize
 			 */
 			if ((blksz = (int)str_offt(optarg)) <= 0) {
 				tty_warn(1, "Invalid block size %s", optarg);
 				cpio_usage();
+			}
 			break;
 		case 'E':
 			/*
 			 * file with patterns to extract or list
 			 */
 			if ((fp = fopen(optarg, "r")) == NULL) {
 				tty_warn(1, "Unable to open file '%s' for read",
 				    optarg);
 				cpio_usage();
+			}
 			while ((str = get_line(fp)) != NULL) {
 				pat_add(str, NULL, 0);
+			}
 			fclose(fp);
 			if (get_line_error) {
 				tty_warn(1, "Problem with file '%s'", optarg);
 				cpio_usage();
+			}
 			break;
 		case 'H':
 			/*
 			 * specify an archive format on write
 			 */
 			tmp.name = optarg;
 			frmt = (FSUB *)bsearch((void *)&tmp, (void *)fsub,
 			    sizeof(fsub)/sizeof(FSUB), sizeof(FSUB), c_frmt);
 			if (frmt != NULL) {
 				flg |= XF;
 				break;
+			}
 			tty_warn(1, "Unknown -H format: %s", optarg);
 			(void)fputs("cpio: Known -H formats are:", stderr);
 			for (i = 0; i < (sizeof(fsub)/sizeof(FSUB)); ++i)
 				(void)fprintf(stderr, " %s", fsub[i].name);
 			(void)fputs("\n\n", stderr);
 			cpio_usage();
 			break;
 		case 'I':
 		case 'O':
 			/*
 			 * filename where the archive is stored
 			 */
 			if ((optarg[0] == '-') && (optarg[1]== '\0')) {
 				/*
 				 * treat a - as stdin
 				 */
 				arcname = NULL;
 				break;
+			}
 			arcname = optarg;
 			break;
 		case 'L':
 			/*
 			 * follow symlinks
 			 */
 			Lflag = 1;
 			flg |= CLF;
 			break;
 #ifdef notyet
 		case 'M':
 			arg = optarg;