diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-10-22 20:40:26 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-10-22 20:40:26 +0400 |
| commit | 333d60984389f9e0173c60d6016ac36099686b59 (patch) | |
| tree | 32c6ac1ae72472df13bd47122bd87b596575646f /newlib/libc/posix | |
| parent | c270dc2555b88173abfd962036e99f986101158a (diff) | |
* libc/posix/execvp.c: Remove obsolete CYGWIN32 considerations throughout.
* signal.h: Change comment to reflect __CYGWIN__ rather than __CYGWIN32__.
* popen.c (popen): Use __CYGWIN_ rather than __CYGWIN32__.
* system.c (_system_r): Ditto.
Diffstat (limited to 'newlib/libc/posix')
| -rw-r--r-- | newlib/libc/posix/execvp.c | 21 | ||||
| -rw-r--r-- | newlib/libc/posix/popen.c | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c index 1f58b8d93..70743163d 100644 --- a/newlib/libc/posix/execvp.c +++ b/newlib/libc/posix/execvp.c @@ -11,12 +11,7 @@ #include <errno.h> #include <ctype.h> -#ifdef __CYGWIN32__ -static char path_delim; -#define PATH_DELIM path_delim -#else #define PATH_DELIM ':' -#endif /* * Copy string, until c or <nul> is encountered. @@ -52,25 +47,9 @@ _DEFUN (execvp, (file, argv), /* If FILE contains a directory, don't search $PATH. */ if (strchr (file, '/') -#ifdef __CYGWIN32__ - || strchr (file, '\\') -#endif ) return execv (file, argv); -#ifdef __CYGWIN32__ - /* If a drive letter is passed, the path is still an absolute one. - Technically this isn't true, but Cygwin is currently defined so - that it is. */ - if ((isalpha (file[0]) && file[1] == ':') - || file[0] == '\\') - return execv (file, argv); -#endif - -#ifdef __CYGWIN32__ - path_delim = cygwin_posix_path_list_p (path) ? ':' : ';'; -#endif - while (*path) { strccpy (buf, path, PATH_DELIM); diff --git a/newlib/libc/posix/popen.c b/newlib/libc/posix/popen.c index 4fd3dd93d..d6d174d08 100644 --- a/newlib/libc/posix/popen.c +++ b/newlib/libc/posix/popen.c @@ -106,7 +106,7 @@ popen(program, type) (void)close(pdes[1]); } execl(_PATH_BSHELL, "sh", "-c", program, NULL); -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ /* On cygwin32, we may not have /bin/sh. In that case, try to find sh on PATH. */ execlp("sh", "sh", "-c", program, NULL); |