diff options
| -rw-r--r-- | newlib/ChangeLog | 8 | ||||
| -rw-r--r-- | newlib/libc/include/sys/signal.h | 2 | ||||
| -rw-r--r-- | newlib/libc/posix/execvp.c | 21 | ||||
| -rw-r--r-- | newlib/libc/posix/popen.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdlib/system.c | 2 |
5 files changed, 11 insertions, 24 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 8a9e2d6..9341b53 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,11 @@ +2001-10-22 Christopher Faylor <cgf@redhat.com> + + * 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. + 2001-10-17 Corinna Vinschen <corinna@vinschen.de> * libc/include/sys/unistd.h: Add prototype for fchdir() when diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h index e590ae3..e3368bf 100644 --- a/newlib/libc/include/sys/signal.h +++ b/newlib/libc/include/sys/signal.h @@ -178,7 +178,7 @@ int _EXFUN(sigqueue, (pid_t pid, int signo, const union sigval value)); #endif /* defined(_POSIX_REALTIME_SIGNALS) */ -#endif /* defined(__CYGWIN32__) || defined(__rtems__) */ +#endif /* defined(__CYGWIN__) || defined(__rtems__) */ /* #endif __STRICT_ANSI__ */ diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c index 1f58b8d..7074316 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 4fd3dd9..d6d174d 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); diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c index cc12411..73c0540 100644 --- a/newlib/libc/stdlib/system.c +++ b/newlib/libc/stdlib/system.c @@ -81,7 +81,7 @@ _system_r (ptr, s) For now we always return 0 and leave it to each target to explicitly handle otherwise (this can always be relaxed in the future). */ -#if defined (unix) || defined (__CYGWIN32__) +#if defined (unix) || defined (__CYGWIN__) if (s == NULL) return 1; return do_system (ptr, s); |