basename,dirname,freeramdisk,rx,raidautorun,runsv,chvt: skip "--" argument
authorDenys Vlasenko <vda.linux@googlemail.com>
Mon, 11 Apr 2011 01:58:30 +0000 (03:58 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Mon, 11 Apr 2011 01:58:30 +0000 (03:58 +0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
coreutils/basename.c
libbb/single_argv.c

index 177e023..1f7a137 100644 (file)
@@ -51,6 +51,11 @@ int basename_main(int argc, char **argv)
        size_t m, n;
        char *s;
 
+       if (argv[1] && strcmp(argv[1], "--") == 0) {
+               argv++;
+               argc--;
+       }
+
        if ((unsigned)(argc-2) >= 2) {
                bb_show_usage();
        }
index 85137b4..64844dd 100644 (file)
@@ -10,6 +10,8 @@
 
 char* FAST_FUNC single_argv(char **argv)
 {
+       if (argv[1] && strcmp(argv[1], "--") == 0)
+               argv++;
        if (!argv[1] || argv[2])
                bb_show_usage();
        return argv[1];