1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- ppm/ppmtogif.c.orig Sat Dec 16 16:34:16 2000
+++ ppm/ppmtogif.c Sat Jan 13 00:00:00 2001
@@ -22,6 +22,7 @@
#include "ppm.h"
#include "ppmcmap.h"
+#include "shhopt.h"
#define MAXCOLORS 256
@@ -91,12 +92,22 @@
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, "interlace", OPT_FLAG, &cmdline_p->interlace, 0);
OPTENTRY(0, "sort", OPT_FLAG, &cmdline_p->sort, 0);
OPTENTRY(0, "mapfile", OPT_STRING, &cmdline_p->mapfile, 0);
OPTENTRY(0, "transparent", OPT_STRING, &cmdline_p->transparent, 0);
OPTENTRY(0, "comment", OPT_STRING, &cmdline_p->comment, 0);
+ option_def[option_def_index].type = OPT_END;
/* Set the defaults */
cmdline_p->interlace = FALSE;
@@ -109,7 +120,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)
|
