X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=6b666a6c5364c9d5da64e2352bf5672118859835;hp=c09e6b8b76c812d48665d245fd9f7bfcf4155203;hb=a0d8fe2d66d132550f5a46eeda46f37c5c960efa;hpb=1227625a12a66e0ded78a1997c2d23f23202a382 diff --git a/dump/main.c b/dump/main.c index c09e6b8..6b666a6 100644 --- a/dump/main.c +++ b/dump/main.c @@ -1,8 +1,8 @@ /* * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit - * Remy Card , 1994, 1995, 1996 - * + * Remy Card , 1994-1997 + * Stelian Pop , 1999-2000 */ /*- @@ -39,13 +39,8 @@ */ #ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1980, 1991, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; +static const char rcsid[] = + "$Id: main.c,v 1.21 2000/03/03 11:43:35 stelian Exp $"; #endif /* not lint */ #include @@ -69,8 +64,7 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; #include #include -#include -#include +#include #include #include #include @@ -93,28 +87,32 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; int notify = 0; /* notify operator flag */ int blockswritten = 0; /* number of blocks written on current tape */ int tapeno = 0; /* current tape number */ -int density = 0; /* density in bytes/0.1" */ +int density = 0; /* density in bytes/0.1" " <- this is for hilit19 */ int ntrec = NTREC; /* # tape blocks in each tape record */ int cartridge = 0; /* Assume non-cartridge tape */ +int dokerberos = 0; /* Use Kerberos authentication */ long dev_bsize = 1; /* recalculated below */ long blocksperfile; /* output blocks per file */ char *host = NULL; /* remote host (if any) */ +int sizest = 0; /* return size estimate only */ #ifdef __linux__ char *__progname; #endif -static long numarg __P((char *, long, long)); +int maxbsize = 64*1024; /* XXX MAXBSIZE from sys/param.h */ +static long numarg __P((const char *, long, long)); static void obsolete __P((int *, char **[])); static void usage __P((void)); +ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */ +int iexclude_num = 0; /* number of elements in the list */ + int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { register ino_t ino; - register int dirty; + register int dirty; register struct dinode *dp; register struct fstab *dt; register char *map; @@ -123,9 +121,11 @@ main(argc, argv) ino_t maxino; #ifdef __linux__ errcode_t retval; - char directory[NAME_MAX]; - char pathname[NAME_MAX]; + char directory[MAXPATHLEN]; + char pathname[MAXPATHLEN]; #endif + time_t tnow; + char labelstr[LBLSIZE]; spcl.c_date = 0; #ifdef __linux__ @@ -141,29 +141,51 @@ main(argc, argv) #endif tsize = 0; /* Default later, based on 'c' option for cart tapes */ - tape = _PATH_DEFTAPE; + eot_script = NULL; + if ((tapeprefix = getenv("TAPE")) == NULL) + tapeprefix = _PATH_DEFTAPE; dumpdates = _PATH_DUMPDATES; - temp = _PATH_DTMP; + strcpy(labelstr, "none"); /* XXX safe strcpy. */ if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0) quit("TP_BSIZE must be a multiple of DEV_BSIZE\n"); level = '0'; + if (argc < 2) usage(); obsolete(&argc, &argv); - while ((ch = getopt(argc, argv, "0123456789B:b:cd:f:h:ns:T:uWw")) != -1) switch (ch) { +#ifdef KERBEROS +#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw" +#else +#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw" +#endif + while ((ch = getopt(argc, argv, optstring)) != -1) +#undef optstring + switch (ch) { /* dump level */ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': level = ch; break; + case 'a': /* `auto-size', Write to EOM. */ + unlimited = 1; + break; + case 'B': /* blocks per output file */ - blocksperfile = numarg("blocks per file", 1L, 0L); + blocksperfile = numarg("number of blocks per file", + 1L, 0L); break; case 'b': /* blocks per tape write */ - ntrec = numarg("blocks per write", 1L, 1000L); + ntrec = numarg("number of blocks per write", + 1L, 1000L); + if (ntrec > maxbsize/1024) { + msg("Please choose a blocksize <= %dKB\n", + maxbsize/1024); + exit(X_STARTUP); + } + bflag = 1; break; case 'c': /* Tape is cart. not 9-track */ @@ -175,15 +197,54 @@ main(argc, argv) if (density >= 625 && !bflag) ntrec = HIGHDENSITYTREC; break; + + /* 04-Feb-00 ILC */ + case 'e': /* exclude an inode */ + iexclude_list[iexclude_num++] = + numarg("inode to exclude",0L,0L); + msg("Added %d to exclude list\n", + iexclude_list[iexclude_num-1]); + break; case 'f': /* output file */ - tape = optarg; + tapeprefix = optarg; + break; + + case 'F': /* end of tape script */ + eot_script = optarg; break; case 'h': honorlevel = numarg("honor level", 0L, 10L); break; +#ifdef KERBEROS + case 'k': + dokerberos = 1; + break; +#endif + + case 'L': + /* + * Note that although there are LBLSIZE characters, + * the last must be '\0', so the limit on strlen() + * is really LBLSIZE-1. + */ + strncpy(labelstr, optarg, LBLSIZE); + labelstr[LBLSIZE-1] = '\0'; + if (strlen(optarg) > LBLSIZE-1) { + msg( + "WARNING Label `%s' is larger than limit of %d characters.\n", + optarg, LBLSIZE-1); + msg("WARNING: Using truncated label `%s'.\n", + labelstr); + } + break; + + case 'M': /* multi-volume flag */ + Mflag = 1; + break; + case 'n': /* notify operators */ notify = 1; break; @@ -192,24 +253,29 @@ main(argc, argv) tsize = numarg("tape size", 1L, 0L) * 12 * 10; break; + case 'S': + sizest = 1; /* return size estimate only */ + break; + case 'T': /* time of last dump */ spcl.c_ddate = unctime(optarg); if (spcl.c_ddate < 0) { (void)fprintf(stderr, "bad time \"%s\"\n", optarg); - exit(X_ABORT); + exit(X_STARTUP); } Tflag = 1; lastlevel = '?'; + break; - case 'u': /* update /etc/dumpdates */ + case 'u': /* update dumpdates */ uflag = 1; break; case 'W': /* what to do */ case 'w': lastdump(ch); - exit(0); /* do nothing else */ + exit(X_FINOK); /* do nothing else */ default: usage(); @@ -219,30 +285,34 @@ main(argc, argv) if (argc < 1) { (void)fprintf(stderr, "Must specify disk or filesystem\n"); - exit(X_ABORT); + exit(X_STARTUP); } disk = *argv++; + if (strlen(disk) >= MAXPATHLEN) { + (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk); + exit(X_STARTUP); + } argc--; if (argc >= 1) { (void)fprintf(stderr, "Unknown arguments to dump:"); while (argc--) (void)fprintf(stderr, " %s", *argv++); (void)fprintf(stderr, "\n"); - exit(X_ABORT); + exit(X_STARTUP); } if (Tflag && uflag) { (void)fprintf(stderr, "You cannot use the T and u flags together.\n"); - exit(X_ABORT); + exit(X_STARTUP); } - if (strcmp(tape, "-") == 0) { + if (strcmp(tapeprefix, "-") == 0) { pipeout++; - tape = "standard output"; + tapeprefix = "standard output"; } if (blocksperfile) blocksperfile = blocksperfile / ntrec * ntrec; /* round down */ - else { + else if (!unlimited) { /* * Determine how to default tape size and density * @@ -251,6 +321,7 @@ main(argc, argv) * 9-track 6250 bpi (625 bytes/.1") 2300 ft. * cartridge 8000 bpi (100 bytes/.1") 1700 ft. * (450*4 - slop) + * hilit19 hits again: " */ if (density == 0) density = cartridge ? 100 : 160; @@ -258,16 +329,20 @@ main(argc, argv) tsize = cartridge ? 1700L*120L : 2300L*120L; } - if (strchr(tape, ':')) { - host = tape; - tape = strchr(host, ':'); - *tape++ = '\0'; + if (strchr(tapeprefix, ':')) { + host = tapeprefix; + tapeprefix = strchr(host, ':'); + *tapeprefix++ = '\0'; #ifdef RDUMP + if (index(tapeprefix, '\n')) { + (void)fprintf(stderr, "invalid characters in tape\n"); + exit(X_STARTUP); + } if (rmthost(host) == 0) - exit(X_ABORT); + exit(X_STARTUP); #else (void)fprintf(stderr, "remote dump not enabled\n"); - exit(X_ABORT); + exit(X_STARTUP); #endif } (void)setuid(getuid()); /* rmthost() is the only reason to be setuid */ @@ -286,17 +361,21 @@ main(argc, argv) signal(SIGTERM, sig); if (signal(SIGINT, interrupt) == SIG_IGN) signal(SIGINT, SIG_IGN); - set_operators(); /* /etc/group snarfed */ getfstab(); /* /etc/fstab snarfed */ + /* + * disk may end in / and this can confuse + * fstabsearch. + */ + if (strlen(disk) > 1 && disk[strlen(disk) - 1] == '/') + disk[strlen(disk) - 1] = '\0'; /* * disk can be either the full special file name, * the suffix of the special file name, * the special name missing the leading '/', * the file system name with or without the leading '/'. */ - dt = fstabsearch(disk); - if (dt != NULL) { + if ((dt = fstabsearch(disk)) != NULL) { disk = rawname(dt->fs_spec); (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN); @@ -313,10 +392,10 @@ main(argc, argv) dt = fstabsearchdir(pathname, directory); if (dt != NULL) { char name[MAXPATHLEN]; - (void)sprintf(name, "%s (dir %s)", - dt->fs_spec, directory); - (void)strncpy(spcl.c_dev, name, NAMELEN); - (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN); + (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); + (void)snprintf(name, sizeof(name), "%s (dir %s)", + dt->fs_file, directory); + (void)strncpy(spcl.c_filesys, name, NAMELEN); disk = rawname(dt->fs_spec); } else { (void)strncpy(spcl.c_dev, disk, NAMELEN); @@ -331,49 +410,67 @@ main(argc, argv) NAMELEN); } #endif - (void)strcpy(spcl.c_label, "none"); + spcl.c_dev[NAMELEN-1]='\0'; + spcl.c_filesys[NAMELEN-1]='\0'; + (void)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1); (void)gethostname(spcl.c_host, NAMELEN); spcl.c_level = level - '0'; spcl.c_type = TS_TAPE; if (!Tflag) - getdumptime(); /* /etc/dumpdates snarfed */ + getdumptime(uflag); /* dumpdates snarfed */ - msg("Date of this level %c dump: %s", level, -#ifdef __linux - spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); + if (spcl.c_ddate == 0 && spcl.c_level) { + msg("WARNING: There is no inferior level dump on this filesystem\n"); + msg("WARNING: Assuming a level 0 dump by default\n"); + level = '0'; + spcl.c_level = 0; + } + + if (Mflag) + snprintf(tape, MAXPATHLEN, "%s%03d", tapeprefix, tapeno + 1); + else + strncpy(tape, tapeprefix, MAXPATHLEN); + tape[MAXPATHLEN - 1] = '\0'; + + if (!sizest) { + + msg("Date of this level %c dump: %s", level, +#ifdef __linux__ + spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); #else - spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date)); + spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date)); #endif - msg("Date of last level %c dump: %s", lastlevel, + msg("Date of last level %c dump: %s", lastlevel, #ifdef __linux__ - spcl.c_ddate == 0 ? "the epoch\n" : ctime4(&spcl.c_ddate)); + spcl.c_ddate == 0 ? "the epoch\n" : ctime4(&spcl.c_ddate)); #else - spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate)); + spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate)); #endif - msg("Dumping %s ", disk); - if (dt != NULL) - msgtail("(%s) ", dt->fs_file); - if (host) - msgtail("to %s on host %s\n", tape, host); - else - msgtail("to %s\n", tape); + msg("Dumping %s (%s) ", disk, spcl.c_filesys); + if (host) + msgtail("to %s on host %s\n", tape, host); + else + msgtail("to %s\n", tape); + msg("Label: %s\n", labelstr); + + } /* end of size estimate */ #ifdef __linux__ - retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, &fs); + retval = dump_fs_open(disk, &fs); if (retval) { com_err(disk, retval, "while opening filesystem"); if (retval == EXT2_ET_REV_TOO_HIGH) printf ("Get a newer version of dump!\n"); - exit(X_ABORT); + exit(X_STARTUP); } if (fs->super->s_rev_level > DUMP_CURRENT_REV) { com_err(disk, retval, "while opening filesystem"); printf ("Get a newer version of dump!\n"); - exit(X_ABORT); + exit(X_STARTUP); } if ((diskfd = open(disk, O_RDONLY)) < 0) { msg("Cannot open %s\n", disk); - exit(X_ABORT); + exit(X_STARTUP); } sync(); dev_bsize = DEV_BSIZE; @@ -390,7 +487,7 @@ main(argc, argv) #else /* __linux __*/ if ((diskfd = open(disk, O_RDONLY)) < 0) { msg("Cannot open %s\n", disk); - exit(X_ABORT); + exit(X_STARTUP); } sync(); sblock = (struct fs *)sblock_buf; @@ -404,7 +501,6 @@ main(argc, argv) tp_bshift = ffs(TP_BSIZE) - 1; if (TP_BSIZE != (1 << tp_bshift)) quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE); - spcl.c_flags |= DR_NEWINODEFMT; #ifdef FS_44INODEFMT if (sblock->fs_inodefmt >= FS_44INODEFMT) spcl.c_flags |= DR_NEWINODEFMT; @@ -415,11 +511,16 @@ main(argc, argv) usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); - tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1); + tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1); nonodump = spcl.c_level < honorlevel; - msg("mapping (Pass I) [regular files]\n"); +#if defined(SIGINFO) + (void)signal(SIGINFO, statussig); +#endif + + if (!sizest) + msg("mapping (Pass I) [regular files]\n"); #ifdef __linux__ if (directory[0] == 0) anydirskipped = mapfiles(maxino, &tapesize); @@ -429,13 +530,19 @@ main(argc, argv) anydirskipped = mapfiles(maxino, &tapesize); #endif - msg("mapping (Pass II) [directories]\n"); + if (!sizest) + msg("mapping (Pass II) [directories]\n"); while (anydirskipped) { anydirskipped = mapdirs(maxino, &tapesize); } - if (pipeout) { - tapesize += 10; /* 10 trailer blocks */ + if (sizest) { + printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE); + exit(X_FINOK); + } /* stop here for size estimate */ + + if (pipeout || unlimited) { + tapesize += 11; /* 10 trailer blocks + 1 map header */ msg("estimated %ld tape blocks.\n", tapesize); } else { double fetapes; @@ -447,28 +554,28 @@ main(argc, argv) the end of each block written, and not in mid-block. Assume no erroneous blocks; this can be compensated for with an artificially low tape size. */ - fetapes = - ( tapesize /* blocks */ + fetapes = + ( (double) tapesize /* blocks */ * TP_BSIZE /* bytes/block */ - * (1.0/density) /* 0.1" / byte */ + * (1.0/density) /* 0.1" / byte " */ + - tapesize /* blocks */ + (double) tapesize /* blocks */ * (1.0/ntrec) /* streaming-stops per block */ - * 15.48 /* 0.1" / streaming-stop */ - ) * (1.0 / tsize ); /* tape / 0.1" */ + * 15.48 /* 0.1" / streaming-stop " */ + ) * (1.0 / tsize ); /* tape / 0.1" " */ } else { /* Estimate number of tapes, for old fashioned 9-track tape */ int tenthsperirg = (density == 625) ? 3 : 7; fetapes = - ( tapesize /* blocks */ + ( (double) tapesize /* blocks */ * TP_BSIZE /* bytes / block */ - * (1.0/density) /* 0.1" / byte */ + * (1.0/density) /* 0.1" / byte " */ + - tapesize /* blocks */ + (double) tapesize /* blocks */ * (1.0/ntrec) /* IRG's / block */ - * tenthsperirg /* 0.1" / IRG */ - ) * (1.0 / tsize ); /* tape / 0.1" */ + * tenthsperirg /* 0.1" / IRG " */ + ) * (1.0 / tsize ); /* tape / 0.1" " */ } etapes = fetapes; /* truncating assignment */ etapes++; @@ -484,10 +591,15 @@ main(argc, argv) * Allocate tape buffer. */ if (!alloctape()) - quit("can't allocate tape buffers - try a smaller blocking factor.\n"); + quit( + "can't allocate tape buffers - try a smaller blocking factor.\n"); startnewtape(1); +#ifdef __linux__ + (void)time4(&(tstart_writing)); +#else (void)time((time_t *)&(tstart_writing)); +#endif dumpmap(usedinomap, TS_CLRI, maxino - 1); msg("dumping (Pass III) [directories]\n"); @@ -506,6 +618,11 @@ main(argc, argv) if ((dp->di_mode & IFMT) != IFDIR) continue; #ifdef __linux__ + /* + * Skip directory inodes deleted and not yes reallocated... + */ + if (dp->di_nlink == 0 || dp->di_dtime != 0) + continue; (void)dumpdirino(dp, ino); #else (void)dumpino(dp, ino); @@ -514,8 +631,6 @@ main(argc, argv) msg("dumping (Pass IV) [regular files]\n"); for (map = dumpinomap, ino = 1; ino < maxino; ino++) { - int mode; - if (((ino - 1) % NBBY) == 0) /* map is offset by 1 */ dirty = *map++; else @@ -526,24 +641,34 @@ main(argc, argv) * Skip inodes deleted and reallocated as directories. */ dp = getino(ino); - mode = dp->di_mode & IFMT; - if (mode == IFDIR) + if ((dp->di_mode & IFMT) == IFDIR) continue; +#ifdef __linux__ + /* + * No need to check here for deleted and not yes reallocated inodes + * since this is done in dumpino(). + */ +#endif (void)dumpino(dp, ino); } -#ifdef __linux__ +#ifdef __linux__ + (void)time4(&(tend_writing)); +#else (void)time((time_t *)&(tend_writing)); #endif spcl.c_type = TS_END; for (i = 0; i < ntrec; i++) writeheader(maxino - 1); + + tnow = trewind(); + if (pipeout) - msg("DUMP: %ld tape blocks\n",spcl.c_tapea); + msg("%ld tape blocks\n", spcl.c_tapea); else - msg("DUMP: %ld tape blocks on %d volumes(s)\n", + msg("%ld tape blocks on %d volumes(s)\n", spcl.c_tapea, spcl.c_volume); -#ifdef __linux__ + /* report dump performance, avoid division through zero */ if (tend_writing - tstart_writing == 0) msg("finished in less than a second\n"); @@ -551,22 +676,48 @@ main(argc, argv) msg("finished in %d seconds, throughput %d KBytes/sec\n", tend_writing - tstart_writing, spcl.c_tapea / (tend_writing - tstart_writing)); -#endif + putdumptime(); - trewind(); +#ifdef __linux__ + msg("Date of this level %c dump: %s", level, + spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); +#else + msg("Date of this level %c dump: %s", level, + spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date)); +#endif + msg("Date this dump completed: %s", ctime(&tnow)); + + msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno); + broadcast("DUMP IS DONE!\7\7\n"); msg("DUMP IS DONE\n"); Exit(X_FINOK); /* NOTREACHED */ + return 0; /* gcc - shut up */ } static void -usage() +usage(void) { - - (void)fprintf(stderr, "usage: dump [-0123456789cnu] [-B records] [-b blocksize] [-d density] [-f file]\n [-h level] [-s feet] [-T date] filesystem\n"); - (void)fprintf(stderr, " dump [-W | -w]\n"); - exit(1); + char white[MAXPATHLEN]; + int i; + + strncpy(white, __progname, MAXPATHLEN-1); + white[MAXPATHLEN-1] = '\0'; + for (i=0; i vmax)) - errx(1, "%s must be between %ld and %ld", meaning, vmin, vmax); + errx(X_STARTUP, "%s must be between %ld and %ld", meaning, vmin, vmax); return (val); } void -sig(signo) - int signo; +sig(int signo) { switch(signo) { case SIGALRM: @@ -617,8 +765,7 @@ sig(signo) } char * -rawname(cp) - char *cp; +rawname(char *cp) { #ifdef __linux__ return cp; @@ -629,26 +776,25 @@ rawname(cp) if (dp == NULL) return (NULL); *dp = '\0'; - (void)strcpy(rawbuf, cp); + (void)strncpy(rawbuf, cp, MAXPATHLEN - 1); + rawbuf[MAXPATHLEN-1] = '\0'; *dp = '/'; - (void)strcat(rawbuf, "/r"); - (void)strcat(rawbuf, dp + 1); + (void)strncat(rawbuf, "/r", MAXPATHLEN - 1 - strlen(rawbuf)); + (void)strncat(rawbuf, dp + 1, MAXPATHLEN - 1 - strlen(rawbuf)); return (rawbuf); #endif /* __linux__ */ } /* * obsolete -- - * Change set of key letters and ordered arguments into something - * getopt(3) will like. + * Change set of key letters and ordered arguments into something + * getopt(3) will like. */ static void -obsolete(argcp, argvp) - int *argcp; - char **argvp[]; +obsolete(int *argcp, char **argvp[]) { int argc, flags; - char *ap, **argv, *flagsp, **nargv, *p; + char *ap, **argv, *flagsp=NULL, **nargv, *p=NULL; /* Setup. */ argv = *argvp; @@ -662,7 +808,7 @@ obsolete(argcp, argvp) /* Allocate space for new arguments. */ if ((*argvp = nargv = malloc((argc + 1) * sizeof(char *))) == NULL || (p = flagsp = malloc(strlen(ap) + 2)) == NULL) - err(1, NULL); + err(X_STARTUP, "malloc new args"); *nargv++ = *argv; argv += 2; @@ -672,15 +818,19 @@ obsolete(argcp, argvp) case 'B': case 'b': case 'd': + case 'e': case 'f': + case 'F': case 'h': + case 'L': case 's': case 'T': if (*argv == NULL) { - warnx("option requires an argument -- %c", *ap); usage(); + warnx("option requires an argument -- %c", *ap); + usage(); } if ((nargv[0] = malloc(strlen(*argv) + 2 + 1)) == NULL) - err(1, NULL); + err(X_STARTUP, "malloc arg"); nargv[0][0] = '-'; nargv[0][1] = *ap; (void)strcpy(&nargv[0][2], *argv); @@ -704,7 +854,7 @@ obsolete(argcp, argvp) } /* Copy remaining arguments. */ - while (*nargv++ = *argv++); + while ((*nargv++ = *argv++)); /* Update argument count. */ *argcp = nargv - *argvp - 1;