diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-07-25 06:37:56 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-07-25 06:37:56 +0000 |
| commit | 14c3168379a44102adc58f0a6e88fbb269fe0ec8 (patch) | |
| tree | c5a6e7c6a272066cc25763c0006a53ad6a914a4c /posix/execvp.c | |
| parent | dcb585f3e5b09ebd7ae92c0c8ed602c3f3e44b61 (diff) | |
| download | glibc-14c3168379a44102adc58f0a6e88fbb269fe0ec8.tar glibc-14c3168379a44102adc58f0a6e88fbb269fe0ec8.tar.gz glibc-14c3168379a44102adc58f0a6e88fbb269fe0ec8.tar.bz2 glibc-14c3168379a44102adc58f0a6e88fbb269fe0ec8.zip | |
Updated to fedora-glibc-20050725T0627
Diffstat (limited to 'posix/execvp.c')
| -rw-r--r-- | posix/execvp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/posix/execvp.c b/posix/execvp.c index 6f4e4b8566..8421bd048f 100644 --- a/posix/execvp.c +++ b/posix/execvp.c @@ -88,7 +88,7 @@ execvp (file, argv) else { char *path = getenv ("PATH"); - bool path_malloc = false; + char *path_malloc = NULL; if (path == NULL) { /* There is no `PATH' in the environment. @@ -100,7 +100,7 @@ execvp (file, argv) return -1; path[0] = ':'; (void) confstr (_CS_PATH, path + 1, len); - path_malloc = true; + path_malloc = path; } size_t len = strlen (file) + 1; @@ -108,8 +108,7 @@ execvp (file, argv) char *name = malloc (pathlen + len + 1); if (name == NULL) { - if (path_malloc) - free (path); + free (path_malloc); return -1; } /* Copy the file name at the top. */ @@ -190,8 +189,7 @@ execvp (file, argv) free (script_argv); free (name - pathlen); - if (path_malloc) - free (path); + free (path_malloc); } /* Return the error from the last attempt (probably ENOENT). */ |