2007-12-01 21:24:59 +01:00
|
|
|
#include <winsock2.h>
|
2009-11-23 23:55:50 +01:00
|
|
|
#include <ws2tcpip.h>
|
2007-12-01 21:24:59 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* things that are not available in header files
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef int pid_t;
|
2009-12-28 18:04:21 +01:00
|
|
|
typedef int uid_t;
|
2010-11-04 02:35:09 +01:00
|
|
|
typedef int socklen_t;
|
2007-12-01 21:24:59 +01:00
|
|
|
#define hstrerror strerror
|
|
|
|
|
|
|
|
#define S_IFLNK 0120000 /* Symbolic link */
|
|
|
|
#define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK)
|
|
|
|
#define S_ISSOCK(x) 0
|
2009-12-28 18:13:52 +01:00
|
|
|
|
2007-12-01 21:24:59 +01:00
|
|
|
#define S_IRGRP 0
|
|
|
|
#define S_IWGRP 0
|
|
|
|
#define S_IXGRP 0
|
2009-12-28 18:13:52 +01:00
|
|
|
#define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
|
2007-12-01 21:24:59 +01:00
|
|
|
#define S_IROTH 0
|
2009-12-28 18:13:52 +01:00
|
|
|
#define S_IWOTH 0
|
2007-12-01 21:24:59 +01:00
|
|
|
#define S_IXOTH 0
|
2009-12-28 18:13:52 +01:00
|
|
|
#define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
|
2012-04-17 20:00:04 +02:00
|
|
|
|
|
|
|
#define S_ISUID 0004000
|
|
|
|
#define S_ISGID 0002000
|
|
|
|
#define S_ISVTX 0001000
|
2007-12-01 21:24:59 +01:00
|
|
|
|
2009-07-04 21:26:38 +02:00
|
|
|
#define WIFEXITED(x) 1
|
|
|
|
#define WIFSIGNALED(x) 0
|
2007-12-01 21:24:59 +01:00
|
|
|
#define WEXITSTATUS(x) ((x) & 0xff)
|
2009-07-04 21:26:38 +02:00
|
|
|
#define WTERMSIG(x) SIGTERM
|
2007-12-01 21:24:59 +01:00
|
|
|
|
2013-09-11 01:22:34 +02:00
|
|
|
#ifndef EWOULDBLOCK
|
2010-10-12 18:39:41 +02:00
|
|
|
#define EWOULDBLOCK EAGAIN
|
2013-09-11 01:22:34 +02:00
|
|
|
#endif
|
2010-10-12 18:39:41 +02:00
|
|
|
#define SHUT_WR SD_SEND
|
|
|
|
|
2009-01-22 06:57:34 +01:00
|
|
|
#define SIGHUP 1
|
|
|
|
#define SIGQUIT 3
|
|
|
|
#define SIGKILL 9
|
|
|
|
#define SIGPIPE 13
|
|
|
|
#define SIGALRM 14
|
|
|
|
#define SIGCHLD 17
|
2007-12-01 21:24:59 +01:00
|
|
|
|
|
|
|
#define F_GETFD 1
|
|
|
|
#define F_SETFD 2
|
|
|
|
#define FD_CLOEXEC 0x1
|
|
|
|
|
2013-09-11 01:22:34 +02:00
|
|
|
#ifndef EAFNOSUPPORT
|
2010-11-04 02:35:09 +01:00
|
|
|
#define EAFNOSUPPORT WSAEAFNOSUPPORT
|
2013-09-11 01:22:34 +02:00
|
|
|
#endif
|
|
|
|
#ifndef ECONNABORTED
|
2010-11-04 02:35:09 +01:00
|
|
|
#define ECONNABORTED WSAECONNABORTED
|
2013-09-11 01:22:34 +02:00
|
|
|
#endif
|
2010-11-04 02:35:09 +01:00
|
|
|
|
2007-12-01 21:24:59 +01:00
|
|
|
struct passwd {
|
|
|
|
char *pw_name;
|
|
|
|
char *pw_gecos;
|
|
|
|
char *pw_dir;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef void (__cdecl *sig_handler_t)(int);
|
|
|
|
struct sigaction {
|
|
|
|
sig_handler_t sa_handler;
|
|
|
|
unsigned sa_flags;
|
|
|
|
};
|
|
|
|
#define sigemptyset(x) (void)0
|
|
|
|
#define SA_RESTART 0
|
|
|
|
|
|
|
|
struct itimerval {
|
|
|
|
struct timeval it_value, it_interval;
|
|
|
|
};
|
|
|
|
#define ITIMER_REAL 0
|
|
|
|
|
2010-09-27 13:01:59 +02:00
|
|
|
/*
|
|
|
|
* sanitize preprocessor namespace polluted by Windows headers defining
|
|
|
|
* macros which collide with git local versions
|
|
|
|
*/
|
|
|
|
#undef HELP_COMMAND /* from winuser.h */
|
|
|
|
|
2007-12-01 21:24:59 +01:00
|
|
|
/*
|
|
|
|
* trivial stubs
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline int readlink(const char *path, char *buf, size_t bufsiz)
|
|
|
|
{ errno = ENOSYS; return -1; }
|
|
|
|
static inline int symlink(const char *oldpath, const char *newpath)
|
|
|
|
{ errno = ENOSYS; return -1; }
|
|
|
|
static inline int fchmod(int fildes, mode_t mode)
|
|
|
|
{ errno = ENOSYS; return -1; }
|
2011-11-16 00:39:33 +01:00
|
|
|
static inline pid_t fork(void)
|
|
|
|
{ errno = ENOSYS; return -1; }
|
2007-12-01 21:24:59 +01:00
|
|
|
static inline unsigned int alarm(unsigned int seconds)
|
|
|
|
{ return 0; }
|
|
|
|
static inline int fsync(int fd)
|
2010-05-20 20:57:54 +02:00
|
|
|
{ return _commit(fd); }
|
2009-12-28 18:04:21 +01:00
|
|
|
static inline pid_t getppid(void)
|
2007-12-01 21:24:59 +01:00
|
|
|
{ return 1; }
|
|
|
|
static inline void sync(void)
|
|
|
|
{}
|
2009-12-28 18:04:21 +01:00
|
|
|
static inline uid_t getuid(void)
|
2007-12-01 21:24:59 +01:00
|
|
|
{ return 1; }
|
|
|
|
static inline struct passwd *getpwnam(const char *name)
|
|
|
|
{ return NULL; }
|
2010-03-06 16:40:40 +01:00
|
|
|
static inline int fcntl(int fd, int cmd, ...)
|
2007-12-01 21:24:59 +01:00
|
|
|
{
|
|
|
|
if (cmd == F_GETFD || cmd == F_SETFD)
|
|
|
|
return 0;
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
2009-07-05 20:57:46 +02:00
|
|
|
/* bash cannot reliably detect negative return codes as failure */
|
|
|
|
#define exit(code) exit((code) & 0xff)
|
2007-12-01 21:24:59 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* simple adaptors
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline int mingw_mkdir(const char *path, int mode)
|
|
|
|
{
|
|
|
|
return mkdir(path);
|
|
|
|
}
|
|
|
|
#define mkdir mingw_mkdir
|
|
|
|
|
2010-11-04 02:35:14 +01:00
|
|
|
#define WNOHANG 1
|
2011-12-08 20:39:57 +01:00
|
|
|
pid_t waitpid(pid_t pid, int *status, int options);
|
2007-12-01 21:24:59 +01:00
|
|
|
|
2010-11-04 02:35:15 +01:00
|
|
|
#define kill mingw_kill
|
|
|
|
int mingw_kill(pid_t pid, int sig);
|
|
|
|
|
2009-10-19 17:42:07 +02:00
|
|
|
#ifndef NO_OPENSSL
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
static inline int mingw_SSL_set_fd(SSL *ssl, int fd)
|
|
|
|
{
|
|
|
|
return SSL_set_fd(ssl, _get_osfhandle(fd));
|
|
|
|
}
|
|
|
|
#define SSL_set_fd mingw_SSL_set_fd
|
|
|
|
|
|
|
|
static inline int mingw_SSL_set_rfd(SSL *ssl, int fd)
|
|
|
|
{
|
|
|
|
return SSL_set_rfd(ssl, _get_osfhandle(fd));
|
|
|
|
}
|
|
|
|
#define SSL_set_rfd mingw_SSL_set_rfd
|
|
|
|
|
|
|
|
static inline int mingw_SSL_set_wfd(SSL *ssl, int fd)
|
|
|
|
{
|
|
|
|
return SSL_set_wfd(ssl, _get_osfhandle(fd));
|
|
|
|
}
|
|
|
|
#define SSL_set_wfd mingw_SSL_set_wfd
|
|
|
|
#endif
|
|
|
|
|
2007-12-01 21:24:59 +01:00
|
|
|
/*
|
|
|
|
* implementations of missing functions
|
|
|
|
*/
|
|
|
|
|
Windows: A pipe() replacement whose ends are not inherited to children.
On Unix the idiom to use a pipe is as follows:
pipe(fd);
pid = fork();
if (!pid) {
dup2(fd[1], 1);
close(fd[1]);
close(fd[0]);
...
}
close(fd[1]);
i.e. the child process closes the both pipe ends after duplicating one
to the file descriptors where they are needed.
On Windows, which does not have fork(), we never have an opportunity to
(1) duplicate a pipe end in the child, (2) close unused pipe ends. Instead,
we must use this idiom:
save1 = dup(1);
pipe(fd);
dup2(fd[1], 1);
spawn(...);
dup2(save1, 1);
close(fd[1]);
i.e. save away the descriptor at the destination slot, replace by the pipe
end, spawn process, restore the saved file.
But there is a problem: Notice that the child did not only inherit the
dup2()ed descriptor, but also *both* original pipe ends. Although the one
end that was dup()ed could be closed before the spawn(), we cannot close
the other end - the child inherits it, no matter what.
The solution is to generate non-inheritable pipes. At the first glance,
this looks strange: The purpose of pipes is usually to be inherited to
child processes. But notice that in the course of actions as outlined
above, the pipe descriptor that we want to inherit to the child is
dup2()ed, and as it so happens, Windows's dup2() creates inheritable
duplicates.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
2007-12-07 22:05:36 +01:00
|
|
|
int pipe(int filedes[2]);
|
2007-12-01 21:24:59 +01:00
|
|
|
unsigned int sleep (unsigned int seconds);
|
|
|
|
int mkstemp(char *template);
|
|
|
|
int gettimeofday(struct timeval *tv, void *tz);
|
|
|
|
struct tm *gmtime_r(const time_t *timep, struct tm *result);
|
|
|
|
struct tm *localtime_r(const time_t *timep, struct tm *result);
|
|
|
|
int getpagesize(void); /* defined in MinGW's libgcc.a */
|
2009-12-28 18:04:21 +01:00
|
|
|
struct passwd *getpwuid(uid_t uid);
|
2007-12-01 21:24:59 +01:00
|
|
|
int setitimer(int type, struct itimerval *in, struct itimerval *out);
|
|
|
|
int sigaction(int sig, struct sigaction *in, struct sigaction *out);
|
2009-01-24 15:04:39 +01:00
|
|
|
int link(const char *oldpath, const char *newpath);
|
2007-12-03 21:55:57 +01:00
|
|
|
|
2008-03-05 21:51:27 +01:00
|
|
|
/*
|
|
|
|
* replacements of existing functions
|
|
|
|
*/
|
|
|
|
|
2011-02-07 21:49:33 +01:00
|
|
|
int mingw_unlink(const char *pathname);
|
|
|
|
#define unlink mingw_unlink
|
|
|
|
|
2011-02-07 21:52:34 +01:00
|
|
|
int mingw_rmdir(const char *path);
|
|
|
|
#define rmdir mingw_rmdir
|
|
|
|
|
2007-11-15 22:22:47 +01:00
|
|
|
int mingw_open (const char *filename, int oflags, ...);
|
|
|
|
#define open mingw_open
|
|
|
|
|
2012-12-04 09:10:38 +01:00
|
|
|
int mingw_fgetc(FILE *stream);
|
|
|
|
#define fgetc mingw_fgetc
|
|
|
|
|
2010-02-25 21:03:44 +01:00
|
|
|
FILE *mingw_fopen (const char *filename, const char *otype);
|
|
|
|
#define fopen mingw_fopen
|
|
|
|
|
|
|
|
FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream);
|
|
|
|
#define freopen mingw_freopen
|
|
|
|
|
2012-10-17 09:05:51 +02:00
|
|
|
int mingw_fflush(FILE *stream);
|
|
|
|
#define fflush mingw_fflush
|
|
|
|
|
2008-03-05 21:51:27 +01:00
|
|
|
char *mingw_getcwd(char *pointer, int len);
|
|
|
|
#define getcwd mingw_getcwd
|
|
|
|
|
2008-06-22 11:35:21 +02:00
|
|
|
char *mingw_getenv(const char *name);
|
|
|
|
#define getenv mingw_getenv
|
|
|
|
|
2011-10-15 16:05:20 +02:00
|
|
|
int mingw_gethostname(char *host, int namelen);
|
|
|
|
#define gethostname mingw_gethostname
|
|
|
|
|
2007-12-26 13:51:18 +01:00
|
|
|
struct hostent *mingw_gethostbyname(const char *host);
|
|
|
|
#define gethostbyname mingw_gethostbyname
|
|
|
|
|
2009-11-23 23:55:50 +01:00
|
|
|
void mingw_freeaddrinfo(struct addrinfo *res);
|
|
|
|
#define freeaddrinfo mingw_freeaddrinfo
|
|
|
|
|
|
|
|
int mingw_getaddrinfo(const char *node, const char *service,
|
|
|
|
const struct addrinfo *hints, struct addrinfo **res);
|
|
|
|
#define getaddrinfo mingw_getaddrinfo
|
|
|
|
|
|
|
|
int mingw_getnameinfo(const struct sockaddr *sa, socklen_t salen,
|
|
|
|
char *host, DWORD hostlen, char *serv, DWORD servlen,
|
|
|
|
int flags);
|
|
|
|
#define getnameinfo mingw_getnameinfo
|
|
|
|
|
2007-12-26 13:51:18 +01:00
|
|
|
int mingw_socket(int domain, int type, int protocol);
|
|
|
|
#define socket mingw_socket
|
|
|
|
|
|
|
|
int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz);
|
|
|
|
#define connect mingw_connect
|
|
|
|
|
2010-11-04 02:35:09 +01:00
|
|
|
int mingw_bind(int sockfd, struct sockaddr *sa, size_t sz);
|
|
|
|
#define bind mingw_bind
|
|
|
|
|
|
|
|
int mingw_setsockopt(int sockfd, int lvl, int optname, void *optval, int optlen);
|
|
|
|
#define setsockopt mingw_setsockopt
|
|
|
|
|
2011-05-18 22:24:37 +02:00
|
|
|
int mingw_shutdown(int sockfd, int how);
|
|
|
|
#define shutdown mingw_shutdown
|
|
|
|
|
2010-11-04 02:35:09 +01:00
|
|
|
int mingw_listen(int sockfd, int backlog);
|
|
|
|
#define listen mingw_listen
|
|
|
|
|
|
|
|
int mingw_accept(int sockfd, struct sockaddr *sa, socklen_t *sz);
|
|
|
|
#define accept mingw_accept
|
|
|
|
|
2007-12-07 22:19:40 +01:00
|
|
|
int mingw_rename(const char*, const char*);
|
|
|
|
#define rename mingw_rename
|
|
|
|
|
2009-11-07 21:10:31 +01:00
|
|
|
#if defined(USE_WIN32_MMAP) || defined(_MSC_VER)
|
2009-03-13 16:50:45 +01:00
|
|
|
int mingw_getpagesize(void);
|
|
|
|
#define getpagesize mingw_getpagesize
|
|
|
|
#endif
|
|
|
|
|
2011-02-28 22:13:22 +01:00
|
|
|
struct rlimit {
|
|
|
|
unsigned int rlim_cur;
|
|
|
|
};
|
|
|
|
#define RLIMIT_NOFILE 0
|
|
|
|
|
|
|
|
static inline int getrlimit(int resource, struct rlimit *rlp)
|
|
|
|
{
|
|
|
|
if (resource != RLIMIT_NOFILE) {
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
rlp->rlim_cur = 2048;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
MSVC: fix stat definition hell
In msvc.h, there's a couple of stat related functions defined diffently
from mingw.h. When we remove these definitions, the only problem we get is
"warning C4005: '_stati64' : macro redefinition" for this line in mingw.h:
#define _stati64(x,y) mingw_stat(x,y)
The reason is that as of MSVCR80.dll (distributed with MSVC 2005), the
original _stati64 family of functions was renamed to _stat32i64, and the
former function names became macros (pointing to the appropriate function
based on the definition of _USE_32BIT_TIME_T).
Defining _stati64 works on MinGW because MinGW by default compiles against
the MSVCRT.DLL that is part of Windows (i.e. _stati64 is a function rather
than a macro).
Note: MinGW *can* compile for newer MSVC runtime versions, and MSVC
apparently can also compile for the Windows MSVCRT.DLL via the DDK (see
http://www.syndicateofideas.com/posts/fighting-the-msvcrt-dll-hell ).
Remove the stat definitions from msvc.h, as they are not compiler related.
In mingw.h, determine the runtime version in use from the definitions of
_stati64 and _USE_32BIT_TIME_T, and define stat() accordingly.
This also fixes that stat() in MSVC builds still resolves to mingw_lstat()
instead of mingw_stat().
Signed-off-by: Karsten Blees <blees@dcon.de>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-11 01:23:13 +02:00
|
|
|
/*
|
|
|
|
* Use mingw specific stat()/lstat()/fstat() implementations on Windows.
|
2007-09-03 20:40:26 +02:00
|
|
|
*/
|
2009-03-05 17:05:12 +01:00
|
|
|
#define off_t off64_t
|
|
|
|
#define lseek _lseeki64
|
MSVC: fix stat definition hell
In msvc.h, there's a couple of stat related functions defined diffently
from mingw.h. When we remove these definitions, the only problem we get is
"warning C4005: '_stati64' : macro redefinition" for this line in mingw.h:
#define _stati64(x,y) mingw_stat(x,y)
The reason is that as of MSVCR80.dll (distributed with MSVC 2005), the
original _stati64 family of functions was renamed to _stat32i64, and the
former function names became macros (pointing to the appropriate function
based on the definition of _USE_32BIT_TIME_T).
Defining _stati64 works on MinGW because MinGW by default compiles against
the MSVCRT.DLL that is part of Windows (i.e. _stati64 is a function rather
than a macro).
Note: MinGW *can* compile for newer MSVC runtime versions, and MSVC
apparently can also compile for the Windows MSVCRT.DLL via the DDK (see
http://www.syndicateofideas.com/posts/fighting-the-msvcrt-dll-hell ).
Remove the stat definitions from msvc.h, as they are not compiler related.
In mingw.h, determine the runtime version in use from the definitions of
_stati64 and _USE_32BIT_TIME_T, and define stat() accordingly.
This also fixes that stat() in MSVC builds still resolves to mingw_lstat()
instead of mingw_stat().
Signed-off-by: Karsten Blees <blees@dcon.de>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-11 01:23:13 +02:00
|
|
|
|
|
|
|
/* use struct stat with 64 bit st_size */
|
2013-09-11 18:02:09 +02:00
|
|
|
#ifdef stat
|
|
|
|
#undef stat
|
|
|
|
#endif
|
2010-01-15 21:12:19 +01:00
|
|
|
#define stat _stati64
|
2008-08-18 22:01:06 +02:00
|
|
|
int mingw_lstat(const char *file_name, struct stat *buf);
|
2010-03-17 16:17:34 +01:00
|
|
|
int mingw_stat(const char *file_name, struct stat *buf);
|
2008-08-18 22:01:06 +02:00
|
|
|
int mingw_fstat(int fd, struct stat *buf);
|
2013-09-11 18:02:09 +02:00
|
|
|
#ifdef fstat
|
|
|
|
#undef fstat
|
|
|
|
#endif
|
2007-09-03 20:40:26 +02:00
|
|
|
#define fstat mingw_fstat
|
2013-09-11 18:02:09 +02:00
|
|
|
#ifdef lstat
|
|
|
|
#undef lstat
|
|
|
|
#endif
|
2007-09-03 20:40:26 +02:00
|
|
|
#define lstat mingw_lstat
|
MSVC: fix stat definition hell
In msvc.h, there's a couple of stat related functions defined diffently
from mingw.h. When we remove these definitions, the only problem we get is
"warning C4005: '_stati64' : macro redefinition" for this line in mingw.h:
#define _stati64(x,y) mingw_stat(x,y)
The reason is that as of MSVCR80.dll (distributed with MSVC 2005), the
original _stati64 family of functions was renamed to _stat32i64, and the
former function names became macros (pointing to the appropriate function
based on the definition of _USE_32BIT_TIME_T).
Defining _stati64 works on MinGW because MinGW by default compiles against
the MSVCRT.DLL that is part of Windows (i.e. _stati64 is a function rather
than a macro).
Note: MinGW *can* compile for newer MSVC runtime versions, and MSVC
apparently can also compile for the Windows MSVCRT.DLL via the DDK (see
http://www.syndicateofideas.com/posts/fighting-the-msvcrt-dll-hell ).
Remove the stat definitions from msvc.h, as they are not compiler related.
In mingw.h, determine the runtime version in use from the definitions of
_stati64 and _USE_32BIT_TIME_T, and define stat() accordingly.
This also fixes that stat() in MSVC builds still resolves to mingw_lstat()
instead of mingw_stat().
Signed-off-by: Karsten Blees <blees@dcon.de>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-11 01:23:13 +02:00
|
|
|
|
|
|
|
#ifndef _stati64
|
|
|
|
# define _stati64(x,y) mingw_stat(x,y)
|
|
|
|
#elif defined (_USE_32BIT_TIME_T)
|
|
|
|
# define _stat32i64(x,y) mingw_stat(x,y)
|
|
|
|
#else
|
|
|
|
# define _stat64(x,y) mingw_stat(x,y)
|
2010-01-15 21:12:19 +01:00
|
|
|
#endif
|
2007-09-03 20:40:26 +02:00
|
|
|
|
2007-09-07 13:05:00 +02:00
|
|
|
int mingw_utime(const char *file_name, const struct utimbuf *times);
|
|
|
|
#define utime mingw_utime
|
|
|
|
|
Windows: avoid the "dup dance" when spawning a child process
When stdin, stdout, or stderr must be redirected for a child process that
on Windows is spawned using one of the spawn() functions of Microsoft's
C runtime, then there is no choice other than to
1. make a backup copy of fd 0,1,2 with dup
2. dup2 the redirection source fd into 0,1,2
3. spawn
4. dup2 the backup back into 0,1,2
5. close the backup copy and the redirection source
We used this idiom as well -- but we are not using the spawn() functions
anymore!
Instead, we have our own implementation. We had hardcoded that stdin,
stdout, and stderr of the child process were inherited from the parent's
fds 0, 1, and 2. But we can actually specify any fd.
With this patch, the fds to inherit are passed from start_command()'s
WIN32 section to our spawn implementation. This way, we can avoid the
backup copies of the fds.
The backup copies were a bug waiting to surface: The OS handles underlying
the dup()ed fds were inherited by the child process (but were not
associated with a file descriptor in the child). Consequently, the file or
pipe represented by the OS handle remained open even after the backup copy
was closed in the parent process until the child exited.
Since our implementation of pipe() creates non-inheritable OS handles, we
still dup() file descriptors in start_command() because dup() happens to
create inheritable duplicates. (A nice side effect is that the fd cleanup
in start_command is the same for Windows and Unix and remains unchanged.)
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-15 21:12:18 +01:00
|
|
|
pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
|
2010-04-11 22:40:12 +02:00
|
|
|
const char *dir,
|
Windows: avoid the "dup dance" when spawning a child process
When stdin, stdout, or stderr must be redirected for a child process that
on Windows is spawned using one of the spawn() functions of Microsoft's
C runtime, then there is no choice other than to
1. make a backup copy of fd 0,1,2 with dup
2. dup2 the redirection source fd into 0,1,2
3. spawn
4. dup2 the backup back into 0,1,2
5. close the backup copy and the redirection source
We used this idiom as well -- but we are not using the spawn() functions
anymore!
Instead, we have our own implementation. We had hardcoded that stdin,
stdout, and stderr of the child process were inherited from the parent's
fds 0, 1, and 2. But we can actually specify any fd.
With this patch, the fds to inherit are passed from start_command()'s
WIN32 section to our spawn implementation. This way, we can avoid the
backup copies of the fds.
The backup copies were a bug waiting to surface: The OS handles underlying
the dup()ed fds were inherited by the child process (but were not
associated with a file descriptor in the child). Consequently, the file or
pipe represented by the OS handle remained open even after the backup copy
was closed in the parent process until the child exited.
Since our implementation of pipe() creates non-inheritable OS handles, we
still dup() file descriptors in start_command() because dup() happens to
create inheritable duplicates. (A nice side effect is that the fd cleanup
in start_command is the same for Windows and Unix and remains unchanged.)
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-15 21:12:18 +01:00
|
|
|
int fhin, int fhout, int fherr);
|
2012-04-05 19:48:46 +02:00
|
|
|
int mingw_execvp(const char *cmd, char *const *argv);
|
2007-12-04 12:38:32 +01:00
|
|
|
#define execvp mingw_execvp
|
2012-04-05 19:48:46 +02:00
|
|
|
int mingw_execv(const char *cmd, char *const *argv);
|
2010-09-27 13:02:17 +02:00
|
|
|
#define execv mingw_execv
|
2007-12-04 12:38:32 +01:00
|
|
|
|
2007-11-17 19:16:53 +01:00
|
|
|
static inline unsigned int git_ntohl(unsigned int x)
|
|
|
|
{ return (unsigned int)ntohl(x); }
|
|
|
|
#define ntohl git_ntohl
|
|
|
|
|
2007-11-13 10:14:45 +01:00
|
|
|
sig_handler_t mingw_signal(int sig, sig_handler_t handler);
|
|
|
|
#define signal mingw_signal
|
|
|
|
|
2012-12-04 09:10:38 +01:00
|
|
|
int mingw_raise(int sig);
|
|
|
|
#define raise mingw_raise
|
|
|
|
|
2008-07-18 09:34:44 +02:00
|
|
|
/*
|
|
|
|
* ANSI emulation wrappers
|
|
|
|
*/
|
|
|
|
|
|
|
|
int winansi_fputs(const char *str, FILE *stream);
|
|
|
|
int winansi_printf(const char *format, ...) __attribute__((format (printf, 1, 2)));
|
|
|
|
int winansi_fprintf(FILE *stream, const char *format, ...) __attribute__((format (printf, 2, 3)));
|
|
|
|
#define fputs winansi_fputs
|
|
|
|
#define printf(...) winansi_printf(__VA_ARGS__)
|
|
|
|
#define fprintf(...) winansi_fprintf(__VA_ARGS__)
|
|
|
|
|
2007-12-03 21:55:57 +01:00
|
|
|
/*
|
|
|
|
* git specific compatibility
|
|
|
|
*/
|
|
|
|
|
2008-03-05 21:51:27 +01:00
|
|
|
#define has_dos_drive_prefix(path) (isalpha(*(path)) && (path)[1] == ':')
|
|
|
|
#define is_dir_sep(c) ((c) == '/' || (c) == '\\')
|
2011-05-27 18:00:39 +02:00
|
|
|
static inline char *mingw_find_last_dir_sep(const char *path)
|
|
|
|
{
|
|
|
|
char *ret = NULL;
|
|
|
|
for (; *path; ++path)
|
|
|
|
if (is_dir_sep(*path))
|
|
|
|
ret = (char *)path;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#define find_last_dir_sep mingw_find_last_dir_sep
|
2010-07-13 16:17:43 +02:00
|
|
|
int mingw_offset_1st_component(const char *path);
|
|
|
|
#define offset_1st_component mingw_offset_1st_component
|
2007-12-03 21:55:57 +01:00
|
|
|
#define PATH_SEP ';'
|
2007-03-23 10:57:05 +01:00
|
|
|
#define PRIuMAX "I64u"
|
2013-09-19 09:17:07 +02:00
|
|
|
#define PRId64 "I64d"
|
2007-12-07 22:08:59 +01:00
|
|
|
|
2008-07-13 22:31:20 +02:00
|
|
|
void mingw_open_html(const char *path);
|
|
|
|
#define open_html mingw_open_html
|
|
|
|
|
2007-12-07 22:08:59 +01:00
|
|
|
/*
|
|
|
|
* helpers
|
|
|
|
*/
|
|
|
|
|
2009-09-11 19:40:08 +02:00
|
|
|
char **make_augmented_environ(const char *const *vars);
|
2007-12-07 22:08:59 +01:00
|
|
|
void free_environ(char **env);
|
2008-07-21 21:19:57 +02:00
|
|
|
|
2013-04-27 21:18:55 +02:00
|
|
|
/*
|
|
|
|
* A critical section used in the implementation of the spawn
|
|
|
|
* functions (mingw_spawnv[p]e()) and waitpid(). Intialised in
|
|
|
|
* the replacement main() macro below.
|
|
|
|
*/
|
|
|
|
extern CRITICAL_SECTION pinfo_cs;
|
|
|
|
|
2008-07-21 21:19:57 +02:00
|
|
|
/*
|
|
|
|
* A replacement of main() that ensures that argv[0] has a path
|
2009-09-16 10:20:20 +02:00
|
|
|
* and that default fmode and std(in|out|err) are in binary mode
|
2008-07-21 21:19:57 +02:00
|
|
|
*/
|
|
|
|
|
2008-07-26 11:41:44 +02:00
|
|
|
#define main(c,v) dummy_decl_mingw_main(); \
|
2013-04-27 21:19:47 +02:00
|
|
|
static int mingw_main(c,v); \
|
|
|
|
int main(int argc, char **argv) \
|
2008-07-21 21:19:57 +02:00
|
|
|
{ \
|
2010-11-04 02:35:13 +01:00
|
|
|
extern CRITICAL_SECTION pinfo_cs; \
|
2009-09-16 10:20:20 +02:00
|
|
|
_fmode = _O_BINARY; \
|
|
|
|
_setmode(_fileno(stdin), _O_BINARY); \
|
|
|
|
_setmode(_fileno(stdout), _O_BINARY); \
|
|
|
|
_setmode(_fileno(stderr), _O_BINARY); \
|
2008-07-21 21:19:57 +02:00
|
|
|
argv[0] = xstrdup(_pgmptr); \
|
2010-11-04 02:35:13 +01:00
|
|
|
InitializeCriticalSection(&pinfo_cs); \
|
2008-07-21 21:19:57 +02:00
|
|
|
return mingw_main(argc, argv); \
|
|
|
|
} \
|
|
|
|
static int mingw_main(c,v)
|
2009-05-31 18:15:22 +02:00
|
|
|
|
2010-01-15 21:12:20 +01:00
|
|
|
/*
|
|
|
|
* Used by Pthread API implementation for Windows
|
|
|
|
*/
|
|
|
|
extern int err_win_to_posix(DWORD winerr);
|