39 lines
1.5 KiB
Plaintext
39 lines
1.5 KiB
Plaintext
--- pnm/pamtopnm.c.orig Fri Aug 4 02:17:03 2000
|
|
+++ pnm/pamtopnm.c Sat Aug 5 00:00:00 2000
|
|
@@ -7,6 +7,7 @@
|
|
-----------------------------------------------------------------------------*/
|
|
|
|
#include "pam.h"
|
|
+#include "shhopt.h"
|
|
|
|
struct cmdline_info {
|
|
/* All the information the user supplied in the command line,
|
|
@@ -31,8 +32,18 @@
|
|
|
|
unsigned int option_def_index;
|
|
|
|
+ /* Create the OptStruct structure describing our options */
|
|
+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
|
|
+ option_def[option_def_index].shortName = (shortvalue); \
|
|
+ option_def[option_def_index].longName = (longvalue); \
|
|
+ option_def[option_def_index].type = (typevalue); \
|
|
+ option_def[option_def_index].arg = (outputvalue); \
|
|
+ option_def[option_def_index].flags = (flagvalue); \
|
|
+ option_def_index++; \
|
|
+ }
|
|
option_def_index = 0; /* incremented by OPTENTRY */
|
|
OPTENTRY(0, "assume", OPT_FLAG, &cmdline_p->assume, 0);
|
|
+ option_def[option_def_index].type = OPT_END;
|
|
|
|
/* Set the defaults */
|
|
cmdline_p->assume = FALSE;
|
|
@@ -41,7 +52,7 @@
|
|
opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */
|
|
opt.allowNegNum = FALSE; /* We may have parms that are negative numbers */
|
|
|
|
- pm_optParseOptions2(&argc, argv, opt, 0);
|
|
+ optParseOptions2(&argc, argv, opt, 0);
|
|
/* Uses and sets argc, argv, and some of *cmdline_p and others. */
|
|
|
|
if (argc-1 == 0)
|