From 0fb034908034ae9a7a4a48335f2773536aecaf3b Mon Sep 17 00:00:00 2001 From: Arturo Espinosa Date: Mon, 13 Dec 1999 20:03:30 +0000 Subject: Mega-merge from gnome-libs-1-0 to CANVAS_CLEANUP so that I can finish cleaning it up - Federico svn path=/branches/CANVAS_CLEANUP/; revision=1036 --- macros/ChangeLog | 20 --- macros/gnome-pilot.m4 | 47 +------ support/findme.c | 21 +++- support/popt-gnome.h | 40 +++--- support/popt.c | 332 +++++++++++++++++--------------------------------- support/poptconfig.c | 30 +++-- support/popthelp.c | 50 +++++--- support/poptint.h | 48 +++----- support/poptparse.c | 105 ++++++++-------- 9 files changed, 270 insertions(+), 423 deletions(-) diff --git a/macros/ChangeLog b/macros/ChangeLog index 5084178..74dfc3c 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,23 +1,3 @@ -1999-11-09 Eskil Heyn Olsen - - * gnome-pilot.m4: uses test -r instead of test -e, was reported as - a portability bug wrt solaris. - -1999-10-31 Eskil Heyn Olsen - - * gnome-pilot.m4: added PILOT_LINK_CHECK, used by - GNOME_PILOT_CHECK. Adds --with-pisock=$dir_for_pilot_link. - -1999-10-24 Jacob Berkman - - * gnome-ghttp-check.m4: this should be a better fix - -1999-10-21 Jacob Berkman - - * gnome-ghttp-check.m4: use a temp value until we know that - ghttp exists. This will hopefully fix building on Solaris - machines - 1999-09-26 Jody Goldberg * compiler-flags.m4 : Remove -Wpointer-arith. It generates large diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index e8a5263..5895bf7 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -17,46 +17,6 @@ AC_SUBST(PISOCK_LIBS) AC_SUBST(PILOT_BINS) AC_SUBST(PILOT_LIBS) -AC_DEFUN([PILOT_LINK_HOOK],[ - AC_ARG_WITH(pisock, - [ --with-pisock Specify prefix for pisock files],[ - if test x$withval = xyes; then - dnl Note that an empty true branch is not valid sh syntax. - ifelse([$1], [], :, [$1]) - else - PISOCK_INCLUDEDIR="-I$withval/include" - PISOCK_LIBDIR="-L$withval/lib" - PISOCK_LIBS="-lpisock" - AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so") - if test -r $withval/lib/libpisock.so; then - AC_MSG_RESULT("yes") - else - AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") - fi - AC_SUBST(PISOCK_INCLUDEDIR) - AC_SUBST(PISOCK_LIBDIR) - fi - ]) - - if test x$PISOCK_INCLUDEDIR = x; then - AC_CHECK_HEADER(pi-version.h, [], [ - AC_CHECK_HEADER(libpisock/pi-version.h, PISOCK_INCLUDEDIR="-I/usr/include/libpisock", - AC_MSG_ERROR("Unable to find pi-version.h")) ]) - fi - - AC_SUBST(PISOCK_INCLUDEDIR) - - if test x$PISOCK_INCLUDEDIR = x; then - AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock ], - [ AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") ]) - fi - -]) - -AC_DEFUN([PILOT_LINK_CHECK],[ - PILOT_LINK_HOOK([],nofailure) -]) - AC_DEFUN([GNOME_PILOT_HOOK],[ AC_PATH_PROG(GNOME_PILOT_CONFIG,gnome-pilot-config,no) AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[ @@ -68,10 +28,12 @@ AC_DEFUN([GNOME_PILOT_HOOK],[ ]) AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes) if test x$gnome_cv_pilot_found = xyes; then - PILOT_LINK_CHECK + $1 + AC_CHECK_HEADER(pi-version.h, [PISOCK_INCLUDEDIR=""], [ + AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_INCLUDEDIR="-I/usr/include/libpisock"])]) + AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS="-lpisock" ]) GNOME_PILOT_CFLAGS=`gnome-pilot-config --cflags client conduitmgmt` GNOME_PILOT_LIBS=`gnome-pilot-config --libs client conduitmgmt` - $1 else if test x$2 = xfailure; then AC_MSG_ERROR(Gnome-pilot not installed or installation problem) @@ -82,4 +44,3 @@ AC_DEFUN([GNOME_PILOT_HOOK],[ AC_DEFUN([GNOME_PILOT_CHECK],[ GNOME_PILOT_HOOK([],nofailure) ]) - diff --git a/support/findme.c b/support/findme.c index 6d1b41c..4ba4950 100644 --- a/support/findme.c +++ b/support/findme.c @@ -2,7 +2,24 @@ file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ -#include "system.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#ifdef __NeXT +/* access macros are not declared in non posix mode in unistd.h - + don't try to use posix on NeXTstep 3.3 ! */ +#include +#endif + +#if HAVE_ALLOCA_H +# include +#endif + #include "findme.h" const char * findProgramPath(const char * argv0) { @@ -14,7 +31,7 @@ const char * findProgramPath(const char * argv0) { /* If there is a / in the argv[0], it has to be an absolute path */ if (strchr(argv0, '/')) - return xstrdup(argv0); + return strdup(argv0); if (!path) return NULL; diff --git a/support/popt-gnome.h b/support/popt-gnome.h index 5046fad..c252e6b 100644 --- a/support/popt-gnome.h +++ b/support/popt-gnome.h @@ -52,20 +52,20 @@ extern "C" { #define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /* options can't follow args */ struct poptOption { - /*@observer@*/ /*@null@*/ const char * longName; /* may be NULL */ + const char * longName; /* may be NULL */ char shortName; /* may be '\0' */ int argInfo; - /*@shared@*/ /*@null@*/ void * arg; /* depends on argInfo */ + void * arg; /* depends on argInfo */ int val; /* 0 means don't return, just update flag */ - /*@shared@*/ /*@null@*/ const char * descrip; /* description for autohelp -- may be NULL */ - /*@shared@*/ /*@null@*/ const char * argDescrip; /* argument description for autohelp */ + const char * descrip; /* description for autohelp -- may be NULL */ + const char * argDescrip; /* argument description for autohelp */ }; struct poptAlias { - /*@owned@*/ /*@null@*/ const char * longName; /* may be NULL */ + const char * longName; /* may be NULL */ char shortName; /* may be '\0' */ int argc; - /*@owned@*/ const char ** argv; /* must be free()able */ + const char ** argv; /* must be free()able */ }; extern struct poptOption poptHelpOptions[]; @@ -85,23 +85,22 @@ typedef void (*poptCallbackType)(poptContext con, const struct poptOption * opt, const char * arg, const void * data); -/*@only@*/ poptContext poptGetContext(/*@keep@*/ const char * name, - int argc, /*@keep@*/ const char ** argv, - /*@keep@*/ const struct poptOption * options, int flags); +poptContext poptGetContext(const char * name, int argc, char ** argv, + const struct poptOption * options, int flags); void poptResetContext(poptContext con); /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */ int poptGetNextOpt(poptContext con); /* returns NULL if no argument is available */ -/*@observer@*/ /*@null@*/ const char * poptGetOptArg(poptContext con); +char * poptGetOptArg(poptContext con); /* returns NULL if no more options are available */ -/*@observer@*/ /*@null@*/ const char * poptGetArg(poptContext con); -/*@observer@*/ /*@null@*/ const char * poptPeekArg(poptContext con); -/*@observer@*/ /*@null@*/ const char ** poptGetArgs(poptContext con); +char * poptGetArg(poptContext con); +const char * poptPeekArg(poptContext con); +const char ** poptGetArgs(poptContext con); /* returns the option which caused the most recent error */ -/*@observer@*/ const char * poptBadOption(poptContext con, int flags); -void poptFreeContext( /*@only@*/ poptContext con); -int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv); +const char * poptBadOption(poptContext con, int flags); +void poptFreeContext(poptContext con); +int poptStuffArgs(poptContext con, const char ** argv); int poptAddAlias(poptContext con, struct poptAlias alias, int flags); int poptReadConfigFile(poptContext con, const char * fn); /* like above, but reads /etc/popt and $HOME/.popt along with environment @@ -109,16 +108,13 @@ int poptReadConfigFile(poptContext con, const char * fn); int poptReadDefaultConfig(poptContext con, int useEnv); /* argv should be freed -- this allows ', ", and \ quoting, but ' is treated the same as " and both may include \ quotes */ -int poptDupArgv(int argc, const char **argv, - /*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr); -int poptParseArgvString(const char * s, - /*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr); -/*@observer@*/ const char *const poptStrerror(const int error); +int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr); +const char * poptStrerror(const int error); void poptSetExecPath(poptContext con, const char * path, int allowAbsolute); void poptPrintHelp(poptContext con, FILE * f, int flags); void poptPrintUsage(poptContext con, FILE * f, int flags); void poptSetOtherOptionHelp(poptContext con, const char * text); -/*@observer@*/ const char * poptGetInvocationName(poptContext con); +const char * poptGetInvocationName(poptContext con); #ifdef __cplusplus } diff --git a/support/popt.c b/support/popt.c index 283cf83..3e8f73e 100644 --- a/support/popt.c +++ b/support/popt.c @@ -1,9 +1,26 @@ /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING - file accompanying popt source distributions, available from + file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ -#include "system.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#if HAVE_ALLOCA_H +# include +#endif + #include "findme.h" +#include "popt-gnome.h" #include "poptint.h" #ifndef HAVE_STRERROR @@ -20,7 +37,7 @@ static char * strerror(int errno) { void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) { if (con->execPath) xfree(con->execPath); - con->execPath = xstrdup(path); + con->execPath = strdup(path); con->execAbsolute = allowAbsolute; } @@ -28,7 +45,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table, int post) { const struct poptOption * opt = table; poptCallbackType cb; - + while (opt->longName || opt->shortName || opt->arg) { if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) { invokeCallbacks(con, opt->arg, post); @@ -43,7 +60,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table, } } -poptContext poptGetContext(const char * name, int argc, const char ** argv, +poptContext poptGetContext(const char * name, int argc, char ** argv, const struct poptOption * options, int flags) { poptContext con = malloc(sizeof(*con)); @@ -51,26 +68,21 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv, con->os = con->optionStack; con->os->argc = argc; - con->os->argv = argv; - con->os->argb = NULL; + con->os->argv = (const char **)argv; /* XXX don't change the API */ if (!(flags & POPT_CONTEXT_KEEP_FIRST)) con->os->next = 1; /* skip argv[0] */ - con->leftovers = calloc( (argc + 1), sizeof(char *) ); + con->leftovers = malloc(sizeof(char *) * (argc + 1)); con->options = options; - con->aliases = NULL; - con->numAliases = 0; - con->flags = flags; - con->execs = NULL; - con->numExecs = 0; + con->finalArgv = malloc(sizeof(*con->finalArgv) * (argc * 2)); con->finalArgvAlloced = argc * 2; - con->finalArgv = calloc( con->finalArgvAlloced, sizeof(*con->finalArgv) ); + con->flags = flags; con->execAbsolute = 1; if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER")) con->flags |= POPT_CONTEXT_POSIXMEHARDER; - + if (name) con->appName = strcpy(malloc(strlen(name) + 1), name); @@ -79,32 +91,10 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv, return con; } -static void cleanOSE(struct optionStackEntry *os) -{ - if (os->nextArg) { - xfree(os->nextArg); - os->nextArg = NULL; - } - if (os->argv) { - xfree(os->argv); - os->argv = NULL; - } - if (os->argb) { - PBM_FREE(os->argb); - os->argb = NULL; - } -} - void poptResetContext(poptContext con) { int i; - while (con->os > con->optionStack) { - cleanOSE(con->os--); - } - if (con->os->argb) { - PBM_FREE(con->os->argb); - con->os->argb = NULL; - } + con->os = con->optionStack; con->os->currAlias = NULL; con->os->nextCharArg = NULL; con->os->nextArg = NULL; @@ -115,12 +105,8 @@ void poptResetContext(poptContext con) { con->restLeftover = 0; con->doExec = NULL; - for (i = 0; i < con->finalArgvCount; i++) { - if (con->finalArgv[i]) { - xfree(con->finalArgv[i]); - con->finalArgv[i] = NULL; - } - } + for (i = 0; i < con->finalArgvCount; i++) + xfree(con->finalArgv[i]); con->finalArgvCount = 0; } @@ -143,7 +129,7 @@ static int handleExec(poptContext con, char * longName, char shortName) { if (con->flags & POPT_CONTEXT_NO_EXEC) return 1; - if (con->doExec == NULL) { + if (!con->doExec) { con->doExec = con->execs + i; return 1; } @@ -160,7 +146,7 @@ static int handleExec(poptContext con, char * longName, char shortName) { { char *s = malloc((longName ? strlen(longName) : 0) + 3); if (longName) sprintf(s, "--%s", longName); - else + else sprintf(s, "-%c", shortName); con->finalArgv[i] = s; } @@ -170,13 +156,13 @@ static int handleExec(poptContext con, char * longName, char shortName) { /* Only one of longName, shortName may be set at a time */ static int handleAlias(poptContext con, const char * longName, char shortName, - /*@keep@*/ const char * nextCharArg) { + const char * nextCharArg) { int i; if (con->os->currAlias && con->os->currAlias->longName && longName && - !strcmp(con->os->currAlias->longName, longName)) + !strcmp(con->os->currAlias->longName, longName)) return 0; - if (con->os->currAlias && shortName && + if (con->os->currAlias && shortName && shortName == con->os->currAlias->shortName) return 0; @@ -191,7 +177,8 @@ static int handleAlias(poptContext con, const char * longName, char shortName, if (i < 0) return 0; - if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH) + if ((con->os - con->optionStack + 1) + == POPT_OPTION_DEPTH) return POPT_ERROR_OPTSTOODEEP; if (nextCharArg && *nextCharArg) @@ -200,12 +187,10 @@ static int handleAlias(poptContext con, const char * longName, char shortName, con->os++; con->os->next = 0; con->os->stuffed = 0; - con->os->nextArg = NULL; - con->os->nextCharArg = NULL; + con->os->nextArg = con->os->nextCharArg = NULL; con->os->currAlias = con->aliases + i; - poptDupArgv(con->os->currAlias->argc, con->os->currAlias->argv, - &con->os->argc, &con->os->argv); - con->os->argb = NULL; + con->os->argc = con->os->currAlias->argc; + con->os->argv = con->os->currAlias->argv; return 1; } @@ -215,7 +200,7 @@ static void execCommand(poptContext con) { int pos = 0; const char * script = con->doExec->script; - argv = malloc(sizeof(*argv) * + argv = malloc(sizeof(*argv) * (6 + con->numLeftovers + con->finalArgvCount)); if (!con->execAbsolute && strchr(script, '/')) return; @@ -264,12 +249,12 @@ static void execCommand(poptContext con) { execvp(argv[0], (char *const *)argv); } -/*@observer@*/ static const struct poptOption * -findOption(const struct poptOption * table, const char * longName, - char shortName, - /*@out@*/ poptCallbackType * callback, /*@out@*/ const void ** callbackData, - int singleDash) -{ +static const struct poptOption * findOption(const struct poptOption * table, + const char * longName, + char shortName, + poptCallbackType * callback, + const void ** callbackData, + int singleDash) { const struct poptOption * opt = table; const struct poptOption * opt2; const struct poptOption * cb = NULL; @@ -280,7 +265,7 @@ findOption(const struct poptOption * table, const char * longName, while (opt->longName || opt->shortName || opt->arg) { if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) { - opt2 = findOption(opt->arg, longName, shortName, callback, + opt2 = findOption(opt->arg, longName, shortName, callback, callbackData, singleDash); if (opt2) { if (*callback && !*callbackData) @@ -289,7 +274,7 @@ findOption(const struct poptOption * table, const char * longName, } } else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) { cb = opt; - } else if (longName && opt->longName && + } else if (longName && opt->longName && (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) && !strcmp(longName, opt->longName)) { break; @@ -311,101 +296,32 @@ findOption(const struct poptOption * table, const char * longName, return opt; } -static const char *findNextArg(poptContext con, unsigned argx, int delete) -{ - struct optionStackEntry * os = con->os; - const char * arg; - - do { - int i; - arg = NULL; - while (os->next == os->argc && os > con->optionStack) os--; - if (os->next == os->argc && os == con->optionStack) break; - for (i = os->next; i < os->argc; i++) { - if (os->argb && PBM_ISSET(i, os->argb)) continue; - if (*os->argv[i] == '-') continue; - if (--argx > 0) continue; - arg = os->argv[i]; - if (delete) { - if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc); - PBM_SET(i, os->argb); - } - break; - } - if (os > con->optionStack) os--; - } while (arg == NULL); - return arg; -} - -static /*@only@*/ const char * expandNextArg(poptContext con, const char * s) -{ - const char *a; - size_t alen; - char *t, *te; - size_t tn = strlen(s) + 1; - char c; - - te = t = malloc(tn);; - while ((c = *s++) != '\0') { - switch (c) { - case '\\': /* escape */ - c = *s++; - break; - case '!': - if (!(s[0] == '#' && s[1] == ':' && s[2] == '+')) - break; - if ((a = findNextArg(con, 1, 1)) == NULL) - break; - s += 3; - - alen = strlen(a); - tn += alen; - *te = '\0'; - t = realloc(t, tn); - te = t + strlen(t); - strncpy(te, a, alen); te += alen; - continue; - /*@notreached@*/ break; - default: - break; - } - *te++ = c; - } - *te = '\0'; - t = realloc(t, strlen(t)); /* XXX memory leak, hard to plug */ - return t; -} - /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */ -int poptGetNextOpt(poptContext con) -{ +int poptGetNextOpt(poptContext con) { + char * optString, * chptr, * localOptString; + const char * longArg = NULL; + const char * origOptString; + long aLong; + char * end; const struct poptOption * opt = NULL; int done = 0; + int i; + poptCallbackType cb; + const void * cbData; + int singleDash; while (!done) { - const char * origOptString = NULL; - poptCallbackType cb = NULL; - const void * cbData = NULL; - const char * longArg = NULL; - - while (!con->os->nextCharArg && con->os->next == con->os->argc - && con->os > con->optionStack) { - cleanOSE(con->os--); - } + while (!con->os->nextCharArg && con->os->next == con->os->argc + && con->os > con->optionStack) + con->os--; if (!con->os->nextCharArg && con->os->next == con->os->argc) { invokeCallbacks(con, con->options, 1); if (con->doExec) execCommand(con); return -1; } - /* Process next long option */ if (!con->os->nextCharArg) { - char * localOptString, * optString; - - if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) { - con->os->next++; - continue; - } + origOptString = con->os->argv[con->os->next++]; if (con->restLeftover || *origOptString != '-') { @@ -416,8 +332,8 @@ int poptGetNextOpt(poptContext con) } /* Make a copy we can hack at */ - localOptString = optString = - strcpy(alloca(strlen(origOptString) + 1), + localOptString = optString = + strcpy(alloca(strlen(origOptString) + 1), origOptString); if (!optString[0]) @@ -427,41 +343,33 @@ int poptGetNextOpt(poptContext con) con->restLeftover = 1; continue; } else { - char *oe; - int singleDash; - optString++; if (*optString == '-') singleDash = 0, optString++; else singleDash = 1; - /* XXX aliases with arg substitution need "--alias=arg" */ if (handleAlias(con, optString, '\0', NULL)) continue; if (handleExec(con, optString, '\0')) continue; - /* Check for "--long=arg" option. */ - for (oe = optString; *oe && *oe != '='; oe++) - ; - if (*oe == '=') { - *oe++ = '\0'; - /* XXX longArg is mapped back to persistent storage. */ - longArg = origOptString + (oe - localOptString); + chptr = optString; + while (*chptr && *chptr != '=') chptr++; + if (*chptr == '=') { + longArg = origOptString + (chptr - localOptString) + 1; + *chptr = '\0'; } opt = findOption(con->options, optString, '\0', &cb, &cbData, singleDash); - if (!opt && !singleDash) - return POPT_ERROR_BADOPT; + if (!opt && !singleDash) return POPT_ERROR_BADOPT; } if (!opt) con->os->nextCharArg = origOptString + 1; } - /* Process next short option */ if (con->os->nextCharArg) { origOptString = con->os->nextCharArg; @@ -475,10 +383,9 @@ int poptGetNextOpt(poptContext con) if (handleExec(con, NULL, *origOptString)) continue; - opt = findOption(con->options, NULL, *origOptString, &cb, + opt = findOption(con->options, NULL, *origOptString, &cb, &cbData, 0); - if (!opt) - return POPT_ERROR_BADOPT; + if (!opt) return POPT_ERROR_BADOPT; origOptString++; if (*origOptString) @@ -488,43 +395,33 @@ int poptGetNextOpt(poptContext con) if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) { *((int *)opt->arg) = 1; } else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) { - if (opt->arg) - *((int *) opt->arg) = opt->val; + if (opt->arg) *((int *) opt->arg) = opt->val; } else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) { - if (con->os->nextArg) { - xfree(con->os->nextArg); - con->os->nextArg = NULL; - } if (longArg) { - con->os->nextArg = expandNextArg(con, longArg); + con->os->nextArg = longArg; } else if (con->os->nextCharArg) { - con->os->nextArg = expandNextArg(con, con->os->nextCharArg); + con->os->nextArg = con->os->nextCharArg; con->os->nextCharArg = NULL; - } else { - while (con->os->next == con->os->argc && - con->os > con->optionStack) { - cleanOSE(con->os--); - } + } else { + while (con->os->next == con->os->argc && + con->os > con->optionStack) + con->os--; if (con->os->next == con->os->argc) return POPT_ERROR_NOARG; - con->os->nextArg = expandNextArg(con, con->os->argv[con->os->next++]); + con->os->nextArg = con->os->argv[con->os->next++]; } if (opt->arg) { - long aLong; - char *end; - switch (opt->argInfo & POPT_ARG_MASK) { case POPT_ARG_STRING: - /* XXX memory leak, hard to plug */ - *((const char **) opt->arg) = xstrdup(con->os->nextArg); + *((const char **) opt->arg) = con->os->nextArg; break; case POPT_ARG_INT: case POPT_ARG_LONG: aLong = strtol(con->os->nextArg, &end, 0); - if (!(end && *end == '\0')) + if (!(end && *end == '\0')) return POPT_ERROR_BADNUMBER; if (aLong == LONG_MIN || aLong == LONG_MAX) @@ -534,14 +431,14 @@ int poptGetNextOpt(poptContext con) } else { if (aLong > INT_MAX || aLong < INT_MIN) return POPT_ERROR_OVERFLOW; - *((int *) opt->arg) = aLong; + *((int *) opt->arg) =aLong; } break; default: fprintf(stdout, POPT_("option type (%d) not implemented in popt\n"), opt->argInfo & POPT_ARG_MASK); - exit(EXIT_FAILURE); + exit(1); } } } @@ -557,32 +454,32 @@ int poptGetNextOpt(poptContext con) sizeof(*con->finalArgv) * con->finalArgvAlloced); } + i = con->finalArgvCount++; { char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3); if (opt->longName) sprintf(s, "--%s", opt->longName); - else + else sprintf(s, "-%c", opt->shortName); - con->finalArgv[con->finalArgvCount++] = s; + con->finalArgv[i] = s; } if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE - && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) { - con->finalArgv[con->finalArgvCount++] = xstrdup(con->os->nextArg); - } + && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) + con->finalArgv[con->finalArgvCount++] = strdup(con->os->nextArg); } return opt->val; } -const char * poptGetOptArg(poptContext con) { - const char * ret = con->os->nextArg; +char * poptGetOptArg(poptContext con) { + char * ret = (char *)con->os->nextArg; /* XXX don't change the API */ con->os->nextArg = NULL; return ret; } -const char * poptGetArg(poptContext con) { +char * poptGetArg(poptContext con) { if (con->numLeftovers == con->nextLeftover) return NULL; - return con->leftovers[con->nextLeftover++]; + return (char *)con->leftovers[con->nextLeftover++]; /* XXX don't change the API */ } const char * poptPeekArg(poptContext con) { @@ -602,9 +499,6 @@ const char ** poptGetArgs(poptContext con) { void poptFreeContext(poptContext con) { int i; - poptResetContext(con); - if (con->os->argb) free(con->os->argb); - for (i = 0; i < con->numAliases; i++) { if (con->aliases[i].longName) xfree(con->aliases[i].longName); free(con->aliases[i].argv); @@ -614,7 +508,9 @@ void poptFreeContext(poptContext con) { if (con->execs[i].longName) xfree(con->execs[i].longName); xfree(con->execs[i].script); } - if (con->execs) xfree(con->execs); + + for (i = 0; i < con->finalArgvCount; i++) + xfree(con->finalArgv[i]); free(con->leftovers); free(con->finalArgv); @@ -625,9 +521,7 @@ void poptFreeContext(poptContext con) { free(con); } -int poptAddAlias(poptContext con, struct poptAlias newAlias, - /*@unused@*/ int flags) -{ +int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) { int aliasNum = con->numAliases++; struct poptAlias * alias; @@ -635,16 +529,16 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias, if (!con->aliases) con->aliases = malloc(sizeof(newAlias) * con->numAliases); else - con->aliases = realloc(con->aliases, + con->aliases = realloc(con->aliases, sizeof(newAlias) * con->numAliases); alias = con->aliases + aliasNum; - - alias->longName = (newAlias.longName) - ? strcpy(malloc(strlen(newAlias.longName) + 1), newAlias.longName) - : NULL; - alias->shortName = newAlias.shortName; - alias->argc = newAlias.argc; - alias->argv = newAlias.argv; + + *alias = newAlias; + if (alias->longName) + alias->longName = strcpy(malloc(strlen(alias->longName) + 1), + alias->longName); + else + alias->longName = NULL; return 0; } @@ -666,7 +560,7 @@ const char * poptBadOption(poptContext con, int flags) { #define POPT_ERROR_BADQUOTE -15 /* only from poptParseArgString() */ #define POPT_ERROR_ERRNO -16 /* only from poptParseArgString() */ -const char *const poptStrerror(const int error) { +const char * poptStrerror(const int error) { switch (error) { case POPT_ERROR_NOARG: return POPT_("missing argument"); @@ -688,21 +582,19 @@ const char *const poptStrerror(const int error) { } int poptStuffArgs(poptContext con, const char ** argv) { - int argc; + int i; if ((con->os - con->optionStack) == POPT_OPTION_DEPTH) return POPT_ERROR_OPTSTOODEEP; - for (argc = 0; argv[argc]; argc++) - ; + for (i = 0; argv[i]; i++); con->os++; con->os->next = 0; - con->os->nextArg = NULL; - con->os->nextCharArg = NULL; + con->os->nextArg = con->os->nextCharArg = NULL; con->os->currAlias = NULL; - poptDupArgv(argc, argv, &con->os->argc, &con->os->argv); - con->os->argb = NULL; + con->os->argc = i; + con->os->argv = argv; con->os->stuffed = 1; return 0; diff --git a/support/poptconfig.c b/support/poptconfig.c index 7a1a4c2..2b44264 100644 --- a/support/poptconfig.c +++ b/support/poptconfig.c @@ -2,7 +2,22 @@ file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ -#include "system.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include + +#if HAVE_ALLOCA_H +# include +#endif + +#include "popt-gnome.h" #include "poptint.h" static void configLine(poptContext con, char * line) { @@ -36,19 +51,19 @@ static void configLine(poptContext con, char * line) { shortName = opt[1]; if (!strcmp(entryType, "alias")) { - if (poptParseArgvString(line, &alias.argc, &alias.argv)) return; + if (poptParseArgvString(line, &alias.argc, (char ***)&alias.argv)) return; alias.longName = longName, alias.shortName = shortName; poptAddAlias(con, alias, 0); } else if (!strcmp(entryType, "exec")) { - con->execs = realloc(con->execs, + con->execs = realloc(con->execs, sizeof(*con->execs) * (con->numExecs + 1)); if (longName) - con->execs[con->numExecs].longName = xstrdup(longName); + con->execs[con->numExecs].longName = strdup(longName); else con->execs[con->numExecs].longName = NULL; con->execs[con->numExecs].shortName = shortName; - con->execs[con->numExecs].script = xstrdup(line); + con->execs[con->numExecs].script = strdup(line); con->numExecs++; } @@ -69,7 +84,7 @@ int poptReadConfigFile(poptContext con, const char * fn) { } fileLength = lseek(fd, 0, SEEK_END); - (void) lseek(fd, 0, 0); + lseek(fd, 0, 0); file = alloca(fileLength + 1); if (read(fd, file, fileLength) != fileLength) { @@ -107,14 +122,13 @@ int poptReadConfigFile(poptContext con, const char * fn) { break; default: *dst++ = *chptr++; - break; } } return 0; } -int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) { +int poptReadDefaultConfig(poptContext con, int useEnv) { char * fn, * home; int rc; diff --git a/support/popthelp.c b/support/popthelp.c index c36ecea..fc2764a 100644 --- a/support/popthelp.c +++ b/support/popthelp.c @@ -4,13 +4,25 @@ file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ -#include "system.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include + +#ifdef HAVE_ALLOCA_H +#include +#endif + +#include "popt-gnome.h" #include "poptint.h" -static void displayArgs(poptContext con, - /*@unused@*/ enum poptCallbackReason foo, - struct poptOption * key, - /*@unused@*/ const char * arg, /*@unused@*/ void * data) { +static void displayArgs(poptContext con, enum poptCallbackReason foo, + struct poptOption * key, + const char * arg, void * data) { if (key->shortName== '?') poptPrintHelp(con, stdout, 0); else @@ -19,14 +31,14 @@ static void displayArgs(poptContext con, } struct poptOption poptHelpOptions[] = { - { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL }, - { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL }, - { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL }, - { NULL, '\0', 0, NULL, 0, NULL, NULL } + { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL }, + { "help", '?', 0, NULL, '?', N_("Show this help message") }, + { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message") }, + { NULL, '\0', 0, NULL, 0 } } ; -/*@observer@*/ /*@null@*/ static const char *const +static const char * getTableTranslationDomain(const struct poptOption *table) { const struct poptOption *opt; @@ -41,9 +53,8 @@ getTableTranslationDomain(const struct poptOption *table) return NULL; } -/*@observer@*/ /*@null@*/ static const char *const -getArgDescrip(const struct poptOption * opt, const char *translation_domain) -{ +static const char * getArgDescrip(const struct poptOption * opt, + const char *translation_domain) { if (!(opt->argInfo & POPT_ARG_MASK)) return NULL; if (opt == (poptHelpOptions + 1) || opt == (poptHelpOptions + 2)) @@ -182,7 +193,7 @@ static int showHelpIntro(poptContext con, FILE * f) { return len; } -void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) { +void poptPrintHelp(poptContext con, FILE * f, int flags) { int leftColWidth; showHelpIntro(con, f); @@ -199,7 +210,7 @@ static int singleOptionUsage(FILE * f, int cursor, const struct poptOption * opt, const char *translation_domain) { int len = 3; - char shortStr[2] = { '\0', '\0' }; + char shortStr[2]; const char * item = shortStr; const char * argDescrip = getArgDescrip(opt, translation_domain); @@ -257,10 +268,9 @@ static int showShortOptions(const struct poptOption * opt, FILE * f, char s[300]; /* this is larger then the ascii set, so it should do just fine */ - s[0] = '\0'; - if (str == NULL) { - memset(s, 0, sizeof(s)); + if (!str) { str = s; + memset(str, 0, sizeof(s)); } while (opt->longName || opt->shortName || opt->arg) { @@ -279,7 +289,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * f, return strlen(s) + 4; } -void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) { +void poptPrintUsage(poptContext con, FILE * f, int flags) { int cursor; cursor = showHelpIntro(con, f); @@ -297,5 +307,5 @@ void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) { void poptSetOtherOptionHelp(poptContext con, const char * text) { if (con->otherHelp) xfree(con->otherHelp); - con->otherHelp = xstrdup(text); + con->otherHelp = strdup(text); } diff --git a/support/poptint.h b/support/poptint.h index 1688095..62cc60a 100644 --- a/support/poptint.h +++ b/support/poptint.h @@ -5,30 +5,13 @@ #ifndef H_POPTINT #define H_POPTINT -/* Bit mask macros. */ -typedef unsigned int __pbm_bits; -#define __PBM_NBITS (8 * sizeof (__pbm_bits)) -#define __PBM_IX(d) ((d) / __PBM_NBITS) -#define __PBM_MASK(d) ((__pbm_bits) 1 << ((d) % __PBM_NBITS)) -typedef struct { - __pbm_bits bits[1]; -} pbm_set; -#define __PBM_BITS(set) ((set)->bits) - -#define PBM_ALLOC(d) calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits)) -#define PBM_FREE(s) free(s); -#define PBM_SET(d, s) (__PBM_BITS (s)[__PBM_IX (d)] |= __PBM_MASK (d)) -#define PBM_CLR(d, s) (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d)) -#define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0) - struct optionStackEntry { int argc; - /*@only@*/ const char ** argv; - /*@only@*/ pbm_set * argb; + const char ** argv; int next; - /*@only@*/ const char * nextArg; - /*@keep@*/ const char * nextCharArg; - /*@dependent@*/ struct poptAlias * currAlias; + const char * nextArg; + const char * nextCharArg; + struct poptAlias * currAlias; int stuffed; }; @@ -39,26 +22,25 @@ struct execEntry { }; struct poptContext_s { - struct optionStackEntry optionStack[POPT_OPTION_DEPTH]; - /*@dependent@*/ struct optionStackEntry * os; - /*@owned@*/ const char ** leftovers; + struct optionStackEntry optionStack[POPT_OPTION_DEPTH], * os; + const char ** leftovers; int numLeftovers; int nextLeftover; - /*@keep@*/ const struct poptOption * options; + const struct poptOption * options; int restLeftover; - /*@only@*/ const char * appName; - /*@only@*/ struct poptAlias * aliases; + const char * appName; + struct poptAlias * aliases; int numAliases; int flags; struct execEntry * execs; int numExecs; - /*@only@*/ const char ** finalArgv; + const char ** finalArgv; int finalArgvCount; int finalArgvAlloced; - /*@dependent@*/ struct execEntry * doExec; - /*@only@*/ const char * execPath; + struct execEntry * doExec; + const char * execPath; int execAbsolute; - /*@only@*/ const char * otherHelp; + const char * otherHelp; }; #define xfree(_a) free((void *)_a) @@ -67,13 +49,13 @@ struct poptContext_s { #include #endif -#if defined(HAVE_GETTEXT) && !defined(__LCLINT__) +#ifdef HAVE_GETTEXT #define _(foo) gettext(foo) #else #define _(foo) (foo) #endif -#if defined(HAVE_DGETTEXT) && !defined(__LCLINT__) +#ifdef HAVE_DGETTEXT #define D_(dom, str) dgettext(dom, str) #define POPT_(foo) D_("popt", foo) #else diff --git a/support/poptparse.c b/support/poptparse.c index 65c948b..fa70815 100644 --- a/support/poptparse.c +++ b/support/poptparse.c @@ -2,53 +2,53 @@ file accompanying popt source distributions, available from ftp://ftp.redhat.com/pub/code/popt */ -#include "system.h" -#include "poptint.h" - -#define POPT_ARGV_ARRAY_GROW_DELTA 5 - -int poptDupArgv(int argc, const char **argv, - int * argcPtr, const char *** argvPtr) -{ - size_t nb = (argc + 1) * sizeof(*argv); - const char ** argv2; - char * dst; - int i; +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif - for (i = 0; i < argc; i++) { - if (argv[i] == NULL) - return POPT_ERROR_NOARG; - nb += strlen(argv[i]) + 1; - } - - dst = malloc(nb); - argv2 = (void *) dst; - dst += (argc + 1) * sizeof(*argv); +#include +#include +#include + +/* AIX requires this to be the first thing in the file. */ +#ifndef __GNUC__ +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX +#pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +#elif defined(__GNUC__) && defined(__STRICT_ANSI__) +#define alloca __builtin_alloca +#endif - for (i = 0; i < argc; i++) { - argv2[i] = dst; - dst += strlen(strcpy(dst, argv[i])) + 1; - } - argv2[argc] = NULL; +#include "popt-gnome.h" - *argvPtr = argv2; - *argcPtr = argc; - return 0; -} +#define POPT_ARGV_ARRAY_GROW_DELTA 5 -int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr) -{ +int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) { + char * buf, * bufStart, * dst; const char * src; char quote = '\0'; int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA; - const char ** argv = malloc(sizeof(*argv) * argvAlloced); + char ** argv = malloc(sizeof(*argv) * argvAlloced); + const char ** argv2; int argc = 0; - int buflen = strlen(s) + 1; - char * buf = memset(alloca(buflen), 0, buflen); + int i, buflen; + + buflen = strlen(s) + 1; + bufStart = buf = alloca(buflen); + memset(buf, '\0', buflen); + src = s; argv[argc] = buf; - for (src = s; *src; src++) { + while (*src) { if (quote == *src) { quote = '\0'; } else if (quote) { @@ -81,38 +81,33 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr) free(argv); return POPT_ERROR_BADQUOTE; } - /*@fallthrough@*/ + /* fallthrough */ default: *buf++ = *src; - break; } + + src++; } if (strlen(argv[argc])) { argc++, buf++; } -#if 0 - { char * dst = malloc((argc + 1) * sizeof(*argv) + (buf - argv[0])); - const char ** argv2 = (void *) dst; - int i; - - dst += (argc + 1) * sizeof(*argv); - memcpy(argv2, argv, argc * sizeof(*argv)); - argv2[argc] = NULL; - memcpy(dst, argv[0], buf - argv[0]); - - for (i = 0; i < argc; i++) - argv2[i] = dst + (argv[i] - argv[0]); + dst = malloc((argc + 1) * sizeof(*argv) + (buf - bufStart)); + argv2 = (void *) dst; + dst += (argc + 1) * sizeof(*argv); + memcpy(argv2, argv, argc * sizeof(*argv)); + argv2[argc] = NULL; + memcpy(dst, bufStart, buf - bufStart); - *argvPtr = argv2; - *argcPtr = argc; + for (i = 0; i < argc; i++) { + argv2[i] = dst + (argv[i] - bufStart); } -#else - (void) poptDupArgv(argc, argv, argcPtr, argvPtr); -#endif free(argv); + *argvPtr = (char **)argv2; /* XXX don't change the API */ + *argcPtr = argc; + return 0; } -- cgit v1.2.1