3 files changed, 7 insertions, 15 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 69baf065d..5857a3f44 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -15,7 +15,7 @@
  * # find file.txt -exec 'echo {}' '{}  {}' ';'
  * find: echo file.txt: No such file or directory
  * # find file.txt -exec 'echo' '{}  {}' '; '
- * find: missing argument to `-exec'
+ * find: missing argument to '-exec'
  * # find file.txt -exec 'echo {}' '{}  {}' ';' junk
  * find: paths must precede expression
  * # find file.txt -exec 'echo {}' '{}  {}' ';' junk ';'
diff --git a/findutils/grep.c b/findutils/grep.c
index 568ab12c2..7c5f73d2f 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -107,6 +107,7 @@
 //usage:#define fgrep_trivial_usage NOUSAGE_STR
 //usage:#define fgrep_full_usage ""
 
+/* -e,-f are lists; -m,-A,-B,-C have numeric param */
 #define OPTSTR_GREP \
         "lnqvscFiHhe:*f:*Lorm:+wx" \
         IF_FEATURE_GREP_CONTEXT("A:+B:+C:+") \
@@ -686,11 +687,9 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 
         /* do normal option parsing */
 #if ENABLE_FEATURE_GREP_CONTEXT
-        /* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
-         * -m,-A,-B,-C have numeric param */
-        opt_complementary = "H-h:C-AB";
+        /* -H unsets -h; -C unsets -A,-B */
         opts = getopt32(argv,
-                OPTSTR_GREP,
+                "^" OPTSTR_GREP "\0" "H-h:C-AB",
                 &pattern_head, &fopt, &max_matches,
                 &lines_after, &lines_before, &Copt);
 
@@ -716,9 +715,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
         }
 #else
         /* with auto sanity checks */
-        /* -H unsets -h; -c,-q or -l unset -n; -e,-f are lists; -m N */
-        opt_complementary = "H-h:c-n:q-n:l-n:";
-        getopt32(argv, OPTSTR_GREP,
+        getopt32(argv, "^" OPTSTR_GREP "\0" "H-h:c-n:q-n:l-n:", // why trailing ":"?
                 &pattern_head, &fopt, &max_matches);
 #endif
         invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
diff --git a/findutils/xargs.c b/findutils/xargs.c
index e5384d14c..97afef039 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -508,13 +508,8 @@ int xargs_main(int argc, char **argv)
 
         INIT_G();
 
-#if ENABLE_DESKTOP && ENABLE_LONG_OPTS
-        /* For example, Fedora's build system uses --no-run-if-empty */
-        applet_long_options =
-                "no-run-if-empty\0" No_argument "r"
-                ;
-#endif
-        opt = getopt32(argv, OPTION_STR,
+        opt = getopt32long(argv, OPTION_STR,
+                "no-run-if-empty\0" No_argument "r",
                 &max_args, &max_chars, &G.eof_str, &G.eof_str
                 IF_FEATURE_XARGS_SUPPORT_REPL_STR(, &G.repl_str, &G.repl_str)
         );