int argInfo;
void * arg; /* depends on argInfo */
int val; /* 0 means don't return, just update flag */
- char * descrip; /* description for autohelp -- may be NULL */
- char * argDescrip; /* argument description for autohelp */
+ const char * descrip; /* description for autohelp -- may be NULL */
+ const char * argDescrip; /* argument description for autohelp */
};
struct poptAlias {
- char * longName; /* may be NULL */
+ const char * longName; /* may be NULL */
char shortName; /* may be '\0' */
int argc;
- char ** argv; /* must be free()able */
+ const char ** argv; /* must be free()able */
};
extern struct poptOption poptHelpOptions[];
typedef void (*poptCallbackType)(poptContext con,
enum poptCallbackReason reason,
const struct poptOption * opt,
- const char * arg, void * data);
+ const char * arg, const void * data);
-poptContext poptGetContext(char * name, int argc, char ** argv,
+poptContext poptGetContext(const char * name, int argc, char ** argv,
const struct poptOption * options, int flags);
void poptResetContext(poptContext con);
char * poptGetOptArg(poptContext con);
/* returns NULL if no more options are available */
char * poptGetArg(poptContext con);
-char * poptPeekArg(poptContext con);
-char ** poptGetArgs(poptContext con);
+const char * poptPeekArg(poptContext con);
+const char ** poptGetArgs(poptContext con);
/* returns the option which caused the most recent error */
-char * poptBadOption(poptContext con, int flags);
+const char * poptBadOption(poptContext con, int flags);
void poptFreeContext(poptContext con);
-int poptStuffArgs(poptContext con, char ** argv);
+int poptStuffArgs(poptContext con, const char ** argv);
int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
-int poptReadConfigFile(poptContext con, char * fn);
+int poptReadConfigFile(poptContext con, const char * fn);
/* like above, but reads /etc/popt and $HOME/.popt along with environment
vars */
int poptReadDefaultConfig(poptContext con, int useEnv);
#endif
void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
- if (con->execPath) free(con->execPath);
+ if (con->execPath) xfree(con->execPath);
con->execPath = strdup(path);
con->execAbsolute = allowAbsolute;
}
}
}
-poptContext poptGetContext(char * name, int argc, 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->argv = (const char **)argv; /* XXX don't change the API */
if (!(flags & POPT_CONTEXT_KEEP_FIRST))
con->os->next = 1; /* skip argv[0] */
con->doExec = NULL;
for (i = 0; i < con->finalArgvCount; i++)
- free(con->finalArgv[i]);
+ xfree(con->finalArgv[i]);
con->finalArgvCount = 0;
}
}
i = con->finalArgvCount++;
- con->finalArgv[i] = malloc((longName ? strlen(longName) : 0) + 3);
- if (longName)
- sprintf(con->finalArgv[i], "--%s", longName);
- else
- sprintf(con->finalArgv[i], "-%c", shortName);
+ { char *s = malloc((longName ? strlen(longName) : 0) + 3);
+ if (longName)
+ sprintf(s, "--%s", longName);
+ else
+ sprintf(s, "-%c", shortName);
+ con->finalArgv[i] = s;
+ }
return 1;
}
/* Only one of longName, shortName may be set at a time */
-static int handleAlias(poptContext con, char * longName, char shortName,
- char * nextCharArg) {
+static int handleAlias(poptContext con, const char * longName, char shortName,
+ const char * nextCharArg) {
int i;
if (con->os->currAlias && con->os->currAlias->longName && longName &&
}
static void execCommand(poptContext con) {
- char ** argv;
+ const char ** argv;
int pos = 0;
- char * script = con->doExec->script;
+ const char * script = con->doExec->script;
argv = malloc(sizeof(*argv) *
(6 + con->numLeftovers + con->finalArgvCount));
if (!con->execAbsolute && strchr(script, '/')) return;
if (!strchr(script, '/') && con->execPath) {
- argv[pos] = alloca(strlen(con->execPath) + strlen(script) + 2);
- sprintf(argv[pos], "%s/%s", con->execPath, script);
+ char *s = alloca(strlen(con->execPath) + strlen(script) + 2);
+ sprintf(s, "%s/%s", con->execPath, script);
+ argv[pos] = s;
} else {
argv[pos] = script;
}
#endif
#endif
- execvp(argv[0], argv);
+ execvp(argv[0], (char *const *)argv);
}
static const struct poptOption * findOption(const struct poptOption * table,
const char * longName,
char shortName,
poptCallbackType * callback,
- void ** callbackData,
+ const void ** callbackData,
int singleDash) {
const struct poptOption * opt = table;
const struct poptOption * opt2;
/* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
int poptGetNextOpt(poptContext con) {
char * optString, * chptr, * localOptString;
- char * longArg = NULL;
- char * origOptString;
+ const char * longArg = NULL;
+ const char * origOptString;
long aLong;
char * end;
const struct poptOption * opt = NULL;
int done = 0;
int i;
poptCallbackType cb;
- void * cbData;
+ const void * cbData;
int singleDash;
while (!done) {
if (opt->arg) {
switch (opt->argInfo & POPT_ARG_MASK) {
case POPT_ARG_STRING:
- *((char **) opt->arg) = con->os->nextArg;
+ *((const char **) opt->arg) = con->os->nextArg;
break;
case POPT_ARG_INT:
}
i = con->finalArgvCount++;
- con->finalArgv[i] =
- malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
- if (opt->longName)
- sprintf(con->finalArgv[i], "--%s", opt->longName);
- else
- sprintf(con->finalArgv[i], "-%c", opt->shortName);
+ { char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
+ if (opt->longName)
+ sprintf(s, "--%s", opt->longName);
+ else
+ sprintf(s, "-%c", opt->shortName);
+ con->finalArgv[i] = s;
+ }
if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
&& (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL)
}
char * poptGetOptArg(poptContext con) {
- char * ret = con->os->nextArg;
+ char * ret = (char *)con->os->nextArg; /* XXX don't change the API */
con->os->nextArg = NULL;
return ret;
}
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 */
}
-char * poptPeekArg(poptContext con) {
+const char * poptPeekArg(poptContext con) {
if (con->numLeftovers == con->nextLeftover) return NULL;
- return (con->leftovers[con->nextLeftover]);
+ return con->leftovers[con->nextLeftover];
}
-char ** poptGetArgs(poptContext con) {
+const char ** poptGetArgs(poptContext con) {
if (con->numLeftovers == con->nextLeftover) return NULL;
/* some apps like [like RPM ;-) ] need this NULL terminated */
int i;
for (i = 0; i < con->numAliases; i++) {
- if (con->aliases[i].longName) free(con->aliases[i].longName);
+ if (con->aliases[i].longName) xfree(con->aliases[i].longName);
free(con->aliases[i].argv);
}
for (i = 0; i < con->numExecs; i++) {
- if (con->execs[i].longName) free(con->execs[i].longName);
- free(con->execs[i].script);
+ if (con->execs[i].longName) xfree(con->execs[i].longName);
+ xfree(con->execs[i].script);
}
for (i = 0; i < con->finalArgvCount; i++)
- free(con->finalArgv[i]);
+ xfree(con->finalArgv[i]);
free(con->leftovers);
free(con->finalArgv);
- if (con->appName) free(con->appName);
+ if (con->appName) xfree(con->appName);
if (con->aliases) free(con->aliases);
- if (con->otherHelp) free(con->otherHelp);
- if (con->execPath) free(con->execPath);
+ if (con->otherHelp) xfree(con->otherHelp);
+ if (con->execPath) xfree(con->execPath);
free(con);
}
return 0;
}
-char * poptBadOption(poptContext con, int flags) {
+const char * poptBadOption(poptContext con, int flags) {
struct optionStackEntry * os;
if (flags & POPT_BADOPTION_NOALIAS)
}
}
-int poptStuffArgs(poptContext con, char ** argv) {
+int poptStuffArgs(poptContext con, const char ** argv) {
int i;
if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)