(main): Handle "--".

diff --git a/src/chroot.c b/src/chroot.c
index 5a28e32c445c98e486470364d090972c5684c2d1..3d196af6eb2f612c3a99be7446935d1fc459bc65 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -75,6 +75,15 @@ main (int argc, char **argv)
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      usage, AUTHORS, (char const *) NULL);
+
+  /* The above handles --help and --version.
+     Since there is no other invocation of getopt, handle `--' here.  */
+  if (1 < argc && STREQ (argv[1], "--"))
+    {
+      --argc;
+      ++argv;
+    }
+
   if (argc <= 1)
     {
       error (0, 0, _("too few arguments"));

diff --git a/src/hostid.c b/src/hostid.c
index 095b758917ec792de6f783c7230d10cb39f9db10..a262e787483b186cb57b4735e9ad4b29c106e115 100644 (file)
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -73,6 +73,14 @@ main (int argc, char **argv)
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      usage, AUTHORS, (char const *) NULL);
 
+  /* The above handles --help and --version.
+     Since there is no other invocation of getopt, handle `--' here.  */
+  if (1 < argc && STREQ (argv[1], "--"))
+    {
+      --argc;
+      ++argv;
+    }
+
   if (argc > 1)
     {
       error (0, 0, _("too many arguments"));

diff --git a/src/hostname.c b/src/hostname.c
index c9b62e446a074f10bf09e3b1fa4133d79c692440..ff7b4e4cc031a328e1d466cd8e051f94b41afc5c 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -97,6 +97,14 @@ main (int argc, char **argv)
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      usage, AUTHORS, (char const *) NULL);
 
+  /* The above handles --help and --version.
+     Since there is no other invocation of getopt, handle `--' here.  */
+  if (1 < argc && STREQ (argv[1], "--"))
+    {
+      --argc;
+      ++argv;
+    }
+
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)
     {

diff --git a/src/pwd.c b/src/pwd.c
index 46868920088ff784c0d3392ee129f76ebf6ada81..6c64be74046981b7830c3bfe71d570f0f49b97fb 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -306,6 +306,14 @@ main (int argc, char **argv)
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      usage, AUTHORS, (char const *) NULL);
 
+  /* The above handles --help and --version.
+     Since there is no other invocation of getopt, handle `--' here.  */
+  if (1 < argc && STREQ (argv[1], "--"))
+    {
+      --argc;
+      ++argv;
+    }
+
   if (1 < argc)
     error (0, 0, _("ignoring non-option arguments"));
 

diff --git a/src/sync.c b/src/sync.c
index 7dbbc55669efdd81693ec9b568b011f764abbccb..045b820c24bb1b7d48093891f2370425e5cf6abb 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -67,6 +67,14 @@ main (int argc, char **argv)
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
                      usage, AUTHORS, (char const *) NULL);
 
+  /* The above handles --help and --version.
+     Since there is no other invocation of getopt, handle `--' here.  */
+  if (1 < argc && STREQ (argv[1], "--"))
+    {
+      --argc;
+      ++argv;
+    }
+
   if (1 < argc)
     error (0, 0, _("ignoring all arguments"));