diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/colorname.c | 6 | ||||
| -rw-r--r-- | lib/libpam.c | 2 | ||||
| -rw-r--r-- | lib/libpamcolor.c | 2 | ||||
| -rw-r--r-- | lib/libpm.c | 93 | ||||
| -rw-r--r-- | lib/libppmcolor.c | 2 | ||||
| -rw-r--r-- | lib/pmfileio.c | 3 | ||||
| -rw-r--r-- | lib/util/nstring.c | 2 |
7 files changed, 69 insertions, 41 deletions
diff --git a/lib/colorname.c b/lib/colorname.c index 5c371e84..c23eb13f 100644 --- a/lib/colorname.c +++ b/lib/colorname.c @@ -13,7 +13,7 @@ */ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include "pm_c_util.h" #include <ctype.h> @@ -87,8 +87,8 @@ pm_openColornameFile(const char * const fileName, const int must_open) { Open the colorname dictionary file. Its file name is 'fileName', unless 'fileName' is NULL. In that case, its file name is the value of the environment variable whose name is RGB_ENV (e.g. "RGBDEF"). Except - if that environment variable is not set, it is RGB_DB1, RGB_DB2, - or RGB_DB3 (e.g. "/usr/lib/X11/rgb.txt"), whichever exists. + if that environment variable is not set, it is the first file found, + if any, in the search path RGB_DB_PATH. 'must_open' is a logical: we must get the file open or die. If 'must_open' is true and we can't open the file (e.g. it doesn't diff --git a/lib/libpam.c b/lib/libpam.c index f188f7d6..2d82ffef 100644 --- a/lib/libpam.c +++ b/lib/libpam.c @@ -14,7 +14,7 @@ #define _FILE_OFFSET_BITS 64 #define _LARGE_FILES #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include <string.h> #include <limits.h> diff --git a/lib/libpamcolor.c b/lib/libpamcolor.c index c4f2212d..f945c0a5 100644 --- a/lib/libpamcolor.c +++ b/lib/libpamcolor.c @@ -15,7 +15,7 @@ #define _LARGE_FILES #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include <string.h> #include <limits.h> diff --git a/lib/libpm.c b/lib/libpm.c index 4d6e609a..228f42c6 100644 --- a/lib/libpm.c +++ b/lib/libpm.c @@ -9,7 +9,7 @@ **************************************************************************/ #define _BSD_SOURCE /* Make sure strdup is in string.h */ -#define _XOPEN_SOURCE 600 /* Make sure ftello, fseeko are defined */ +#define _XOPEN_SOURCE 500 /* Make sure ftello, fseeko are defined */ #include "netpbm/pm_config.h" @@ -595,61 +595,85 @@ showNetpbmHelp(const char progname[]) { +static void +parseCommonOptions(int * const argcP, + const char ** const argv, + bool * const showMessagesP, + bool * const showVersionP, + bool * const showHelpP, + bool * const plainOutputP) { + + unsigned int inCursor; + unsigned int outCursor; + + *showMessagesP = true; /* initial assumption */ + *showVersionP = false; /* initial assumption */ + *showHelpP = false; /* initial assumption */ + *plainOutputP = false; /* initial assumption */ + + for (inCursor = 1, outCursor = 1; inCursor < *argcP; ++inCursor) { + if (strcaseeq(argv[inCursor], "-quiet") || + strcaseeq(argv[inCursor], "--quiet")) + *showMessagesP = false; + else if (strcaseeq(argv[inCursor], "-version") || + strcaseeq(argv[inCursor], "--version")) + *showVersionP = true; + else if (strcaseeq(argv[inCursor], "-help") || + strcaseeq(argv[inCursor], "--help") || + strcaseeq(argv[inCursor], "-?")) + *showHelpP = true; + else if (strcaseeq(argv[inCursor], "-plain") || + strcaseeq(argv[inCursor], "--plain")) + *plainOutputP = true; + else + argv[outCursor++] = argv[inCursor]; + } + *argcP = outCursor; +} + + + void -pm_proginit(int * const argcP, const char * argv[]) { +pm_proginit(int * const argcP, + const char ** const argv) { /*---------------------------------------------------------------------------- Do various initialization things that all programs in the Netpbm package, and programs that emulate such programs, should do. - This includes processing global options. + This includes processing global options. We scan argv[], which has *argcP + elements, for common options and execute the functions for the ones we + find. We remove the common options from argv[], updating *argcP + accordingly. This includes calling pm_init() to initialize the Netpbm libraries. -----------------------------------------------------------------------------*/ const char * const progname = pm_arg0toprogname(argv[0]); /* points to static memory in this library */ - int argn, i; - bool showmessages; - bool show_version; + bool showMessages; + bool plain; + bool justShowVersion; /* We're supposed to just show the version information, then exit the program. */ - bool show_help; + bool justShowHelp; /* We're supposed to just tell user where to get help, then exit the program. */ pm_init(progname, 0); - /* Check for any global args. */ - showmessages = TRUE; - show_version = FALSE; - show_help = FALSE; - pm_plain_output = FALSE; - for (argn = i = 1; argn < *argcP; ++argn) { - if (pm_keymatch(argv[argn], "-quiet", 6) || - pm_keymatch(argv[argn], "--quiet", 7)) - showmessages = FALSE; - else if (pm_keymatch(argv[argn], "-version", 8) || - pm_keymatch(argv[argn], "--version", 9)) - show_version = TRUE; - else if (pm_keymatch(argv[argn], "-help", 5) || - pm_keymatch(argv[argn], "--help", 6) || - pm_keymatch(argv[argn], "-?", 2)) - show_help = TRUE; - else if (pm_keymatch(argv[argn], "-plain", 6) || - pm_keymatch(argv[argn], "--plain", 7)) - pm_plain_output = TRUE; - else - argv[i++] = argv[argn]; - } - *argcP=i; + parseCommonOptions(argcP, argv, + &showMessages, &justShowVersion, &justShowHelp, + &plain); + + pm_plain_output = plain ? 1 : 0; - pm_setMessage((unsigned int) showmessages, NULL); + pm_setMessage(showMessages ? 1 : 0, NULL); - if (show_version) { + if (justShowVersion) { showVersion(); - exit( 0 ); - } else if (show_help) { + exit(0); + } else if (justShowHelp) { pm_error("Use 'man %s' for help.", progname); /* If we can figure out a way to distinguish Netpbm programs from other programs using the Netpbm libraries, we can do better here. @@ -661,6 +685,7 @@ pm_proginit(int * const argcP, const char * argv[]) { } + void pm_setMessage(int const newState, int * const oldStateP) { diff --git a/lib/libppmcolor.c b/lib/libppmcolor.c index 347bab29..3d98f5e7 100644 --- a/lib/libppmcolor.c +++ b/lib/libppmcolor.c @@ -10,7 +10,7 @@ */ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ -#define _XOPEN_SOURCE 600 /* Make sure strdup() is in string.h */ +#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include <assert.h> #include <stdlib.h> diff --git a/lib/pmfileio.c b/lib/pmfileio.c index 1263261a..b629fd23 100644 --- a/lib/pmfileio.c +++ b/lib/pmfileio.c @@ -10,7 +10,8 @@ does it in other libc's). pm_config.h defines TMPDIR as P_tmpdir in some environments. */ -#define _XOPEN_SOURCE 600 /* Make sure ftello, fseeko are defined */ +#define _BSD_SOURCE /* Make sure strdup is defined */ +#define _XOPEN_SOURCE 500 /* Make sure ftello, fseeko, strdup are defined */ #define _LARGEFILE_SOURCE 1 /* Make sure ftello, fseeko are defined */ #define _LARGEFILE64_SOURCE 1 #define _FILE_OFFSET_BITS 64 diff --git a/lib/util/nstring.c b/lib/util/nstring.c index bb2ba92e..1fe66a27 100644 --- a/lib/util/nstring.c +++ b/lib/util/nstring.c @@ -113,6 +113,8 @@ */ +#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ +#define _BSD_SOURCE /* Make sure strdup() is in string.h */ #define _GNU_SOURCE /* Because of conditional compilation, this is GNU source only if the C library is GNU. |