From c13ee8c0f32fa816e12f1ac0c55a800066dc1560 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 11 Apr 2011 03:58:30 +0200 Subject: [PATCH] basename,dirname,freeramdisk,rx,raidautorun,runsv,chvt: skip "--" argument Signed-off-by: Denys Vlasenko --- coreutils/basename.c | 5 +++++ libbb/single_argv.c | 2 ++ 2 files changed, 7 insertions(+) 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) size_t m, n; char *s; + if (argv[1] && strcmp(argv[1], "--") == 0) { + argv++; + argc--; + } + if ((unsigned)(argc-2) >= 2) { bb_show_usage(); } 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 @@ 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];