diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-11-24 23:29:10 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-11-24 23:29:10 +0000 |
| commit | 58474c20a5282db4eba6c3a9f4c028e06988e09e (patch) | |
| tree | b444f860893c4bcde1b1716b9e493ba79f3ad574 /usr/src/cmd/sed/main.c | |
| parent | 97c04c3c87e99538f4220453d9385840a5e1d714 (diff) | |
| download | illumos-joyent-58474c20a5282db4eba6c3a9f4c028e06988e09e.tar.gz | |
Revert "586 sed -i should take an "optional" argument"
This reverts commit e50226eccc6dfcba3cc6f0df38438900e3df225c.
Diffstat (limited to 'usr/src/cmd/sed/main.c')
| -rw-r--r-- | usr/src/cmd/sed/main.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/usr/src/cmd/sed/main.c b/usr/src/cmd/sed/main.c index 93e14bb09b..59a6da8e22 100644 --- a/usr/src/cmd/sed/main.c +++ b/usr/src/cmd/sed/main.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2011 Gary Mills - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 1992 Diomidis Spinellis. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -41,9 +41,7 @@ #include <err.h> #include <errno.h> #include <fcntl.h> -#include <getopt.h> #include <libgen.h> -#include <libintl.h> #include <limits.h> #include <locale.h> #include <regex.h> @@ -52,6 +50,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libintl.h> #include "defs.h" #include "extern.h" @@ -106,11 +105,6 @@ static char tmpfname[PATH_MAX]; /* Temporary file name (for in-place editing) */ static const char *inplace; /* Inplace edit file extension. */ ulong_t linenum; -static const struct option lopts[] = { - {"in-place", optional_argument, NULL, 'i'}, - {NULL, 0, NULL, 0} -}; - static void add_compunit(enum e_cut, char *); static void add_file(char *); static void usage(void); @@ -133,18 +127,14 @@ main(int argc, char *argv[]) fflag = 0; inplace = NULL; - while ((c = getopt_long(argc, argv, "EI::ae:f:i::lnr", lopts, NULL)) != - -1) + while ((c = getopt(argc, argv, "EI:ae:f:i:lnr")) != -1) switch (c) { case 'r': /* Gnu sed compat */ case 'E': rflags = REG_EXTENDED; break; case 'I': - if (optarg != NULL) - inplace = optarg; - else - inplace = ""; + inplace = optarg; ispan = 1; /* span across input files */ break; case 'a': @@ -161,10 +151,7 @@ main(int argc, char *argv[]) add_compunit(CU_FILE, optarg); break; case 'i': - if (optarg != NULL) - inplace = optarg; - else - inplace = ""; + inplace = optarg; ispan = 0; /* don't span across input files */ break; case 'l': @@ -205,8 +192,8 @@ main(int argc, char *argv[]) static void usage(void) { - (void) fputs(_("usage: sed script [-Ealn] [-i[extension]] [file...]\n" - " sed [-Ealn] [-i[extension]] [-e script]... " + (void) fputs(_("usage: sed script [-Ealn] [-i extension] [file...]\n" + " sed [-Ealn] [-i extension] [-e script]... " "[-f script_file]... [file...]\n"), stderr); exit(1); |