aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-04-11 03:58:30 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-04-11 03:58:30 +0200
commitc13ee8c0f32fa816e12f1ac0c55a800066dc1560 (patch)
tree3ef3009d96c7d1273f556e3d5c84919c4fc76c30
parent6161cdbb83bc35c20cf582bfce203f3e0632fbda (diff)
downloadbusybox-w32-c13ee8c0f32fa816e12f1ac0c55a800066dc1560.tar.gz
busybox-w32-c13ee8c0f32fa816e12f1ac0c55a800066dc1560.tar.bz2
busybox-w32-c13ee8c0f32fa816e12f1ac0c55a800066dc1560.zip
basename,dirname,freeramdisk,rx,raidautorun,runsv,chvt: skip "--" argument
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/basename.c5
-rw-r--r--libbb/single_argv.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/coreutils/basename.c b/coreutils/basename.c
index 177e023cd..1f7a13713 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -51,6 +51,11 @@ int basename_main(int argc, char **argv)
51 size_t m, n; 51 size_t m, n;
52 char *s; 52 char *s;
53 53
54 if (argv[1] && strcmp(argv[1], "--") == 0) {
55 argv++;
56 argc--;
57 }
58
54 if ((unsigned)(argc-2) >= 2) { 59 if ((unsigned)(argc-2) >= 2) {
55 bb_show_usage(); 60 bb_show_usage();
56 } 61 }
diff --git a/libbb/single_argv.c b/libbb/single_argv.c
index 85137b40f..64844ddf8 100644
--- a/libbb/single_argv.c
+++ b/libbb/single_argv.c
@@ -10,6 +10,8 @@
10 10
11char* FAST_FUNC single_argv(char **argv) 11char* FAST_FUNC single_argv(char **argv)
12{ 12{
13 if (argv[1] && strcmp(argv[1], "--") == 0)
14 argv++;
13 if (!argv[1] || argv[2]) 15 if (!argv[1] || argv[2])
14 bb_show_usage(); 16 bb_show_usage();
15 return argv[1]; 17 return argv[1];