Comment: | Lots of improvements to libconfig: We now process the command line arguments ourselves rather than using getopt(). We now process Apache-style config files. Began work on documentation. Many more bug fixes |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6a0a10a0ab2d45340c26e9cd18af7826 |
User & Date: | rkeene on 2004-10-24 14:26:31 |
Other Links: | manifest | tags |
2004-10-26
| ||
13:19 | Updated man pages. Updated lc_process_files() to work. check-in: 92a0e45fc6 user: rkeene tags: trunk | |
2004-10-24
| ||
14:26 | Lots of improvements to libconfig: We now process the command line arguments ourselves rather than using getopt(). We now process Apache-style config files. Began work on documentation. Many more bug fixes check-in: 6a0a10a0ab user: rkeene tags: trunk | |
2004-10-22
| ||
23:59 | Made dysfunctional configuration elements return -1. Made conf_section work correctly. check-in: 53df9990ae user: rkeene tags: trunk | |
Modified .cvsignore from [7b57838d6a] to [a1cfe0d8d0].
4 5 6 7 8 9 10 |
config.h libconfig.a libconfig.so Makefile test-lc test.cfg .*.swp |
> > > > > |
4 5 6 7 8 9 10 11 12 13 14 15 |
config.h libconfig.a libconfig.so Makefile test-lc test.cfg .*.swp lc_geterrstr.3 lc_register_var.3 lc_register_callback.3 lc_process.3 lc_geterrno.3 |
Modified .fossil-settings/ignore-glob from [41a23991e2] to [e33f8b5756].
4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
Makefile/* config.h config.h/* config.log config.log/* config.status config.status/* libconfig.a libconfig.a/* libconfig.h libconfig.h/* libconfig.so libconfig.so/* test-lc test-lc/* test.cfg test.cfg/* |
> > > > > > > > > > |
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 |
Makefile/* config.h config.h/* config.log config.log/* config.status config.status/* lc_geterrno.3 lc_geterrno.3/* lc_geterrstr.3 lc_geterrstr.3/* lc_process.3 lc_process.3/* lc_register_callback.3 lc_register_callback.3/* lc_register_var.3 lc_register_var.3/* libconfig.a libconfig.a/* libconfig.h libconfig.h/* libconfig.so libconfig.so/* test-lc test-lc/* test.cfg test.cfg/* |
Added Docs/USAGE version [1da5b3b06f].
> |
1 |
The usage goes here...
|
Modified Makefile.in from [827c58c33d] to [af557eebf6].
1 2 3 4 5 6 7 8 .. 10 11 12 13 14 15 16 17 18 19 20 21 22 23 .. 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
CC = @CC@ AR = @AR@ RANLIB = @RANLIB@ CPP = @CPP@ CFLAGS = -Wall @CFLAGS@ @DEFS@ CPPFLAGS = @CPPFLAGS@ @DEFS@ LDFLAGS = @LDFLAGS@ @LIBS@ INSTALL = @INSTALL@ ................................................................................ OBJEXT = @OBJEXT@ PATH_SEPARATOR = @PATH_SEPARATOR@ SHOBJFLAGS = @SHOBJFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ SHOBJEXT = so ARFLAGS = # @ARFLAGS@ AREXT = a prefix = @prefix@ mandir = @mandir@ sysconfdir = @sysconfdir@ datadir = @datadir@ exec_prefix = @exec_prefix@ bindir = @bindir@ ................................................................................ libconfig.o: libconfig.c compat.h win32.h config.h libconfig.h libconfig.h: libconfig.h.in cat $^ | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/# /g;s/__BLANK_LINE__//' > $@ test-lc: $(LIBS) test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig -o $@ $(filter %.c, $^) .PHONY: clean distclean install clean: rm -f *.o $(BINS) $(LIBS) libconfig.h *~ test-lc distclean: clean rm -f Makefile config.h config.status config.log install: all libconfig.h -$(INSTALL) -d $(libdir) -$(INSTALL) -d $(includedir) $(INSTALL) -m 755 libconfig.$(SHOBJEXT) $(libdir)/libconfig.$(SHOBJEXT) $(INSTALL) -m 644 libconfig.$(AREXT) $(libdir)/libconfig.$(AREXT) $(INSTALL) -m 644 libconfig.h $(includedir)/libconfig.h |
> > > | | > > > | > > > > > > > |
1 2 3 4 5 6 7 8 9 .. 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 .. 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 |
CC = @CC@ LN_S = @LN_S@ AR = @AR@ RANLIB = @RANLIB@ CPP = @CPP@ CFLAGS = -Wall @CFLAGS@ @DEFS@ CPPFLAGS = @CPPFLAGS@ @DEFS@ LDFLAGS = @LDFLAGS@ @LIBS@ INSTALL = @INSTALL@ ................................................................................ OBJEXT = @OBJEXT@ PATH_SEPARATOR = @PATH_SEPARATOR@ SHOBJFLAGS = @SHOBJFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ SHOBJEXT = so ARFLAGS = # @ARFLAGS@ AREXT = a PKGVERS = @PACKAGE_VERSION@ PKGVERSMAJOR = `echo $(PKGVERS) | cut -f 1 -d .` prefix = @prefix@ mandir = @mandir@ sysconfdir = @sysconfdir@ datadir = @datadir@ exec_prefix = @exec_prefix@ bindir = @bindir@ ................................................................................ libconfig.o: libconfig.c compat.h win32.h config.h libconfig.h libconfig.h: libconfig.h.in cat $^ | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/# /g;s/__BLANK_LINE__//' > $@ test-lc: $(LIBS) test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $^) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig .PHONY: clean distclean install clean: rm -f *.o $(BINS) $(LIBS) libconfig.h *~ test-lc distclean: clean rm -f Makefile config.h config.status config.log lc_geterrno.3 lc_process.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3 install: all libconfig.h -$(INSTALL) -d $(mandir) -$(INSTALL) -d $(mandir)/man3 -$(INSTALL) -d $(libdir) -$(INSTALL) -d $(includedir) $(INSTALL) -m 755 libconfig.$(SHOBJEXT) $(libdir)/libconfig.$(SHOBJEXT).$(PKGVERS) $(INSTALL) -m 644 libconfig.$(AREXT) $(libdir)/libconfig.$(AREXT) $(INSTALL) -m 644 lc_register_callback.3 $(mandir)/man3/lc_register_callback.3 $(INSTALL) -m 644 lc_register_var.3 $(mandir)/man3/lc_register_var.3 $(INSTALL) -m 644 lc_geterrstr.3 $(mandir)/man3/lc_geterrstr.3 $(INSTALL) -m 644 lc_geterrno.3 $(mandir)/man3/lc_geterrno.3 $(INSTALL) -m 644 lc_process.3 $(mandir)/man3/lc_process.3 $(INSTALL) -m 644 libconfig.h $(includedir)/libconfig.h -( cd $(libdir) && rm -f libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) ) -( cd $(libdir) && rm -f libconfig.$(SHOBJEXT) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT) ) |
Added build/list-chkfiles.sh version [5b504920a7].
> > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 |
#! /bin/sh for file in *.[ch]; do if [ "${file}" = "compat.h" ]; then continue; fi if [ "${file}" = "config.h" ]; then continue; fi if [ "${file}" = "win32.h" ]; then continue; fi filelist="${filelist} ${file}" done grep ' HAVE_.*_H$' ${filelist} | sed 's@.*HAVE_\(.*_H\)@\1@;s@_H$@.h@;s@_@/@g' | dd conv=lcase 2>/dev/null | grep -v '^config.h$' | sort -u |
Modified build/prep.sh from [c2b384fa70] to [3f4d67e154].
1 2 |
#! /bin/sh |
> > |
1 2 3 4 |
#! /bin/sh autoconf; autoheader rm -rf autom4te.cache *~ |
Modified compat.h from [8797b049e9] to [893879d77c].
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
..
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
#include "win32.h" #endif #ifndef LC_LINEBUF_LEN #define LC_LINEBUF_LEN 1024 #endif #ifndef HAVE_GETOPT #include "getopt.h" #else #ifdef HAVE_GETOPT_H #include <getopt.h> #endif #endif #ifndef HAVE_STRSEP #include "strsep.h" #endif #ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif #ifdef HAVE_MEMORY_H ................................................................................ #define PRINTERR_D(x...) /**/ #define PERROR(x) perror(x); #define DPERROR(x) /**/ #endif #define CHECKPOINT PRINTERR_D("*** CHECKPOINT REACHED ***") #define SPOTVAR_LLX(x) PRINTERR_D(#x " = %llx", x) #define SPOTVAR_LLU(x) PRINTERR_D(#x " = %llu", x) #define SPOTVAR_LU(x) PRINTERR_D(#x " = %lu", x) #define SPOTVAR_D(x) PRINTERR_D(#x " = %lf", x) #define SPOTVAR_X(x) PRINTERR_D(#x " = 0x%x", x) #define SPOTVAR_I(x) PRINTERR_D(#x " = %i", x) #define SPOTVAR_P(x) PRINTERR_D(#x " = %p", x) #define SPOTVAR_S(x) PRINTERR_D(#x " = \"%s\"", x) #define PRINTERR(x...) { PRINT_LINE; fprintf(stderr, x); fprintf(stderr, "\n"); fflush(stderr); } #define LOG(x...) { PRINT_LINE; fprintf(stderr, "LOG: " x); fprintf(stderr, "\n"); } #endif |
<
<
<
<
<
<
<
>
>
|
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
#include "win32.h" #endif #ifndef LC_LINEBUF_LEN #define LC_LINEBUF_LEN 1024 #endif #ifndef HAVE_STRSEP #include "strsep.h" #endif #ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif #ifdef HAVE_MEMORY_H ................................................................................ #define PRINTERR_D(x...) /**/ #define PERROR(x) perror(x); #define DPERROR(x) /**/ #endif #define CHECKPOINT PRINTERR_D("*** CHECKPOINT REACHED ***") #define SPOTVAR_LLX(x) PRINTERR_D(#x " = %llx", x) #define SPOTVAR_LLU(x) PRINTERR_D(#x " = %llu", x) #define SPOTVAR_LL(x) PRINTERR_D(#x " = %lli", x) #define SPOTVAR_LU(x) PRINTERR_D(#x " = %lu", x) #define SPOTVAR_D(x) PRINTERR_D(#x " = %lf", x) #define SPOTVAR_X(x) PRINTERR_D(#x " = 0x%x", x) #define SPOTVAR_I(x) PRINTERR_D(#x " = %i", x) #define SPOTVAR_P(x) PRINTERR_D(#x " = %p", x) #define SPOTVAR_S(x) PRINTERR_D(#x " = \"%s\"", x) #define SPOTVAR_C(x) PRINTERR_D(#x " = \'%c\'", x) #define PRINTERR(x...) { PRINT_LINE; fprintf(stderr, x); fprintf(stderr, "\n"); fflush(stderr); } #define LOG(x...) { PRINT_LINE; fprintf(stderr, "LOG: " x); fprintf(stderr, "\n"); } #endif |
Modified conf_apache.c from [9b123ca764] to [7fcfcb69c1].
1 2 3 4 5 6 7 |
#include "libconfig.h"
#include "libconfig_private.h"
#include "conf_apache.h"
int lc_process_conf_apache(const char *appname, const char *configfile) {
return(-1);
}
|
> < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
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 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 |
#include "compat.h" #include "libconfig.h" #include "libconfig_private.h" #include "conf_apache.h" #ifdef HAVE_CTYPE_H #include <ctype.h> #endif #ifdef HAVE_STDIO_H #include <stdio.h> #endif #ifdef HAVE_STRING_H #include <string.h> #endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #ifdef HAVE_DIRENT_H #include <dirent.h> #endif static int lc_process_conf_apache_file(const char *configfile, const char *pathprefix); static int lc_process_conf_apache_include(const char *pathname, const char *pathprefix) { struct stat pathinfo; struct dirent *dinfo = NULL; char includepath[LC_LINEBUF_LEN] = {0}; DIR *dh = NULL; int statret = -1, lcpcafret = -1; int retval = 0; statret = stat(pathname, &pathinfo); if (statret < 0) { return(-1); } if (S_ISDIR(pathinfo.st_mode)) { dh = opendir(pathname); if (dh == NULL) { return(-1); } while (1) { dinfo = readdir(dh); if (dinfo == NULL) { break; } /* Skip files that begin with a dot ('.') */ if (dinfo->d_name[0] == '.') continue; snprintf(includepath, sizeof(includepath) - 1, "%s/%s", pathname, dinfo->d_name); lcpcafret = lc_process_conf_apache_include(includepath, pathprefix); if (lcpcafret < 0) { retval = -1; /* XXX: should we break here (abort further including of files from a directory if one fails ?) */ } } closedir(dh); } else { lcpcafret = lc_process_conf_apache_file(pathname, pathprefix); if (lcpcafret < 0) { retval = -1; } } return(retval); } static int lc_process_conf_apache_file(const char *configfile, const char *pathprefix) { FILE *configfp = NULL; char linebuf[LC_LINEBUF_LEN] = {0}, *linebuf_ptr = NULL, *tmp_ptr = NULL; char *lastsection = NULL; char qualifbuf[LC_LINEBUF_LEN] = {0}; char *cmd = NULL, *value = NULL, *sep = NULL, *cmdend = NULL; char *fgetsret = NULL; int lcpvret = -1, lpcafret = -1; int invalid_section = 0, ignore_section = 0; int retval = 0; lc_err_t save_lc_errno = LC_ERR_NONE; if (pathprefix != NULL) { /* Copy the prefix, if specified. */ strncpy(qualifbuf, pathprefix, sizeof(qualifbuf) - 1); } if (configfile == NULL) { lc_errno = LC_ERR_INVDATA; return(-1); } configfp = fopen(configfile, "r"); if (configfp == NULL) { lc_errno = LC_ERR_CANTOPEN; return(-1); } while (1) { fgetsret = fgets(linebuf, sizeof(linebuf) - 1, configfp); if (fgetsret == NULL) { break; } if (feof(configfp)) { break; } /* Remove trailing crap (but not spaces). */ linebuf_ptr = &linebuf[strlen(linebuf) - 1]; while (*linebuf_ptr < ' ' && linebuf_ptr >= linebuf) { *linebuf_ptr = '\0'; *linebuf_ptr--; } /* Remove leading spaces. */ linebuf_ptr = &linebuf[0]; while (*linebuf_ptr == ' ' || *linebuf_ptr == '\t') { *linebuf_ptr++; } /* Handle section header. */ if (linebuf_ptr[0] == '<' && linebuf_ptr[strlen(linebuf_ptr) - 1] == '>') { /* Remove < and > from around the data. */ linebuf_ptr[strlen(linebuf_ptr) - 1] = '\0'; *linebuf_ptr++; /* Lowercase the command part of the section. */ tmp_ptr = linebuf_ptr; while (*tmp_ptr != '\0' && *tmp_ptr != ' ') { *tmp_ptr = tolower(*tmp_ptr); *tmp_ptr++; } /* If this is a close section command, handle it */ if (linebuf_ptr[0] == '/') { *linebuf_ptr++; cmd = linebuf_ptr; /* Find the last section closed. */ tmp_ptr = strrchr(qualifbuf, '.'); if (tmp_ptr == NULL) { lastsection = qualifbuf; tmp_ptr = qualifbuf; } else { lastsection = tmp_ptr + 1; } if (strcmp(cmd, lastsection) != 0) { PRINTERR_D("Section closing does not match last opened section."); PRINTERR_D("Last opened = \"%s\", Closing = \"%s\"", lastsection, cmd); retval = -1; lc_errno = LC_ERR_BADFORMAT; /* For this error, we abort immediately. */ break; } lcpvret = lc_process_var(qualifbuf, NULL, NULL, LC_FLAGS_SECTIONEND); if (lcpvret < 0) { PRINTERR_D("Invalid section terminating: \"%s\"", qualifbuf); } /* Remove the "lastsection" part.. */ *tmp_ptr = '\0'; /* We just sucessfully closed the last section opened, we must be in a valid section now since we only open sections from within valid sections. */ invalid_section = 0; ignore_section = 0; continue; } /* Otherwise, open a new section. */ /* Don't open a section from an invalid section. */ if (invalid_section == 1 || ignore_section == 1) { continue; } /* Parse out any argument passed. */ sep = strpbrk(linebuf_ptr, " \t"); if (sep != NULL) { cmdend = sep; /* Delete space at the end of the command. */ *cmdend--; /* It currently derefs to the seperator.. */ while (*cmdend <= ' ') { *cmdend = '\0'; *cmdend--; } /* Delete the seperator char and any leading space. */ *sep = '\0'; *sep++; while (*sep == ' ' || *sep == '\t') { *sep++; } value = sep; } else { /* XXX: should this be "" or NULL ? */ value = ""; } cmd = linebuf_ptr; if (qualifbuf[0] != '\0') { strncat(qualifbuf, ".", sizeof(qualifbuf) - strlen(qualifbuf) - 1); } strncat(qualifbuf, cmd, sizeof(qualifbuf) - strlen(qualifbuf) - 1); lcpvret = lc_process_var(qualifbuf, value, NULL, LC_FLAGS_SECTIONSTART); if (lcpvret < 0) { PRINTERR_D("Invalid section: \"%s\"", qualifbuf); invalid_section = 1; lc_errno = LC_ERR_INVSECTION; retval = -1; } if (lcpvret == LC_CBRET_IGNORESECTION) { ignore_section = 1; } continue; } /* Drop comments and blank lines. */ if (*linebuf_ptr == '#' || *linebuf_ptr == '\0') { continue; } /* Don't handle things for a section that doesn't exist. */ if (invalid_section == 1) { PRINTERR_D("Ignoring line (because invalid section): %s", linebuf); continue; } if (ignore_section == 1) { PRINTERR_D("Ignoring line (because ignored section): %s", linebuf); continue; } /* Find the command and the data in the line. */ sep = strpbrk(linebuf_ptr, " \t"); if (sep != NULL) { cmdend = sep; /* Delete space at the end of the command. */ *cmdend--; /* It currently derefs to the seperator.. */ while (*cmdend <= ' ') { *cmdend = '\0'; *cmdend--; } /* Delete the seperator char and any leading space. */ *sep = '\0'; *sep++; while (*sep == ' ' || *sep == '\t') { *sep++; } value = sep; } else { value = NULL; } cmd = linebuf_ptr; /* Handle special commands. */ if (strcasecmp(cmd, "include") == 0) { if (value == NULL) { lc_errno = LC_ERR_BADFORMAT; retval = -1; PRINTERR_D("Invalid include command."); continue; } lpcafret = lc_process_conf_apache_include(value, qualifbuf); if (lpcafret < 0) { PRINTERR_D("Error in included file."); retval = -1; } continue; } /* Create the fully qualified variable name. */ if (qualifbuf[0] != '\0') { strncat(qualifbuf, ".", sizeof(qualifbuf) - strlen(qualifbuf) - 1); } strncat(qualifbuf, cmd, sizeof(qualifbuf) - strlen(qualifbuf) - 1); /* Call the parent and tell them we have data. */ save_lc_errno = lc_errno; lc_errno = LC_ERR_NONE; lcpvret = lc_process_var(qualifbuf, NULL, value, LC_FLAGS_VAR); if (lcpvret < 0) { if (lc_errno == LC_ERR_NONE) { PRINTERR_D("Invalid command: \"%s\"", cmd); lc_errno = LC_ERR_INVCMD; } else { PRINTERR_D("Error processing command (command was valid, but an error occured, errno was set)"); } retval = -1; } else { lc_errno = save_lc_errno; } /* Remove the "cmd" part of the buffer. */ tmp_ptr = strrchr(qualifbuf, '.'); if (tmp_ptr == NULL) { tmp_ptr = qualifbuf; } *tmp_ptr = '\0'; } fclose(configfp); return(retval); } int lc_process_conf_apache(const char *appname, const char *configfile) { return(lc_process_conf_apache_file(configfile, NULL)); } |
Modified conf_section.c from [97302025c7] to [cc641c4b63].
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 .. 61 62 63 64 65 66 67 68 69 70 71 72 73 74 .. 75 76 77 78 79 80 81 82 83 84 85 86 87 88 ... 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 ... 125 126 127 128 129 130 131 132 133 |
FILE *configfp = NULL; char linebuf[LC_LINEBUF_LEN] = {0}, *linebuf_ptr = NULL; char qualifbuf[LC_LINEBUF_LEN] = {0}; char *cmd = NULL, *value = NULL, *sep = NULL, *cmdend = NULL; char *currsection = NULL; char *fgetsret = NULL; int lcpvret = -1; if (appname == NULL || configfile == NULL) { return(-1); } configfp = fopen(configfile, "r"); if (configfp == NULL) { return(-1); } while (1) { fgetsret = fgets(linebuf, sizeof(linebuf) - 1, configfp); if (fgetsret == NULL) { break; ................................................................................ } /* Open new section. */ currsection = strdup(linebuf_ptr); lcpvret = lc_process_var(currsection, NULL, NULL, LC_FLAGS_SECTIONSTART); if (lcpvret < 0) { PRINTERR_D("Invalid section: \"%s\"", currsection); } continue; } /* Remove leading spaces. */ linebuf_ptr = &linebuf[0]; while (*linebuf_ptr == ' ') { ................................................................................ *linebuf_ptr++; } /* Drop comments and blank lines. */ if (*linebuf_ptr == ';' || *linebuf_ptr == '\0') { continue; } /* Find the command and the data in the line. */ cmdend = sep = strpbrk(linebuf_ptr, "="); if (sep == NULL) { PRINTERR("Invalid line: \"%s\"", linebuf); continue; } ................................................................................ if (currsection == NULL) { strncpy(qualifbuf, cmd, sizeof(qualifbuf) - 1); } else { snprintf(qualifbuf, sizeof(qualifbuf) - 1, "%s.%s", currsection, cmd); } /* Call the parent and tell them we have data. */ lcpvret = lc_process_var(qualifbuf, NULL, value, LC_FLAGS_VAR); if (lcpvret < 0) { PRINTERR_D("Invalid command: \"%s\"", qualifbuf); } } /* Close any open section, and clean-up. */ if (currsection != NULL) { lcpvret = lc_process_var(currsection, NULL, NULL, LC_FLAGS_SECTIONEND); if (lcpvret < 0) { ................................................................................ PRINTERR_D("Invalid section terminating: \"%s\"", currsection); } free(currsection); } fclose(configfp); return(0); } |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > | |
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 .. 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 .. 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 ... 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 ... 162 163 164 165 166 167 168 169 170 |
FILE *configfp = NULL; char linebuf[LC_LINEBUF_LEN] = {0}, *linebuf_ptr = NULL; char qualifbuf[LC_LINEBUF_LEN] = {0}; char *cmd = NULL, *value = NULL, *sep = NULL, *cmdend = NULL; char *currsection = NULL; char *fgetsret = NULL; int lcpvret = -1; int invalid_section = 1, ignore_section = 0; int retval = 0; lc_err_t save_lc_errno = LC_ERR_NONE; if (appname == NULL || configfile == NULL) { lc_errno = LC_ERR_INVDATA; return(-1); } configfp = fopen(configfile, "r"); if (configfp == NULL) { lc_errno = LC_ERR_CANTOPEN; return(-1); } while (1) { fgetsret = fgets(linebuf, sizeof(linebuf) - 1, configfp); if (fgetsret == NULL) { break; ................................................................................ } /* Open new section. */ currsection = strdup(linebuf_ptr); lcpvret = lc_process_var(currsection, NULL, NULL, LC_FLAGS_SECTIONSTART); if (lcpvret < 0) { PRINTERR_D("Invalid section: \"%s\"", currsection); invalid_section = 1; lc_errno = LC_ERR_INVSECTION; retval = -1; } else { invalid_section = 0; ignore_section = 0; } if (lcpvret == LC_CBRET_IGNORESECTION) { ignore_section = 1; } continue; } /* Remove leading spaces. */ linebuf_ptr = &linebuf[0]; while (*linebuf_ptr == ' ') { ................................................................................ *linebuf_ptr++; } /* Drop comments and blank lines. */ if (*linebuf_ptr == ';' || *linebuf_ptr == '\0') { continue; } /* Don't handle things for a section that doesn't exist. */ if (invalid_section == 1) { PRINTERR_D("Ignoring line (because invalid section): %s", linebuf); continue; } /* Don't process commands if this section is specifically ignored. */ if (ignore_section == 1) { PRINTERR_D("Ignoring line (because ignored section): %s", linebuf); continue; } /* Find the command and the data in the line. */ cmdend = sep = strpbrk(linebuf_ptr, "="); if (sep == NULL) { PRINTERR("Invalid line: \"%s\"", linebuf); continue; } ................................................................................ if (currsection == NULL) { strncpy(qualifbuf, cmd, sizeof(qualifbuf) - 1); } else { snprintf(qualifbuf, sizeof(qualifbuf) - 1, "%s.%s", currsection, cmd); } /* Call the parent and tell them we have data. */ save_lc_errno = lc_errno; lc_errno = LC_ERR_NONE; lcpvret = lc_process_var(qualifbuf, NULL, value, LC_FLAGS_VAR); if (lcpvret < 0) { if (lc_errno == LC_ERR_NONE) { PRINTERR_D("Invalid command: \"%s\"", cmd); lc_errno = LC_ERR_INVCMD; } else { PRINTERR_D("Error processing command (command was valid, but an error occured, errno was set)"); } retval = -1; } else { lc_errno = save_lc_errno; } } /* Close any open section, and clean-up. */ if (currsection != NULL) { lcpvret = lc_process_var(currsection, NULL, NULL, LC_FLAGS_SECTIONEND); if (lcpvret < 0) { ................................................................................ PRINTERR_D("Invalid section terminating: \"%s\"", currsection); } free(currsection); } fclose(configfp); return(retval); } |
Modified conf_space.c from [001a985a4a] to [0b6ba09a53].
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
..
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
int lc_process_conf_space(const char *appname, const char *configfile) { FILE *configfp = NULL; char linebuf[LC_LINEBUF_LEN] = {0}, *linebuf_ptr = NULL; char *cmd = NULL, *value = NULL, *sep = NULL; char *fgetsret = NULL; int lcpvret = -1; if (appname == NULL || configfile == NULL) { return(-1); } configfp = fopen(configfile, "r"); if (configfp == NULL) { return(-1); } while (1) { fgetsret = fgets(linebuf, sizeof(linebuf) - 1, configfp); if (fgetsret == NULL) { break; ................................................................................ *sep++; } value = sep; } else { value = NULL; } lcpvret = lc_process_var(cmd, NULL, value, LC_FLAGS_VAR); if (lcpvret < 0) { PRINTERR_D("Invalid command: \"%s\"", cmd); } } fclose(configfp); return(0); } |
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
|
|
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
..
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
int lc_process_conf_space(const char *appname, const char *configfile) { FILE *configfp = NULL; char linebuf[LC_LINEBUF_LEN] = {0}, *linebuf_ptr = NULL; char *cmd = NULL, *value = NULL, *sep = NULL; char *fgetsret = NULL; int lcpvret = -1; int retval = 0; lc_err_t save_lc_errno = LC_ERR_NONE; if (appname == NULL || configfile == NULL) { lc_errno = LC_ERR_INVDATA; return(-1); } configfp = fopen(configfile, "r"); if (configfp == NULL) { lc_errno = LC_ERR_CANTOPEN; return(-1); } while (1) { fgetsret = fgets(linebuf, sizeof(linebuf) - 1, configfp); if (fgetsret == NULL) { break; ................................................................................ *sep++; } value = sep; } else { value = NULL; } save_lc_errno = lc_errno; lc_errno = LC_ERR_NONE; lcpvret = lc_process_var(cmd, NULL, value, LC_FLAGS_VAR); if (lcpvret < 0) { if (lc_errno == LC_ERR_NONE) { PRINTERR_D("Invalid command: \"%s\"", cmd); lc_errno = LC_ERR_INVCMD; } else { PRINTERR_D("Error processing command (command was valid, but an error occured, errno was set)"); } retval = -1; } else { lc_errno = save_lc_errno; } } fclose(configfp); return(retval); } |
Modified config.h.in from [d6eea81576] to [813c28c85f].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
/* config.h.in. Generated from configure.in by autoheader. */ /* Define to 1 if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H /* Define to 1 if you have the `getopt' function. */ #undef HAVE_GETOPT /* Define to 1 if you have the <getopt.h> header file. */ #undef HAVE_GETOPT_H /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H |
> > > > > > |
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 |
/* config.h.in. Generated from configure.in by autoheader. */ /* Define to 1 if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the `getopt' function. */ #undef HAVE_GETOPT /* Define to 1 if you have the <getopt.h> header file. */ #undef HAVE_GETOPT_H /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have the <libintl.h> header file. */ #undef HAVE_LIBINTL_H /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H |
Modified configure from [743edb59b5] to [3e2a72d1bf].
1 2 3 4 5 6 7 8 9 10 11 ... 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 ... 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 ... 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 ... 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 ... 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 .... 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 .... 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 .... 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 ..... 16170 16171 16172 16173 16174 16175 16176 16177 16178 16179 16180 16181 16182 16183 16184 ..... 16533 16534 16535 16536 16537 16538 16539 16540 16541 16542 16543 16544 16545 16546 16547 ..... 16593 16594 16595 16596 16597 16598 16599 16600 16601 16602 16603 16604 16605 16606 16607 ..... 16697 16698 16699 16700 16701 16702 16703 16704 16705 16706 16707 16708 16709 16710 ..... 16793 16794 16795 16796 16797 16798 16799 16800 16801 16802 16803 16804 16805 16806 16807 16808 16809 16810 16811 16812 |
#! /bin/sh # From configure.in Revision . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for libconfig 0.0.1. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## ................................................................................ # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME='libconfig' PACKAGE_TARNAME='libconfig' PACKAGE_VERSION='0.0.1' PACKAGE_STRING='libconfig 0.0.1' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #if HAVE_SYS_TYPES_H # include <sys/types.h> ................................................................................ # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB LIBOBJS SHOBJFLAGS SHOBJLDFLAGS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. ac_init_help= ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. ................................................................................ # # Report the --help message. # if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF \`configure' configures libconfig 0.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. ................................................................................ cat <<\_ACEOF _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in short | recursive ) echo "Configuration of libconfig 0.0.1:";; esac cat <<\_ACEOF Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a ................................................................................ cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF libconfig configure 0.0.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit 0 fi exec 5>config.log cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libconfig $as_me 0.0.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ _ACEOF { cat <<_ASUNAME ................................................................................ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ................................................................................ fi AR=$ac_ct_AR else AR="$ac_cv_prog_AR" fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB="true" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi RANLIB=$ac_ct_RANLIB else RANLIB="$ac_cv_prog_RANLIB" fi cat >>confdefs.h <<\_ACEOF #define _GNU_SOURCE 1 _ACEOF ................................................................................ for ac_header in stdlib.h string.h unistd.h time.h sys/time.h getopt.h stdio.h ctype.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 ................................................................................ conftest$ac_exeext conftest.$ac_ext; fi LDFLAGS="$OLD_LDFLAGS" echo "$as_me:$LINENO: result: $SHOBJLDFLAGS $SHOBJFLAGS" >&5 echo "${ECHO_T}$SHOBJLDFLAGS $SHOBJFLAGS" >&6 ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs, see configure's option --config-cache. # It is not useful on other systems. If it contains results you don't # want to keep, you may remove or edit it. # ................................................................................ echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX } >&5 cat >&5 <<_CSEOF This file was extended by libconfig $as_me 0.0.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ ................................................................................ $config_headers Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ libconfig config.status 0.0.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir ................................................................................ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done ................................................................................ s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@SHOBJFLAGS@,$SHOBJFLAGS,;t t s,@SHOBJLDFLAGS@,$SHOBJLDFLAGS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF |
| | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > | | | > > > > > > > > < < |
1 2 3 4 5 6 7 8 9 10 11 ... 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 ... 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 ... 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 ... 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 ... 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 .... 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 .... 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 .... 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 ..... 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 16198 16199 16200 ..... 16549 16550 16551 16552 16553 16554 16555 16556 16557 16558 16559 16560 16561 16562 16563 ..... 16609 16610 16611 16612 16613 16614 16615 16616 16617 16618 16619 16620 16621 16622 16623 ..... 16713 16714 16715 16716 16717 16718 16719 16720 16721 16722 16723 16724 16725 16726 16727 16728 16729 16730 16731 ..... 16814 16815 16816 16817 16818 16819 16820 16821 16822 16823 16824 16825 16826 16827 16828 16829 16830 16831 16832 16833 16834 |
#! /bin/sh # From configure.in Revision . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for libconfig 0.0.2. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## ................................................................................ # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME='libconfig' PACKAGE_TARNAME='libconfig' PACKAGE_VERSION='0.0.2' PACKAGE_STRING='libconfig 0.0.2' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #if HAVE_SYS_TYPES_H # include <sys/types.h> ................................................................................ # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CPP EGREP AR ac_ct_AR LIBOBJS SHOBJFLAGS SHOBJLDFLAGS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. ac_init_help= ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. ................................................................................ # # Report the --help message. # if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF \`configure' configures libconfig 0.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. ................................................................................ cat <<\_ACEOF _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in short | recursive ) echo "Configuration of libconfig 0.0.2:";; esac cat <<\_ACEOF Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a ................................................................................ cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF libconfig configure 0.0.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit 0 fi exec 5>config.log cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libconfig $as_me 0.0.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ _ACEOF { cat <<_ASUNAME ................................................................................ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me:$LINENO: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi RANLIB=$ac_ct_RANLIB else RANLIB="$ac_cv_prog_RANLIB" fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ................................................................................ fi AR=$ac_ct_AR else AR="$ac_cv_prog_AR" fi cat >>confdefs.h <<\_ACEOF #define _GNU_SOURCE 1 _ACEOF ................................................................................ for ac_header in ctype.h dirent.h libintl.h stdio.h stdlib.h string.h strings.h sys/stat.h sys/types.h unistd.h getopt.h time.h sys/time.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 ................................................................................ conftest$ac_exeext conftest.$ac_ext; fi LDFLAGS="$OLD_LDFLAGS" echo "$as_me:$LINENO: result: $SHOBJLDFLAGS $SHOBJFLAGS" >&5 echo "${ECHO_T}$SHOBJLDFLAGS $SHOBJFLAGS" >&6 ac_config_files="$ac_config_files Makefile lc_geterrno.3 lc_process.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs, see configure's option --config-cache. # It is not useful on other systems. If it contains results you don't # want to keep, you may remove or edit it. # ................................................................................ echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX } >&5 cat >&5 <<_CSEOF This file was extended by libconfig $as_me 0.0.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ ................................................................................ $config_headers Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ libconfig config.status 0.0.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir ................................................................................ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lc_geterrno.3" ) CONFIG_FILES="$CONFIG_FILES lc_geterrno.3" ;; "lc_process.3" ) CONFIG_FILES="$CONFIG_FILES lc_process.3" ;; "lc_register_var.3" ) CONFIG_FILES="$CONFIG_FILES lc_register_var.3" ;; "lc_geterrstr.3" ) CONFIG_FILES="$CONFIG_FILES lc_geterrstr.3" ;; "lc_register_callback.3" ) CONFIG_FILES="$CONFIG_FILES lc_register_callback.3" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done ................................................................................ s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LN_S@,$LN_S,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@SHOBJFLAGS@,$SHOBJFLAGS,;t t s,@SHOBJLDFLAGS@,$SHOBJLDFLAGS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF |
Modified configure.in from [0278e707a4] to [769589dcb9].
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 |
AC_REVISION($Revision $) AC_INIT(libconfig, 0.0.1) AC_CONFIG_HEADER(config.h) dnl Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_INSTALL AC_AIX AC_CHECK_TOOL(AR, ar, true) AC_CHECK_TOOL(RANLIB, ranlib, true) AC_GNU_SOURCE AC_CHECK_HEADERS(stdlib.h string.h unistd.h time.h sys/time.h getopt.h stdio.h ctype.h) AC_HEADER_TIME DC_DO_TYPE(uint64_t, unsigned, 8) DC_DO_TYPE(int64_t, signed, 8) DC_DO_TYPE(uint32_t, unsigned, 4) DC_DO_TYPE(int32_t, signed, 4) DC_DO_TYPE(uint16_t, unsigned, 2) DC_DO_TYPE(int16_t, signed, 2) AC_REPLACE_FUNCS(getopt strsep) dnl Checks for Win32 specific things. DC_DO_WIN32 DC_GET_SHOBJFLAGS AC_OUTPUT(Makefile) |
| > > < < > | | |
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 |
AC_REVISION($Revision $) AC_INIT(libconfig, 0.0.2) AC_CONFIG_HEADER(config.h) dnl Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_RANLIB AC_AIX AC_CHECK_TOOL(AR, ar, true) AC_GNU_SOURCE AC_CHECK_HEADERS(ctype.h dirent.h libintl.h stdio.h stdlib.h string.h strings.h sys/stat.h sys/types.h unistd.h time.h sys/time.h) AC_HEADER_TIME DC_DO_TYPE(uint64_t, unsigned, 8) DC_DO_TYPE(int64_t, signed, 8) DC_DO_TYPE(uint32_t, unsigned, 4) DC_DO_TYPE(int32_t, signed, 4) DC_DO_TYPE(uint16_t, unsigned, 2) DC_DO_TYPE(int16_t, signed, 2) AC_REPLACE_FUNCS(strsep) dnl Checks for Win32 specific things. DC_DO_WIN32 DC_GET_SHOBJFLAGS AC_OUTPUT(Makefile lc_geterrno.3 lc_process.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3) |
Deleted getopt.c version [0813078ee0].
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 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 |
/* Getopt for GNU. NOTE: getopt is now part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. Ditto for AIX 3.2 and <stdlib.h>. */ #ifndef _NO_PROTO # define _NO_PROTO #endif #ifdef HAVE_CONFIG_H # include "config.h" #endif #if !defined __STDC__ || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ # ifndef const # define const # endif #endif #include <stdio.h> /* Comment out all this code if we are using the GNU C Library, and are not actually compiling the library itself. This code is part of the GNU C Library, but also included in many other GNU distributions. Compiling and linking in this code is a waste when using the GNU C library (especially if it is a shared library). Rather than having every GNU program understand `configure --with-gnu-libc' and omit the object files, it is simpler to just do this in the source for each such file. */ #define GETOPT_INTERFACE_VERSION 2 #if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 # include <gnu-versions.h> # if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION # define ELIDE_CODE # endif #endif #ifndef ELIDE_CODE /* This needs to come after some library #include to get __GNU_LIBRARY__ defined. */ #ifdef __GNU_LIBRARY__ /* Don't include stdlib.h for non-GNU C libraries because some of them contain conflicting prototypes for getopt. */ # include <stdlib.h> # include <unistd.h> #endif /* GNU C library. */ #ifdef VMS # include <unixlib.h> # if HAVE_STRING_H - 0 # include <string.h> # endif #endif #ifndef _ /* This is for other GNU distributions with internationalized messages. When compiling libc, the _ macro is predefined. */ # ifdef HAVE_LIBINTL_H # include <libintl.h> # define _(msgid) gettext (msgid) # else # define _(msgid) (msgid) # endif #endif /* This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves differently for the user, since it allows the user to intersperse the options with the other arguments. As `getopt' works, it permutes the elements of ARGV so that, when it is done, all the options precede everything else. Thus all application programs are extended to handle flexible argument order. Setting the environment variable POSIXLY_CORRECT disables permutation. Then the behavior is completely standard. GNU application programs can use a third alternative mode in which they can distinguish the relative order of options and other arguments. */ #include "getopt.h" /* For communication from `getopt' to the caller. When `getopt' finds an option that takes an argument, the argument value is returned here. Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ char *optarg = NULL; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller and for communication between successive calls to `getopt'. On entry to `getopt', zero means this is the first call; initialize. When `getopt' returns -1, this is the index of the first of the non-option elements that the caller should itself scan. Otherwise, `optind' communicates from one call to the next how much of ARGV has been scanned so far. */ /* 1003.2 says this must be 1 before any call. */ int optind = 1; /* Formerly, initialization of getopt depended on optind==0, which causes problems with re-calling getopt as programs generally don't know that. */ int __getopt_initialized = 0; /* The next char to be scanned in the option-element in which the last option character we returned was found. This allows us to pick up the scan where we left off. If this is zero, or a null string, it means resume the scan by advancing to the next ARGV-element. */ static char *nextchar; /* Callers store zero here to inhibit the error message for unrecognized options. */ int opterr = 1; /* Set to an option character which was unrecognized. This must be initialized on some systems to avoid linking in the system's own getopt implementation. */ int optopt = '?'; /* Describe how to deal with options that follow non-option ARGV-elements. If the caller did not specify anything, the default is REQUIRE_ORDER if the environment variable POSIXLY_CORRECT is defined, PERMUTE otherwise. REQUIRE_ORDER means don't recognize them as options; stop option processing when the first non-option is seen. This is what Unix does. This mode of operation is selected by either setting the environment variable POSIXLY_CORRECT, or using `+' as the first character of the list of option characters. PERMUTE is the default. We permute the contents of ARGV as we scan, so that eventually all the non-options are at the end. This allows options to be given in any order, even with programs that were not written to expect this. RETURN_IN_ORDER is an option available to programs that were written to expect options and other ARGV-elements in any order and that care about the ordering of the two. We describe each non-option ARGV-element as if it were the argument of an option with character code 1. Using `-' as the first character of the list of option characters selects this mode of operation. The special argument `--' forces an end of option-scanning regardless of the value of `ordering'. In the case of RETURN_IN_ORDER, only `--' can cause `getopt' to return -1 with `optind' != ARGC. */ static enum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER } ordering; /* Value of POSIXLY_CORRECT environment variable. */ static char *posixly_correct; #ifdef __GNU_LIBRARY__ /* We want to avoid inclusion of string.h with non-GNU libraries because there are many ways it can cause trouble. On some systems, it contains special magic macros that don't work in GCC. */ # include <string.h> # define my_index strchr #else # if HAVE_STRING_H # include <string.h> # else # if HAVE_STRINGS_H # include <strings.h> # endif # endif /* Avoid depending on library functions or files whose names are inconsistent. */ #ifndef getenv #ifdef __cplusplus extern "C" { #endif extern char *getenv (const char *name); #ifdef __cplusplus } #endif #endif static char * my_index (const char *str, int chr) { while (*str) { if (*str == chr) return (char *) str; str++; } return 0; } /* If using GCC, we can safely declare strlen this way. If not using GCC, it is ok not to declare it. */ #ifdef __GNUC__ /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. That was relevant to code that was here before. */ # if (!defined __STDC__ || !__STDC__) && !defined strlen /* gcc with -traditional declares the built-in strlen to return int, and has done so at least since version 2.4.5. -- rms. */ extern int strlen (const char *); # endif /* not __STDC__ */ #endif /* __GNUC__ */ #endif /* not __GNU_LIBRARY__ */ /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have been skipped. `first_nonopt' is the index in ARGV of the first of them; `last_nonopt' is the index after the last of them. */ static int first_nonopt; static int last_nonopt; #ifdef _LIBC /* Bash 2.0 gives us an environment variable containing flags indicating ARGV elements that should not be considered arguments. */ /* Defined in getopt_init.c */ extern char *__getopt_nonoption_flags; static int nonoption_flags_max_len; static int nonoption_flags_len; static int original_argc; static char *const *original_argv; /* Make sure the environment variable bash 2.0 puts in the environment is valid for the getopt call we must make sure that the ARGV passed to getopt is that one passed to the process. */ static void __attribute__ ((unused)) store_args_and_env (int argc, char *const *argv) { /* XXX This is no good solution. We should rather copy the args so that we can compare them later. But we must not use malloc(3). */ original_argc = argc; original_argv = argv; } # ifdef text_set_element text_set_element (__libc_subinit, store_args_and_env); # endif /* text_set_element */ # define SWAP_FLAGS(ch1, ch2) \ if (nonoption_flags_len > 0) \ { \ char __tmp = __getopt_nonoption_flags[ch1]; \ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ __getopt_nonoption_flags[ch2] = __tmp; \ } #else /* !_LIBC */ # define SWAP_FLAGS(ch1, ch2) #endif /* _LIBC */ /* Exchange two adjacent subsequences of ARGV. One subsequence is elements [first_nonopt,last_nonopt) which contains all the non-options that have been skipped so far. The other is elements [last_nonopt,optind), which contains all the options processed since those non-options were skipped. `first_nonopt' and `last_nonopt' are relocated so that they describe the new indices of the non-options in ARGV after they are moved. */ #if defined __STDC__ && __STDC__ static void exchange (char **); #endif static void exchange (char **argv) { int bottom = first_nonopt; int middle = last_nonopt; int top = optind; char *tem; /* Exchange the shorter segment with the far end of the longer segment. That puts the shorter segment into the right place. It leaves the longer segment in the right place overall, but it consists of two parts that need to be swapped next. */ #ifdef _LIBC /* First make sure the handling of the `__getopt_nonoption_flags' string can work normally. Our top argument must be in the range of the string. */ if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) { /* We must extend the array. The user plays games with us and presents new arguments. */ char *new_str = malloc (top + 1); if (new_str == NULL) nonoption_flags_len = nonoption_flags_max_len = 0; else { memset (__mempcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len), '\0', top + 1 - nonoption_flags_max_len); nonoption_flags_max_len = top + 1; __getopt_nonoption_flags = new_str; } } #endif while (top > middle && middle > bottom) { if (top - middle > middle - bottom) { /* Bottom segment is the short one. */ int len = middle - bottom; register int i; /* Swap it with the top part of the top segment. */ for (i = 0; i < len; i++) { tem = argv[bottom + i]; argv[bottom + i] = argv[top - (middle - bottom) + i]; argv[top - (middle - bottom) + i] = tem; SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); } /* Exclude the moved bottom segment from further swapping. */ top -= len; } else { /* Top segment is the short one. */ int len = top - middle; register int i; /* Swap it with the bottom part of the bottom segment. */ for (i = 0; i < len; i++) { tem = argv[bottom + i]; argv[bottom + i] = argv[middle + i]; argv[middle + i] = tem; SWAP_FLAGS (bottom + i, middle + i); } /* Exclude the moved top segment from further swapping. */ bottom += len; } } /* Update records for the slots the non-options now occupy. */ first_nonopt += (optind - last_nonopt); last_nonopt = optind; } /* Initialize the internal data when the first call is made. */ #if defined __STDC__ && __STDC__ static const char *_getopt_initialize (int, char *const *, const char *); #endif static const char * _getopt_initialize (int argc, char *const *argv, const char *optstring) { /* Start processing options with ARGV-element 1 (since ARGV-element 0 is the program name); the sequence of previously skipped non-option ARGV-elements is empty. */ first_nonopt = last_nonopt = optind; nextchar = NULL; posixly_correct = getenv ("POSIXLY_CORRECT"); /* Determine how to handle the ordering of options and nonoptions. */ if (optstring[0] == '-') { ordering = RETURN_IN_ORDER; ++optstring; } else if (optstring[0] == '+') { ordering = REQUIRE_ORDER; ++optstring; } else if (posixly_correct != NULL) ordering = REQUIRE_ORDER; else ordering = PERMUTE; #ifdef _LIBC if (posixly_correct == NULL && argc == original_argc && argv == original_argv) { if (nonoption_flags_max_len == 0) { if (__getopt_nonoption_flags == NULL || __getopt_nonoption_flags[0] == '\0') nonoption_flags_max_len = -1; else { const char *orig_str = __getopt_nonoption_flags; int len = nonoption_flags_max_len = strlen (orig_str); if (nonoption_flags_max_len < argc) nonoption_flags_max_len = argc; __getopt_nonoption_flags = (char *) malloc (nonoption_flags_max_len); if (__getopt_nonoption_flags == NULL) nonoption_flags_max_len = -1; else memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), '\0', nonoption_flags_max_len - len); } } nonoption_flags_len = nonoption_flags_max_len; } else nonoption_flags_len = 0; #endif return optstring; } /* Scan elements of ARGV (whose length is ARGC) for option characters given in OPTSTRING. If an element of ARGV starts with '-', and is not exactly "-" or "--", then it is an option element. The characters of this element (aside from the initial '-') are option characters. If `getopt' is called repeatedly, it returns successively each of the option characters from each of the option elements. If `getopt' finds another option character, it returns that character, updating `optind' and `nextchar' so that the next call to `getopt' can resume the scan with the following option character or ARGV-element. If there are no more option characters, `getopt' returns -1. Then `optind' is the index in ARGV of the first ARGV-element that is not an option. (The ARGV-elements have been permuted so that those that are not options now come last.) OPTSTRING is a string containing the legitimate option characters. If an option character is seen that is not listed in OPTSTRING, return '?' after printing an error message. If you set `opterr' to zero, the error message is suppressed but we still return '?'. If a char in OPTSTRING is followed by a colon, that means it wants an arg, so the following text in the same ARGV-element, or the text of the following ARGV-element, is returned in `optarg'. Two colons mean an option that wants an optional arg; if there is text in the current ARGV-element, it is returned in `optarg', otherwise `optarg' is set to zero. If OPTSTRING starts with `-' or `+', it requests different methods of handling the non-option ARGV-elements. See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. Long-named options begin with `--' instead of `-'. Their names may be abbreviated as long as the abbreviation is unique or is an exact match for some defined option. If they have an argument, it follows the option name in the same ARGV-element, separated from the option name by a `=', or else the in next ARGV-element. When `getopt' finds a long-named option, it returns 0 if that option's `flag' field is nonzero, the value of the option's `val' field if the `flag' field is zero. The elements of ARGV aren't really const, because we permute them. But we pretend they're const in the prototype to be compatible with other systems. LONGOPTS is a vector of `struct option' terminated by an element containing a name which is zero. LONGIND returns the index in LONGOPT of the long-named option found. It is only valid when a long-named option has been found by the most recent call. If LONG_ONLY is nonzero, '-' as well as '--' can introduce long-named options. */ int _getopt_internal (int argc, char *const *argv, const char *optstring, const struct option *longopts, int *longind, int long_only) { optarg = NULL; if (optind == 0 || !__getopt_initialized) { if (optind == 0) optind = 1; /* Don't scan ARGV[0], the program name. */ optstring = _getopt_initialize (argc, argv, optstring); __getopt_initialized = 1; } /* Test whether ARGV[optind] points to a non-option argument. Either it does not have option syntax, or there is an environment flag from the shell indicating it is not an option. The later information is only used when the used in the GNU libc. */ #ifdef _LIBC # define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ || (optind < nonoption_flags_len \ && __getopt_nonoption_flags[optind] == '1')) #else # define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') #endif if (nextchar == NULL || *nextchar == '\0') { /* Advance to the next ARGV-element. */ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been moved back by the user (who may also have changed the arguments). */ if (last_nonopt > optind) last_nonopt = optind; if (first_nonopt > optind) first_nonopt = optind; if (ordering == PERMUTE) { /* If we have just processed some options following some non-options, exchange them so that the options come first. */ if (first_nonopt != last_nonopt && last_nonopt != optind) exchange ((char **) argv); else if (last_nonopt != optind) first_nonopt = optind; /* Skip any additional non-options and extend the range of non-options previously skipped. */ while (optind < argc && NONOPTION_P) optind++; last_nonopt = optind; } /* The special ARGV-element `--' means premature end of options. Skip it like a null option, then exchange with previous non-options as if it were an option, then skip everything else like a non-option. */ if (optind != argc && !strcmp (argv[optind], "--")) { optind++; if (first_nonopt != last_nonopt && last_nonopt != optind) exchange ((char **) argv); else if (first_nonopt == last_nonopt) first_nonopt = optind; last_nonopt = argc; optind = argc; } /* If we have done all the ARGV-elements, stop the scan and back over any non-options that we skipped and permuted. */ if (optind == argc) { /* Set the next-arg-index to point at the non-options that we previously skipped, so the caller will digest them. */ if (first_nonopt != last_nonopt) optind = first_nonopt; return -1; } /* If we have come to a non-option and did not permute it, either stop the scan or describe it to the caller and pass it by. */ if (NONOPTION_P) { if (ordering == REQUIRE_ORDER) return -1; optarg = argv[optind++]; return 1; } /* We have found another option-ARGV-element. Skip the initial punctuation. */ nextchar = (argv[optind] + 1 + (longopts != NULL && argv[optind][1] == '-')); } /* Decode the current option-ARGV-element. */ /* Check whether the ARGV-element is a long option. If long_only and the ARGV-element has the form "-f", where f is a valid short option, don't consider it an abbreviated form of a long option that starts with f. Otherwise there would be no way to give the -f short option. On the other hand, if there's a long option "fubar" and the ARGV-element is "-fu", do consider that an abbreviation of the long option, just like "--fu", and not "-f" with arg "u". This distinction seems to be the most useful approach. */ if (longopts != NULL && (argv[optind][1] == '-' || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) { char *nameend; const struct option *p; const struct option *pfound = NULL; int exact = 0; int ambig = 0; int indfound = -1; int option_index; for (nameend = nextchar; *nameend && *nameend != '='; nameend++) /* Do nothing. */ ; /* Test all long options for either exact match or abbreviated matches. */ for (p = longopts, option_index = 0; p->name; p++, option_index++) if (!strncmp (p->name, nextchar, nameend - nextchar)) { if ((unsigned int) (nameend - nextchar) == (unsigned int) strlen (p->name)) { /* Exact match found. */ pfound = p; indfound = option_index; exact = 1; break; } else if (pfound == NULL) { /* First nonexact match found. */ pfound = p; indfound = option_index; } else /* Second or later nonexact match found. */ ambig = 1; } if (ambig && !exact) { if (opterr) fprintf (stderr, _("%s: option `%s' is ambiguous\n"), argv[0], argv[optind]); nextchar += strlen (nextchar); optind++; optopt = 0; return '?'; } if (pfound != NULL) { option_index = indfound; optind++; if (*nameend) { /* Don't test has_arg with >, because some C compilers don't allow it to be used on enums. */ if (pfound->has_arg) optarg = nameend + 1; else { if (opterr) { if (argv[optind - 1][1] == '-') /* --option */ fprintf (stderr, _("%s: option `--%s' doesn't allow an argument\n"), argv[0], pfound->name); else /* +option or -option */ fprintf (stderr, _("%s: option `%c%s' doesn't allow an argument\n"), argv[0], argv[optind - 1][0], pfound->name); nextchar += strlen (nextchar); optopt = pfound->val; return '?'; } } } else if (pfound->has_arg == 1) { if (optind < argc) optarg = argv[optind++]; else { if (opterr) fprintf (stderr, _("%s: option `%s' requires an argument\n"), argv[0], argv[optind - 1]); nextchar += strlen (nextchar); optopt = pfound->val; return optstring[0] == ':' ? ':' : '?'; } } nextchar += strlen (nextchar); if (longind != NULL) *longind = option_index; if (pfound->flag) { *(pfound->flag) = pfound->val; return 0; } return pfound->val; } /* Can't find it as a long option. If this is not getopt_long_only, or the option starts with '--' or is not a valid short option, then it's an error. Otherwise interpret it as a short option. */ if (!long_only || argv[optind][1] == '-' || my_index (optstring, *nextchar) == NULL) { if (opterr) { if (argv[optind][1] == '-') /* --option */ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), argv[0], nextchar); else /* +option or -option */ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), argv[0], argv[optind][0], nextchar); } nextchar = (char *) ""; optind++; optopt = 0; return '?'; } } /* Look at and handle the next short option-character. */ { char c = *nextchar++; char *temp = my_index (optstring, c); /* Increment `optind' when we start to process its last character. */ if (*nextchar == '\0') ++optind; if (temp == NULL || c == ':') { if (opterr) { if (posixly_correct) /* 1003.2 specifies the format of this message. */ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); else fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); } optopt = c; return '?'; } /* Convenience. Treat POSIX -W foo same as long option --foo */ if (temp[0] == 'W' && temp[1] == ';') { char *nameend; const struct option *p; const struct option *pfound = NULL; int exact = 0; int ambig = 0; int indfound = 0; int option_index; /* This is an option that requires an argument. */ if (*nextchar != '\0') { optarg = nextchar; /* If we end this ARGV-element by taking the rest as an arg, we must advance to the next element now. */ optind++; } else if (optind == argc) { if (opterr) { /* 1003.2 specifies the format of this message. */ fprintf (stderr, _("%s: option requires an argument -- %c\n"), argv[0], c); } optopt = c; if (optstring[0] == ':') c = ':'; else c = '?'; return c; } else /* We already incremented `optind' once; increment it again when taking next ARGV-elt as argument. */ optarg = argv[optind++]; /* optarg is now the argument, see if it's in the table of longopts. */ for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) /* Do nothing. */ ; /* Test all long options for either exact match or abbreviated matches. */ for (p = longopts, option_index = 0; p->name; p++, option_index++) if (!strncmp (p->name, nextchar, nameend - nextchar)) { if ((unsigned int) (nameend - nextchar) == strlen (p->name)) { /* Exact match found. */ pfound = p; indfound = option_index; exact = 1; break; } else if (pfound == NULL) { /* First nonexact match found. */ pfound = p; indfound = option_index; } else /* Second or later nonexact match found. */ ambig = 1; } if (ambig && !exact) { if (opterr) fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), argv[0], argv[optind]); nextchar += strlen (nextchar); optind++; return '?'; } if (pfound != NULL) { option_index = indfound; if (*nameend) { /* Don't test has_arg with >, because some C compilers don't allow it to be used on enums. */ if (pfound->has_arg) optarg = nameend + 1; else { if (opterr) fprintf (stderr, _("\ %s: option `-W %s' doesn't allow an argument\n"), argv[0], pfound->name); nextchar += strlen (nextchar); return '?'; } } else if (pfound->has_arg == 1) { if (optind < argc) optarg = argv[optind++]; else { if (opterr) fprintf (stderr, _("%s: option `%s' requires an argument\n"), argv[0], argv[optind - 1]); nextchar += strlen (nextchar); return optstring[0] == ':' ? ':' : '?'; } } nextchar += strlen (nextchar); if (longind != NULL) *longind = option_index; if (pfound->flag) { *(pfound->flag) = pfound->val; return 0; } return pfound->val; } nextchar = NULL; return 'W'; /* Let the application handle it. */ } if (temp[1] == ':') { if (temp[2] == ':') { /* This is an option that accepts an argument optionally. */ if (*nextchar != '\0') { optarg = nextchar; optind++; } else optarg = NULL; nextchar = NULL; } else { /* This is an option that requires an argument. */ if (*nextchar != '\0') { optarg = nextchar; /* If we end this ARGV-element by taking the rest as an arg, we must advance to the next element now. */ optind++; } else if (optind == argc) { if (opterr) { /* 1003.2 specifies the format of this message. */ fprintf (stderr, _("%s: option requires an argument -- %c\n"), argv[0], c); } optopt = c; if (optstring[0] == ':') c = ':'; else c = '?'; } else /* We already incremented `optind' once; increment it again when taking next ARGV-elt as argument. */ optarg = argv[optind++]; nextchar = NULL; } } return c; } } int getopt (int argc, char *const *argv, const char *optstring) { return _getopt_internal (argc, argv, optstring, (const struct option *) 0, (int *) 0, 0); } #endif /* Not ELIDE_CODE. */ #ifdef TEST /* Compile with -DTEST to make an executable for use in testing the above definition of `getopt'. */ int main (argc, argv) int argc; char **argv; { int c; int digit_optind = 0; while (1) { int this_option_optind = optind ? optind : 1; c = getopt (argc, argv, "abc:d:0123456789"); if (c == -1) break; switch (c) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': if (digit_optind != 0 && digit_optind != this_option_optind) printf ("digits occur in two different argv-elements.\n"); digit_optind = this_option_optind; printf ("option %c\n", c); break; case 'a': printf ("option a\n"); break; case 'b': printf ("option b\n"); break; case 'c': printf ("option c with value `%s'\n", optarg); break; case '?': break; default: printf ("?? getopt returned character code 0%o ??\n", c); } } if (optind < argc) { printf ("non-option ARGV-elements: "); while (optind < argc) printf ("%s ", argv[optind++]); printf ("\n"); } exit (0); } #endif /* TEST */ |
< < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted getopt.h version [e07bc96ddb].
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 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 |
/* Declarations for getopt. Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _GETOPT_H #define _GETOPT_H 1 #ifdef __cplusplus extern "C" { #endif /* For communication from `getopt' to the caller. When `getopt' finds an option that takes an argument, the argument value is returned here. Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ extern char *optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller and for communication between successive calls to `getopt'. On entry to `getopt', zero means this is the first call; initialize. When `getopt' returns -1, this is the index of the first of the non-option elements that the caller should itself scan. Otherwise, `optind' communicates from one call to the next how much of ARGV has been scanned so far. */ extern int optind; /* Callers store zero here to inhibit the error message `getopt' prints for unrecognized options. */ extern int opterr; /* Set to an option character which was unrecognized. */ extern int optopt; /* Describe the long-named options requested by the application. The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector of `struct option' terminated by an element containing a name which is zero. The field `has_arg' is: no_argument (or 0) if the option does not take an argument, required_argument (or 1) if the option requires an argument, optional_argument (or 2) if the option takes an optional argument. If the field `flag' is not NULL, it points to a variable that is set to the value given in the field `val' when the option is found, but left unchanged if the option is not found. To have a long-named option do something other than set an `int' to a compiled-in constant, such as set a value from `optarg', set the option's `flag' field to zero and its `val' field to a nonzero value (the equivalent single-letter option character, if there is one). For long options that have a zero `flag' field, `getopt' returns the contents of the `val' field. */ struct option { #if defined (__STDC__) && __STDC__ const char *name; #else char *name; #endif /* has_arg can't be an enum because some compilers complain about type mismatches in all the code that assumes it is an int. */ int has_arg; int *flag; int val; }; /* Names for the values of the `has_arg' field of `struct option'. */ #define no_argument 0 #define required_argument 1 #define optional_argument 2 #define getopt(x,y,z) lc_getopt(x,y,z) #define getopt_long(a,b,c,d,e) lc_getopt_long(a,b,c,d,e) #define getopt_long_only(a,b,c,d,e) lc_getopt_long_only(a,b,c,d,e) #define _getopt_internal lc_getopt_internal #if defined (__STDC__) && __STDC__ #ifdef __GNU_LIBRARY__ /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ extern int getopt (int argc, char *const *argv, const char *shortopts); #else /* not __GNU_LIBRARY__ */ extern int getopt (); #endif /* __GNU_LIBRARY__ */ extern int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); extern int getopt_long_only (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); /* Internal only. Users should not call this directly. */ extern int _getopt_internal (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind, int long_only); #else /* not __STDC__ */ extern int getopt (); extern int getopt_long (); extern int getopt_long_only (); extern int _getopt_internal (); #endif /* __STDC__ */ #ifdef __cplusplus } #endif #endif /* getopt.h */ |
< < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Added lc_geterrno.3.in version [da39a3ee5e].
Added lc_geterrstr.3.in version [da39a3ee5e].
Added lc_process.3.in version [da39a3ee5e].
Added lc_register_callback.3.in version [da39a3ee5e].
Added lc_register_var.3.in version [da39a3ee5e].
Modified libconfig.c from [e693b0baee] to [09c6afb854].
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 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 ... 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 ... 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 ... 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 |
#endif #ifdef HAVE_CTYPE_H #include <ctype.h> #endif struct lc_varhandler_st *varhandlers = NULL; int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra) { int retval = -1; switch (type) { case LC_CONF_SECTION: retval = lc_process_conf_section(appname, extra); break; case LC_CONF_APACHE: retval = lc_process_conf_apache(appname, extra); break; case LC_CONF_COLON: retval = lc_process_conf_colon(appname, extra); break; case LC_CONF_EQUAL: retval = lc_process_conf_equal(appname, extra); break; case LC_CONF_SPACE: retval = lc_process_conf_space(appname, extra); break; case LC_CONF_XML: retval = lc_process_conf_xml(appname, extra); break; default: break; } return(retval); } static int lc_process_var_string(void *data, const char *value) { char **dataval; dataval = data; *dataval = strdup(value); ................................................................................ if (strcasecmp(value, "enable") == 0 || strcasecmp(value, "true") == 0 || strcasecmp(value, "yes") == 0 || strcasecmp(value, "on") == 0 || strcasecmp(value, "y") == 0 || strcasecmp(value, "1") == 0) { *dataval = 1; } else if (strcasecmp(value, "disable") == 0 || strcasecmp(value, "false") == 0 || strcasecmp(value, "off") == 0 || strcasecmp(value, "no") == 0 || strcasecmp(value, "n") == 0 || strcasecmp(value, "0") == 0) { *dataval = 0; } return(0); } static long long lc_process_size(const char *value) { long long retval = -1; char *mult = NULL; retval = strtoull(value, &mult, 10); ................................................................................ dataval = data; *dataval = lc_process_size(value); return(0); } static int lc_handle(struct lc_varhandler_st *handler, const char *value, lc_flags_t flags) { switch (handler->mode) { case LC_MODE_CALLBACK: if (handler->callback != NULL) { return(handler->callback(handler->var, value, flags)); } break; case LC_MODE_VAR: switch (handler->type) { case LC_VAR_STRING: return(lc_process_var_string(handler->data, value)); break; case LC_VAR_LONG_LONG: return(lc_process_var_longlong(handler->data, value)); break; case LC_VAR_LONG: return(lc_process_var_long(handler->data, value)); break; case LC_VAR_INT: return(lc_process_var_int(handler->data, value)); break; case LC_VAR_SHORT: return(lc_process_var_short(handler->data, value)); break; case LC_VAR_BOOL: return(lc_process_var_bool(handler->data, value)); break; case LC_VAR_SIZE_LONG_LONG: return(lc_process_var_sizelonglong(handler->data, value)); break; case LC_VAR_SIZE_LONG: return(lc_process_var_sizelong(handler->data, value)); break; case LC_VAR_SIZE_INT: return(lc_process_var_sizeint(handler->data, value)); break; case LC_VAR_SIZE_SHORT: return(lc_process_var_sizeshort(handler->data, value)); break; case LC_VAR_TIME: case LC_VAR_DATE: case LC_VAR_FILENAME: case LC_VAR_DIRECTORY: PRINTERR_D("Not implemented yet!"); return(-1); case LC_VAR_NONE: case LC_VAR_UNKNOWN: case LC_VAR_SECTIONSTART: case LC_VAR_SECTIONEND: return(0); break; } break; } return(-1); } int lc_process_var(const char *var, const char *varargs, const char *value, lc_flags_t flags) { struct lc_varhandler_st *handler = NULL; for (handler = varhandlers; handler != NULL; handler = handler->_next) { if (handler->var != var && (handler->var == NULL || var == NULL)) { continue; } if (handler->var != NULL) { if (strcasecmp(handler->var, var) != 0) { continue; } } return(lc_handle(handler, value, flags)); } return(-1); } int lc_register_callback(const char *var, int (*callback)(const char *, const char *, lc_flags_t)) { struct lc_varhandler_st *newhandler = NULL; newhandler = malloc(sizeof(*newhandler)); if (newhandler == NULL) { return(-1); } if (var == NULL) { newhandler->var = NULL; } else { newhandler->var = strdup(var); } newhandler->callback = callback; newhandler->type = LC_VAR_UNKNOWN; newhandler->mode = LC_MODE_CALLBACK; newhandler->opt = '\0'; newhandler->_next = varhandlers; varhandlers = newhandler; return(0); } ................................................................................ } if (var == NULL) { newhandler->var = NULL; } else { newhandler->var = strdup(var); } newhandler->type = type; newhandler->mode = LC_MODE_VAR; newhandler->data = data; newhandler->opt = opt; newhandler->_next = varhandlers; varhandlers = newhandler; return(0); } |
< < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > | | | < < < < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < | | | | > < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 .. 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 ... 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 ... 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 |
#endif #ifdef HAVE_CTYPE_H #include <ctype.h> #endif struct lc_varhandler_st *varhandlers = NULL; lc_err_t lc_errno = LC_ERR_NONE; static int lc_process_var_string(void *data, const char *value) { char **dataval; dataval = data; *dataval = strdup(value); ................................................................................ if (strcasecmp(value, "enable") == 0 || strcasecmp(value, "true") == 0 || strcasecmp(value, "yes") == 0 || strcasecmp(value, "on") == 0 || strcasecmp(value, "y") == 0 || strcasecmp(value, "1") == 0) { *dataval = 1; return(0); } else if (strcasecmp(value, "disable") == 0 || strcasecmp(value, "false") == 0 || strcasecmp(value, "off") == 0 || strcasecmp(value, "no") == 0 || strcasecmp(value, "n") == 0 || strcasecmp(value, "0") == 0) { *dataval = 0; return(0); } lc_errno = LC_ERR_BADFORMAT; return(-1); } static long long lc_process_size(const char *value) { long long retval = -1; char *mult = NULL; retval = strtoull(value, &mult, 10); ................................................................................ dataval = data; *dataval = lc_process_size(value); return(0); } static int lc_handle_type(lc_var_type_t type, const char *value, void *data) { switch (type) { case LC_VAR_STRING: return(lc_process_var_string(data, value)); break; case LC_VAR_LONG_LONG: return(lc_process_var_longlong(data, value)); break; case LC_VAR_LONG: return(lc_process_var_long(data, value)); break; case LC_VAR_INT: return(lc_process_var_int(data, value)); break; case LC_VAR_SHORT: return(lc_process_var_short(data, value)); break; case LC_VAR_BOOL: return(lc_process_var_bool(data, value)); break; case LC_VAR_SIZE_LONG_LONG: return(lc_process_var_sizelonglong(data, value)); break; case LC_VAR_SIZE_LONG: return(lc_process_var_sizelong(data, value)); break; case LC_VAR_SIZE_INT: return(lc_process_var_sizeint(data, value)); break; case LC_VAR_SIZE_SHORT: return(lc_process_var_sizeshort(data, value)); break; case LC_VAR_TIME: case LC_VAR_DATE: case LC_VAR_FILENAME: case LC_VAR_DIRECTORY: PRINTERR_D("Not implemented yet!"); return(-1); case LC_VAR_NONE: case LC_VAR_UNKNOWN: case LC_VAR_SECTION: case LC_VAR_SECTIONSTART: case LC_VAR_SECTIONEND: return(0); break; } return(-1); } static int lc_handle(struct lc_varhandler_st *handler, const char *var, const char *varargs, const char *value, lc_flags_t flags) { const char *localvar = NULL; int retval; if (var != NULL) { localvar = strrchr(var, '.'); if (localvar == NULL) { localvar = var; } else { *localvar++; } } else { localvar = NULL; } switch (handler->mode) { case LC_MODE_CALLBACK: if (handler->callback != NULL) { retval = handler->callback(localvar, var, varargs, value, flags, handler->extra); if (retval < 0) { lc_errno = LC_ERR_CALLBACK; } return(retval); } break; case LC_MODE_VAR: return(lc_handle_type(handler->type, value, handler->data)); break; } return(-1); } static int lc_process_environment(const char *appname) { /* XXX: write this */ return(0); } static int lc_process_cmdline(int argc, char **argv) { struct lc_varhandler_st *handler = NULL; char *cmdarg = NULL, *cmdoptarg = NULL; char *lastcomponent_handler = NULL; int cmdargidx = 0; int retval = 0, chkretval = 0; int ch = 0; for (cmdargidx = 1; cmdargidx < argc; cmdargidx++) { cmdarg = argv[cmdargidx]; /* Make sure we have an argument here. */ if (cmdarg == NULL) { break; } /* If the argument isn't an option, abort. */ if (cmdarg[0] != '-') { continue; } *cmdarg++; /* Handle long options. */ if (cmdarg[0] == '-') { *cmdarg++; /* Don't process arguments after the '--' option. */ if (cmdarg[0] == '\0') { break; } /* Look for a variable name that matches */ for (handler = varhandlers; handler != NULL; handler = handler->_next) { /* Skip handlers with no variable name. */ if (handler->var == NULL) { continue; } /* Skip handlers which don't agree with being processed on the command line. */ if (handler->type == LC_VAR_SECTION || handler->type == LC_VAR_SECTIONSTART || handler->type == LC_VAR_SECTIONEND || handler->type == LC_VAR_UNKNOWN) { continue; } /* Find the last part of the variable and compare it with the option being processed. */ lastcomponent_handler = strrchr(handler->var, '.'); if (lastcomponent_handler == NULL) { lastcomponent_handler = handler->var; } else { *lastcomponent_handler++; } /* Ignore this handler if they don't match. */ if (strcasecmp(lastcomponent_handler, cmdarg) != 0) { continue; } if (handler->type == LC_VAR_NONE) { cmdoptarg = NULL; } else { cmdargidx++; if (cmdargidx >= argc) { PRINTERR("Argument required."); lc_errno = LC_ERR_BADFORMAT; return(-1); } cmdoptarg = argv[cmdargidx]; } chkretval = lc_handle(handler, handler->var, NULL, cmdoptarg, LC_FLAGS_CMDLINE); if (chkretval < 0) { retval = -1; } break; } if (handler == NULL) { PRINTERR("Unknown option: --%s", cmdarg); lc_errno = LC_ERR_INVCMD; return(-1); } } else { for (; *cmdarg != '\0'; *cmdarg++) { ch = *cmdarg; for (handler = varhandlers; handler != NULL; handler = handler->_next) { if (handler->opt != ch || handler->opt == '\0') { continue; } /* Skip handlers which don't agree with being processed on the command line. */ if (handler->type == LC_VAR_SECTION || handler->type == LC_VAR_SECTIONSTART || handler->type == LC_VAR_SECTIONEND || handler->type == LC_VAR_UNKNOWN) { continue; } if (handler->type == LC_VAR_NONE) { cmdoptarg = NULL; } else { cmdargidx++; if (cmdargidx >= argc) { PRINTERR("Argument required."); lc_errno = LC_ERR_BADFORMAT; return(-1); } cmdoptarg = argv[cmdargidx]; } chkretval = lc_handle(handler, handler->var, NULL, cmdoptarg, LC_FLAGS_CMDLINE); if (chkretval < 0) { retval = -1; } break; } if (handler == NULL) { PRINTERR("Unknown option: -%c", ch); lc_errno = LC_ERR_INVCMD; return(-1); } } } } return(retval); } int lc_process_var(const char *var, const char *varargs, const char *value, lc_flags_t flags) { struct lc_varhandler_st *handler = NULL; const char *lastcomponent_handler = NULL, *lastcomponent_var = NULL; lastcomponent_var = strrchr(var, '.'); if (lastcomponent_var == NULL) { lastcomponent_var = var; } else { *lastcomponent_var++; } for (handler = varhandlers; handler != NULL; handler = handler->_next) { /* If either handler->var or var is NULL, skip, unless both are NULL. */ if (handler->var != var && (handler->var == NULL || var == NULL)) { continue; } /* If both are not-NULL, compare them. */ if (handler->var != NULL) { /* Wild-card-ish match. */ if (handler->var[0] == '*' && handler->var[1] == '.') { /* Only compare the last components */ lastcomponent_handler = strrchr(handler->var, '.') + 1; /* strrchr() won't return NULL, because we already checked it. */ if (strcasecmp(lastcomponent_handler, lastcomponent_var) != 0) { continue; } } else if (strcasecmp(handler->var, var) != 0) { /* Exact (case-insensitive comparison) failed. */ continue; } } return(lc_handle(handler, var, varargs, value, flags)); } return(-1); } int lc_register_callback(const char *var, char opt, lc_var_type_t type, int (*callback)(const char *, const char *, const char *, const char *, lc_flags_t, void *), void *extra) { struct lc_varhandler_st *newhandler = NULL; newhandler = malloc(sizeof(*newhandler)); if (newhandler == NULL) { return(-1); } if (var == NULL) { newhandler->var = NULL; } else { newhandler->var = strdup(var); } newhandler->mode = LC_MODE_CALLBACK; newhandler->type = type; newhandler->callback = callback; newhandler->opt = opt; newhandler->extra = extra; newhandler->_next = varhandlers; varhandlers = newhandler; return(0); } ................................................................................ } if (var == NULL) { newhandler->var = NULL; } else { newhandler->var = strdup(var); } newhandler->mode = LC_MODE_VAR; newhandler->type = type; newhandler->data = data; newhandler->opt = opt; newhandler->extra = NULL; newhandler->_next = varhandlers; varhandlers = newhandler; return(0); } int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra) { int retval = 0, chkretval = 0; /* XXX Handle config files. need to handle this in a loop of config files... */ switch (type) { case LC_CONF_SECTION: chkretval = lc_process_conf_section(appname, extra); break; case LC_CONF_APACHE: chkretval = lc_process_conf_apache(appname, extra); break; case LC_CONF_COLON: chkretval = lc_process_conf_colon(appname, extra); break; case LC_CONF_EQUAL: chkretval = lc_process_conf_equal(appname, extra); break; case LC_CONF_SPACE: chkretval = lc_process_conf_space(appname, extra); break; case LC_CONF_XML: chkretval = lc_process_conf_xml(appname, extra); break; default: chkretval = -1; lc_errno = LC_ERR_INVDATA; break; } if (chkretval < 0) { retval = -1; } /* Handle environment variables.*/ chkretval = lc_process_environment(appname); if (chkretval < 0) { retval = -1; } /* Handle command line arguments */ chkretval = lc_process_cmdline(argc, argv); if (chkretval < 0) { retval = -1; } return(retval); } lc_err_t lc_geterrno(void) { lc_err_t retval; retval = lc_errno; lc_errno = LC_ERR_NONE; return(retval); } char *lc_geterrstr(void) { char *retval = NULL; switch (lc_errno) { case LC_ERR_NONE: retval = "Success"; break; case LC_ERR_INVCMD: retval = "Invalid command"; break; case LC_ERR_INVSECTION: retval = "Invalid section"; break; case LC_ERR_INVDATA: retval = "Invalid application data (internal error)"; break; case LC_ERR_BADFORMAT: retval = "Bad data specified or incorrect format."; break; case LC_ERR_CANTOPEN: retval = "Can't open file."; break; case LC_ERR_CALLBACK: retval = "Error return from application handler."; break; } lc_errno = LC_ERR_NONE; if (retval != NULL) { return(retval); } return("Unknown error"); } |
Modified libconfig.h.in from [d75f74df35] to [a63e3c406d].
27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
LC_VAR_DIRECTORY, LC_VAR_SIZE_LONG_LONG, LC_VAR_SIZE_LONG, LC_VAR_SIZE_INT, LC_VAR_SIZE_SHORT, LC_VAR_TIME, LC_VAR_DATE, LC_VAR_SECTIONSTART, LC_VAR_SECTIONEND } lc_var_type_t; __BLANK_LINE__ typedef enum { LC_FLAGS_VAR, LC_FLAGS_SECTIONSTART, LC_FLAGS_SECTIONEND } lc_flags_t; __BLANK_LINE__ int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra); int lc_register_callback(const char *var, int (*callback)(const char *, const char *, lc_flags_t)); int lc_register_var(const char *var, lc_var_type_t type, void *data, char opt); __BLANK_LINE__ !endif |
> | > > > > > > > > > > > > > < > > > > > > > > > |
27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 |
LC_VAR_DIRECTORY, LC_VAR_SIZE_LONG_LONG, LC_VAR_SIZE_LONG, LC_VAR_SIZE_INT, LC_VAR_SIZE_SHORT, LC_VAR_TIME, LC_VAR_DATE, LC_VAR_SECTION, LC_VAR_SECTIONSTART, LC_VAR_SECTIONEND } lc_var_type_t; __BLANK_LINE__ typedef enum { LC_FLAGS_VAR, LC_FLAGS_CMDLINE, LC_FLAGS_SECTIONSTART, LC_FLAGS_SECTIONEND } lc_flags_t; __BLANK_LINE__ typedef enum { LC_ERR_NONE, LC_ERR_INVCMD, LC_ERR_INVSECTION, LC_ERR_INVDATA, LC_ERR_BADFORMAT, LC_ERR_CANTOPEN, LC_ERR_CALLBACK, } lc_err_t; __BLANK_LINE__ int lc_process(int argc, char **argv, const char *appname, lc_conf_type_t type, const char *extra); int lc_register_callback(const char *var, char opt, lc_var_type_t type, int (*callback)(const char *, const char *, const char *, const char *, lc_flags_t, void *), void *extra); int lc_register_var(const char *var, lc_var_type_t type, void *data, char opt); lc_err_t lc_geterrno(void); char *lc_geterrstr(void); __BLANK_LINE__ !define LC_CBRET_IGNORESECTION (255) !define LC_CBRET_OKAY (0) !define LC_CBRET_ERROR (-1) __BLANK_LINE__ !endif |
Modified libconfig_private.h from [8754ccc278] to [0dfd11fd0f].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 |
#ifndef _RSK_LIBCONFIG_PRIVATE_H #define _RSK_LIBCONFIG_PRIVATE_H #include "libconfig.h" int lc_process_var(const char *var, const char *varargs, const char *value, lc_flags_t flags); struct lc_varhandler_st; struct lc_varhandler_st { struct lc_varhandler_st *_next; char *var; char opt; lc_var_type_t type; enum { LC_MODE_CALLBACK, LC_MODE_VAR } mode; union { int (*callback)(); void *data; }; }; #endif |
> > > < | | < > |
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 |
#ifndef _RSK_LIBCONFIG_PRIVATE_H #define _RSK_LIBCONFIG_PRIVATE_H #include "libconfig.h" extern lc_err_t lc_errno; int lc_process_var(const char *var, const char *varargs, const char *value, lc_flags_t flags); struct lc_varhandler_st; struct lc_varhandler_st { struct lc_varhandler_st *_next; char *var; char opt; lc_var_type_t type; enum { LC_MODE_CALLBACK, LC_MODE_VAR } mode; int (*callback)(); void *data; void *extra; }; #endif |
Modified makearch.info from [0ffabcde63] to [d4324b086f].
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
# Space sperated list of documents, if they exist, they will be # prefixed with the contents of the DOC_HDR file and substitution # will occur: # @@UTIL@@ becomes the utility name ${UTIL} # @@VERS@@ becomes the utility version # @@DATE@@ becomes the current date DOCS="README" DOC_HDR="HEADER" # This script is executed immediately after copying the files # to a temp directory to attempt to compile BEFORE="build/prep.sh" # This script is executed immediately prior to creation of the # tarball AFTER="" # Files matching these (space-seperated) patterns are deleted TMPS="*.out HEADER build" |
| |
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
# Space sperated list of documents, if they exist, they will be
# prefixed with the contents of the DOC_HDR file and substitution
# will occur:
# @@UTIL@@ becomes the utility name ${UTIL}
# @@VERS@@ becomes the utility version
# @@DATE@@ becomes the current date
DOCS="README Docs/USAGE"
DOC_HDR="HEADER"
# This script is executed immediately after copying the files
# to a temp directory to attempt to compile
BEFORE="build/prep.sh"
# This script is executed immediately prior to creation of the
# tarball
AFTER=""
# Files matching these (space-seperated) patterns are deleted
TMPS="*.out HEADER build"
|
Modified test-lc.c from [49cd7f6cf6] to [9386f962de].
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 |
#include "compat.h" #include "libconfig.h" int sally_cmd(const char *arg, const char *val, lc_flags_t flags) { PRINTERR_D("%s sets value: \"%s\" (flags=%i)", arg, val, flags); return(0); } int main(int argc, char **argv) { char *joeval = NULL; long long xval = -1; int onoff = -1; lc_register_var("joe", LC_VAR_STRING, &joeval, 'j'); lc_register_var("bob", LC_VAR_SIZE_LONG_LONG, &xval, '\0'); lc_register_var("test", LC_VAR_BOOL, &onoff, '\0'); lc_register_callback("sally", sally_cmd); lc_process(argc, argv, "testapp", LC_CONF_SECTION, "test.cfg"); if (joeval != NULL) { SPOTVAR_S(joeval); } SPOTVAR_LLU(xval); SPOTVAR_I(onoff); return(0); } |
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | > > | > > > | > < > > > < < > > |
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 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
#include "compat.h" #include "libconfig.h" int help_cmd(const char *partarg, const char *arg, const char *argarg, const char *val, lc_flags_t flags, void *extra) { printf("Usage info goes here\n"); printf("\n"); exit(EXIT_FAILURE); } int sally_cmd(const char *partarg, const char *arg, const char *argarg, const char *val, lc_flags_t flags, void *extra) { PRINTERR_D("%s sets value: \"%s\" (flags=%i)", arg, val, flags); return(0); } int cmd_ifmodule(const char *partarg, const char *arg, const char *argarg, const char *val, lc_flags_t flags, void *extra) { if (flags == LC_FLAGS_SECTIONEND) { return(LC_CBRET_OKAY); } if (flags != LC_FLAGS_SECTIONSTART) { PRINTERR("IfModule can only be used as a section."); return(LC_CBRET_ERROR); } if (argarg == NULL) { PRINTERR("You must specify an argument to IfModule."); return(LC_CBRET_ERROR); } SPOTVAR_S(arg); SPOTVAR_S(argarg); return(LC_CBRET_IGNORESECTION); } int main(int argc, char **argv) { char *joeval = NULL; long long xval = -1; int onoff = -1; int lcpret = -1; lc_err_t errs; lc_register_var("Section", LC_VAR_SECTION, NULL, 0); lc_register_var("Somesection", LC_VAR_SECTION, NULL, 0); lc_register_var("Section.Test", LC_VAR_STRING, &joeval, 'j'); lc_register_var("bob", LC_VAR_SIZE_LONG_LONG, &xval, 's'); lc_register_var("Somesection.Free", LC_VAR_BOOL, &onoff, 0); lc_register_callback("sally", 0, LC_VAR_STRING, sally_cmd, NULL); lc_register_callback("HELP", 'h', LC_VAR_NONE, help_cmd, NULL); lc_register_callback("*.ifmodule", 0, LC_VAR_NONE, cmd_ifmodule, NULL); lcpret = lc_process(argc, argv, "testapp", LC_CONF_APACHE, "test.cfg"); if (lcpret < 0) { PRINTERR("Error processing config file: %s", lc_geterrstr()); return(EXIT_FAILURE); } if (joeval != NULL) { PRINTERR("joeval = \"%s\"", joeval); } else { PRINTERR("joeval = \"(null)\""); } PRINTERR("xval = %lli", xval); PRINTERR("onoff = %i", onoff); return(0); } |