[Bug 227] faxstate bad option output error

Applied patch to clean up garbage preceding Usage: info when an invalid
option (or no option) was specified. Thanks Patrice!

diff --git a/util/faxconfig.c b/util/faxconfig.c
index fe95e51a1ea9ec9481c250c2fcae16fe333b5ce4..02b46a67190e97adac3d587e56ce706c79b992ab 100644 (file)
--- a/util/faxconfig.c
+++ b/util/faxconfig.c
@@ -76,8 +76,7 @@ main(int argc, char** argv)
            devid = optarg;
            break;
        case '?':
-           fatal("Bad option `%c'.\nusage: %s %s [param value ...]",
-               c, argv[0], usage);
+           fatal("usage: %s %s [param value ...]", argv[0], usage);
            /*NOTREACHED*/
        }
     if (devid != NULL) {

diff --git a/util/faxmodem.c b/util/faxmodem.c
index 0c2cf3baa44477c9a53b70aa4c6cb94484fffbde..b356cf0b02139248a1fe381f391b821f8276744e 100644 (file)
--- a/util/faxmodem.c
+++ b/util/faxmodem.c
@@ -239,7 +239,7 @@ main(int argc, char** argv)
            priority = atoi(optarg);
            break;
        case '?':
-           fatal("Bad option `%c'.\nusage: %s %s modem", c, argv[0], usage);
+           fatal("usage: %s %s modem", argv[0], usage);
            /*NOTREACHED*/
        }
     if (optind != argc-1) {

diff --git a/util/faxmsg.c b/util/faxmsg.c
index 746685278ccbb67679337474cc11a76bf9949713..8e9bd43ec5dbec90a98859a7c402b172c0b13445 100644 (file)
--- a/util/faxmsg.c
+++ b/util/faxmsg.c
@@ -110,7 +110,7 @@ main(int argc, char** argv)
            spooldir = optarg;
            break;
        case '?':
-           fatal("Bad option `%c'; usage: %s %s", c, argv[0], usage);
+           fatal("usage: %s %s", argv[0], usage);
            /*NOTREACHED*/
        }
     if (optind == argc-1) {

diff --git a/util/faxstate.c b/util/faxstate.c
index 00363189a2704d98b87ac44766878540f3fdefaa..c57c5976bdcc68691c9d5b62a7061262767b0386 100644 (file)
--- a/util/faxstate.c
+++ b/util/faxstate.c
@@ -110,11 +110,11 @@ main(int argc, char** argv)
            spooldir = optarg;
            break;
        case '?':
-           fatal("Bad option `%c'; usage: %s %s devid", c, argv[0], usage);
+           fatal("usage: %s %s devid", argv[0], usage);
            /*NOTREACHED*/
        }
     if (optind != argc-1) {
-        fatal("Bad option `%c'; usage: %s %s modem", c, argv[0], usage);
+        fatal("usage: %s %s modem", argv[0], usage);
     }
     if (strlen(argv[optind]) < sizeof(devid)) {
         strcpy(devid, argv[optind]);