WebSVN – HelenOS – Diff – /trunk/uspace/lib/libc/generic/getopt.c

 #include <errno.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
-/* HelenOS Port: Something similar to warnx(), however we just print
- * to the console */
-void warnx(const char *fmt, ...);
-void warnx(const char *fmt, ...)
-{
-    va_list vargs;
-    va_start(vargs, fmt);
-    vprintf(fmt, vargs);
-    va_end(vargs);
-    printf("\n");
-    return;
-}
 /* HelenOS Port : We're incorporating only the modern getopt_long with wrappers
  * to keep legacy getopt() usage from breaking. All references to REPLACE_GETOPT
  * are dropped, we just include the code */
 int opterr = 1;     /* if error message should be printed */
 /* XXX: set optreset to 1 rather than these two */
 static int nonopt_start = -1; /* first non option argument (for permute) */
 static int nonopt_end = -1;   /* first option after non options (for permute) */
 /* Error messages */
+/* HelenOS Port: Calls to warnx() were eliminated (as we have no stderr that
+ * may be redirected) and replaced with printf. As such, error messages now
+ * end in a newline */
-static const char recargchar[] = "option requires an argument -- %c";
+static const char recargchar[] = "option requires an argument -- %c\n";
-static const char recargstring[] = "option requires an argument -- %s";
+static const char recargstring[] = "option requires an argument -- %s\n";
-static const char ambig[] = "ambiguous option -- %.*s";
+static const char ambig[] = "ambiguous option -- %.*s\n";
-static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s\n";
-static const char illoptchar[] = "unknown option -- %c";
+static const char illoptchar[] = "unknown option -- %c\n";
-static const char illoptstring[] = "unknown option -- %s";
+static const char illoptstring[] = "unknown option -- %s\n";
 /*
  * Compute the greatest common divisor of a and b.
  */
         (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
         /* option letter unknown or ':' */
         if (!*place)
             ++optind;
         if (PRINT_ERROR)
-            warnx(illoptchar, optchar);
+            printf(illoptchar, optchar);
         optopt = optchar;
         return BADCH;
+    }
     if (optchar == 'W' && oli[1] == ';') {      /* -W long-option */
         /* XXX: what if no long options provided (called by getopt)? */
             return -2;
         if (++optind >= nargc) {    /* no arg */
             place = EMSG;
             if (PRINT_ERROR)
-                warnx(recargchar, optchar);
+                printf(recargchar, optchar);
             optopt = optchar;
             return BADARG;
         } else              /* white space */
             place = nargv[optind];
         /*
         /* XXX: disable test for :: if PC? (GNU doesn't) */
         else if (oli[1] != ':') {   /* arg not optional */
             if (++optind >= nargc) {    /* no arg */
                 place = EMSG;
                 if (PRINT_ERROR)
-                    warnx(recargchar, optchar);
+                    printf(recargchar, optchar);
                 optopt = optchar;
                 return BADARG;
             } else
                 optarg = nargv[optind];
+        }
                 ambiguous = 1;
+        }
         if (ambiguous) {
             /* ambiguous abbreviation */
             if (PRINT_ERROR)
-                warnx(ambig, (int)current_argv_len,
+                printf(ambig, (int)current_argv_len,
                      current_argv);
             optopt = 0;
             return BADCH;
+        }
         if (match != -1) {          /* option found */
                 if (long_options[match].has_arg == no_argument
                 && has_equal) {
                 if (PRINT_ERROR)
-                    warnx(noarg, (int)current_argv_len,
+                    printf(noarg, (int)current_argv_len,
                          current_argv);
                 /*
                  * XXX: GNU sets optopt to val regardless of
                  * flag
                  */
                 /*
                  * Missing argument; leading ':'
                  * indicates no error should be generated
                  */
                 if (PRINT_ERROR)
-                    warnx(recargstring, current_argv);
+                    printf(recargstring, current_argv);
                 /*
                  * XXX: GNU sets optopt to val regardless
                  * of flag
                  */
                 if (long_options[match].flag == NULL)
                 --optind;
                 return BADARG;
+            }
         } else {            /* unknown option */
             if (PRINT_ERROR)
-                warnx(illoptstring, current_argv);
+                printf(illoptstring, current_argv);
             optopt = 0;
             return BADCH;
+        }
         if (long_options[match].flag) {
             *long_options[match].flag = long_options[match].val;

Subversion Repositories HelenOS

(root)/trunk/uspace/lib/libc/generic/getopt.c @ 3462 – Rev 3318 → 3336