From 40c7ed53e1a5e8bf115b2a9f48d57d18d6d67057 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Thu, 19 Nov 2020 03:17:57 -0700 Subject: [PATCH] multicall: do not call getopt_long() inside the stub applet --- cmd/multicall.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/multicall.c b/cmd/multicall.c index 705000f..582765c 100644 --- a/cmd/multicall.c +++ b/cmd/multicall.c @@ -66,6 +66,8 @@ applet_cmp(const void *a, const void *b) void multicall_usage(int status) __attribute__((noreturn)); +struct if_applet ifupdown_applet; + int main(int argc, char *argv[]) { @@ -85,9 +87,11 @@ main(int argc, char *argv[]) } self_applet = *app; - process_options(*app, argc, argv); - return (*app)->main(argc, argv); + if (self_applet != &ifupdown_applet) + process_options(*app, argc, argv); + + return self_applet->main(argc, argv); } int @@ -99,8 +103,6 @@ multicall_main(int argc, char *argv[]) return main(argc - 1, argv + 1); } -struct if_applet ifupdown_applet; - void multicall_usage(int status) {