diff options
| author | Roland McGrath <roland@gnu.org> | 2005-10-23 01:27:01 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-10-23 01:27:01 +0000 |
| commit | 067f926e19b0f048f04727f57d7036ec4a64c050 (patch) | |
| tree | 3ef68c5c73b308198f994dca043dda10c45dc1ff /posix/execvp.c | |
| parent | bf8d53331945a83c95dd046c4811b706a5868be5 (diff) | |
Updated to fedora-glibc-2_3-20051023T0123cvs/fedora-glibc-2_3_5-0_fc3_8
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). */ |