diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-19 19:31:25 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:08 -0500 |
commit | 105660d3f9b537fa47fe6e33c0418a1d8f85e0e9 (patch) | |
tree | d2dc24b88f363ab04f63a48de22486de22629aa2 /source4/lib/popt/findme.c | |
parent | 63b5ad6d5403f97423af0e8c542714ed691e667f (diff) | |
download | samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.gz samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.bz2 samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.zip |
r5906: Fix the usage of the internal popt (make proto should ignore it)
Updated included popt to 1.7.
(This used to be commit d60cb643e8a46771f3d836307ea45b869f34dc9b)
Diffstat (limited to 'source4/lib/popt/findme.c')
-rw-r--r-- | source4/lib/popt/findme.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/source4/lib/popt/findme.c b/source4/lib/popt/findme.c index 67a535ac65..a950e50018 100644 --- a/source4/lib/popt/findme.c +++ b/source4/lib/popt/findme.c @@ -1,47 +1,50 @@ -/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING +/** \ingroup popt + * \file popt/findme.c + */ + +/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING file accompanying popt source distributions, available from - ftp://ftp.redhat.com/pub/code/popt */ + ftp://ftp.rpm.org/pub/rpm/dist. */ #include "system.h" #include "findme.h" - const char * findProgramPath(const char * argv0) -{ +const char * findProgramPath(const char * argv0) { char * path = getenv("PATH"); char * pathbuf; char * start, * chptr; - char * buf, *local = NULL; + char * buf; - /* If there is a / in the argv[0], it has to be an absolute - path */ + if (argv0 == NULL) return NULL; /* XXX can't happen */ + /* If there is a / in the argv[0], it has to be an absolute path */ if (strchr(argv0, '/')) return xstrdup(argv0); - if (!path) return NULL; + if (path == NULL) return NULL; - local = start = pathbuf = malloc(strlen(path) + 1); - buf = malloc(strlen(path) + strlen(argv0) + 2); + start = pathbuf = alloca(strlen(path) + 1); + buf = malloc(strlen(path) + strlen(argv0) + sizeof("/")); + if (buf == NULL) return NULL; /* XXX can't happen */ strcpy(pathbuf, path); chptr = NULL; + /*@-branchstate@*/ do { if ((chptr = strchr(start, ':'))) *chptr = '\0'; sprintf(buf, "%s/%s", start, argv0); - if (!access(buf, X_OK)) { - if (local) free(local); - return buf; - } + if (!access(buf, X_OK)) + return buf; if (chptr) start = chptr + 1; else start = NULL; } while (start && *start); + /*@=branchstate@*/ free(buf); - if (local) free(local); return NULL; } |