.libs
gnomesupport-h
gnomesupport.h
-gnome-support-2.0.pc
-2000-11-21 Martin Baulig <baulig@suse.de>
+2002-01-14 Abel Cheung <maddog@linux.org.hk>
- * Makefile.am: Install libgnomesupport.la, but call it
- libgnomesupport-1.3.la.
-
- * gnome-support-2.0.pc.in: Added pkg-config file.
+ * Makefile.am: Don't install popt* headers.
1999-05-27 Raja R Harinath <harinath@cs.umn.edu>
## Process this file with automake to produce Makefile.in.
-supportexecincludedir = $(includedir)/gnome/$(GNOME_INTERFACE_VERSION)
+supportexecincludedir = $(pkglibdir)/include
INCLUDES = -D_GNU_SOURCE
-lib_LTLIBRARIES = libgnomesupport-1.3.la
+lib_LTLIBRARIES = libgnomesupport-2.0.la
# it is in _DATA since we don't want `gnomesupport.h' to be part of
# the distributed `.tar.gz' file
# These are internal headers: they are used only when compiling and
# should not be installed
-#noinst_HEADERS = gnomesupport-fake.h \
-# findme.h poptint.h system.h
+noinst_HEADERS = gnomesupport-fake.h \
+ findme.h \
+ popt-gnome.h \
+ poptint.h
# Hmm... should we move `error.h' here.
#include_HEADERS = popt-gnome.h
-#popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
-popt_sources=
+popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
-libgnomesupport_1_3_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
-libgnomesupport_1_3_la_LIBADD = @LTLIBOBJS@
-libgnomesupport_1_3_la_LDFLAGS = -version-info 0:0:0
+libgnomesupport_2_0_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
+libgnomesupport_2_0_la_LIBADD = @LTLIBOBJS@
+libgnomesupport_2_0_la_LDFLAGS = -version-info 0:0:0
BUILT_SOURCES = gnomesupport.h
memmove.c mkstemp.c popt-gnome.h popt.c poptconfig.c \
popthelp.c poptint.h poptparse.c scandir.c strcasecmp.c \
strerror.c strndup.c strnlen.c strtod.c strtok_r.c strtol.c \
- strtoul.c vasprintf.c vsnprintf.c gnome-support-2.0.pc.in
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnome-support-2.0.pc
+ strtoul.c vasprintf.c vsnprintf.c
file accompanying popt source distributions, available from
ftp://ftp.redhat.com/pub/code/popt */
-#include "system.h"
+/* AIX requires this to be the first thing in the file. */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifdef _AIX
+# pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+# endif
+# endif
+# endif
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#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 <libc.h>
+#endif
+
+#ifndef _AIX
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# endif
+#endif
+
#include "findme.h"
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;
#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[];
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
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
}
/* (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"
+/* AIX requires this to be the first thing in the file. */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifdef _AIX
+# pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+# endif
+# endif
+# endif
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <errno.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifndef _AIX
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# endif
+#endif
+
#include "findme.h"
+#include "popt-gnome.h"
#include "poptint.h"
#ifndef HAVE_STRERROR
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;
}
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);
}
}
-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));
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);
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;
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;
}
if (con->flags & POPT_CONTEXT_NO_EXEC)
return 1;
- if (con->doExec == NULL) {
+ if (!con->doExec) {
con->doExec = con->execs + i;
return 1;
}
{ char *s = malloc((longName ? strlen(longName) : 0) + 3);
if (longName)
sprintf(s, "--%s", longName);
- else
+ else
sprintf(s, "-%c", shortName);
con->finalArgv[i] = s;
}
/* 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;
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)
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;
}
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;
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;
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)
}
} 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;
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 != '-') {
}
/* 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])
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;
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)
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)
} 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);
}
}
}
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) {
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);
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);
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;
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;
}
#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");
}
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;
file accompanying popt source distributions, available from
ftp://ftp.redhat.com/pub/code/popt */
-#include "system.h"
+/* AIX requires this to be the first thing in the file. */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifdef _AIX
+# pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+# endif
+# endif
+# endif
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifndef _AIX
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# endif
+#endif
+
+#include "popt-gnome.h"
#include "poptint.h"
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++;
}
}
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) {
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;
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 <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#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
}
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;
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))
return len;
}
-void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
+void poptPrintHelp(poptContext con, FILE * f, int flags) {
int leftColWidth;
showHelpIntro(con, f);
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);
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) {
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);
void poptSetOtherOptionHelp(poptContext con, const char * text) {
if (con->otherHelp) xfree(con->otherHelp);
- con->otherHelp = xstrdup(text);
+ con->otherHelp = strdup(text);
}
#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;
};
};
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)
#include <libintl.h>
#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
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 <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* AIX requires this to be the first thing in the file. */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+# include <alloca.h>
+# 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) {
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;
}
projects / platform / upstream / gnome-common.git / commitdiff