diff options
author | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:28:08 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:58:55 +0100 |
commit | 613f46218c53c8cabdbf0435653e74e0e0e91e1c (patch) | |
tree | ca06a7e7a3e4c861441acb4ea20648d7827fa6ae /editors/sed.c | |
parent | a0c61c9492723dd31681f878f9c68c92817a476d (diff) | |
parent | 237bedd499c58034a1355484d6d4d906f0180308 (diff) | |
download | busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.gz busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.bz2 busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/sed.c')
-rw-r--r-- | editors/sed.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editors/sed.c b/editors/sed.c index b629e060a..2e99dc792 100644 --- a/editors/sed.c +++ b/editors/sed.c | |||
@@ -1508,8 +1508,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv) | |||
1508 | /* do normal option parsing */ | 1508 | /* do normal option parsing */ |
1509 | opt_e = opt_f = NULL; | 1509 | opt_e = opt_f = NULL; |
1510 | opt_i = NULL; | 1510 | opt_i = NULL; |
1511 | opt_complementary = "e::f::" /* can occur multiple times */ | 1511 | opt_complementary = "nn"; /* count -n */ |
1512 | "nn"; /* count -n */ | ||
1513 | 1512 | ||
1514 | IF_LONG_OPTS(applet_long_options = sed_longopts); | 1513 | IF_LONG_OPTS(applet_long_options = sed_longopts); |
1515 | 1514 | ||
@@ -1518,7 +1517,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv) | |||
1518 | * GNU sed 4.2.1 mentions it in neither --help | 1517 | * GNU sed 4.2.1 mentions it in neither --help |
1519 | * nor manpage, but does recognize it. | 1518 | * nor manpage, but does recognize it. |
1520 | */ | 1519 | */ |
1521 | opt = getopt32(argv, "i::rEne:f:", &opt_i, &opt_e, &opt_f, | 1520 | opt = getopt32(argv, "i::rEne:*f:*", &opt_i, &opt_e, &opt_f, |
1522 | &G.be_quiet); /* counter for -n */ | 1521 | &G.be_quiet); /* counter for -n */ |
1523 | //argc -= optind; | 1522 | //argc -= optind; |
1524 | argv += optind; | 1523 | argv += optind; |