* 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.
This commit is contained in:
Christopher Faylor 2001-10-22 16:40:26 +00:00
parent c270dc2555
commit 333d609843
5 changed files with 11 additions and 24 deletions

View File

@ -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

View File

@ -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__ */

View File

@ -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);

View File

@ -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);

View File

@ -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);