2016-01-14 19:51:59 +03:00
|
|
|
#ifdef __MINGW64_VERSION_MAJOR
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
typedef _sigset_t sigset_t;
|
|
|
|
#endif
|
2007-12-01 23:24:59 +03:00
|
|
|
#include <winsock2.h>
|
2009-11-24 01:55:50 +03:00
|
|
|
#include <ws2tcpip.h>
|
2007-12-01 23:24:59 +03:00
|
|
|
|
2016-01-14 19:51:59 +03:00
|
|
|
/* MinGW-w64 reports to have flockfile, but it does not actually have it. */
|
|
|
|
#ifdef __MINGW64_VERSION_MAJOR
|
|
|
|
#undef _POSIX_THREAD_SAFE_FUNCTIONS
|
|
|
|
#endif
|
|
|
|
|
2007-12-01 23:24:59 +03:00
|
|
|
/*
|
|
|
|
* things that are not available in header files
|
|
|
|
*/
|
|
|
|
|
2009-12-28 20:04:21 +03:00
|
|
|
typedef int uid_t;
|
2010-11-04 04:35:09 +03:00
|
|
|
typedef int socklen_t;
|
2016-01-14 19:51:59 +03:00
|
|
|
#ifndef __MINGW64_VERSION_MAJOR
|
|
|
|
typedef int pid_t;
|
2007-12-01 23:24:59 +03:00
|
|
|
#define hstrerror strerror
|
2016-01-14 19:51:59 +03:00
|
|
|
#endif
|
2007-12-01 23:24:59 +03:00
|
|
|
|
|
|
|
#define S_IFLNK 0120000 /* Symbolic link */
|
|
|
|
#define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK)
|
|
|
|
#define S_ISSOCK(x) 0
|
2009-12-28 20:13:52 +03:00
|
|
|
|
2016-01-15 16:24:29 +03:00
|
|
|
#ifndef S_IRWXG
|
2007-12-01 23:24:59 +03:00
|
|
|
#define S_IRGRP 0
|
|
|
|
#define S_IWGRP 0
|
|
|
|
#define S_IXGRP 0
|
2009-12-28 20:13:52 +03:00
|
|
|
#define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
|
2016-01-15 16:24:29 +03:00
|
|
|
#endif
|
|
|
|
#ifndef S_IRWXO
|
2007-12-01 23:24:59 +03:00
|
|
|
#define S_IROTH 0
|
2009-12-28 20:13:52 +03:00
|
|
|
#define S_IWOTH 0
|
2007-12-01 23:24:59 +03:00
|
|
|
#define S_IXOTH 0
|
2009-12-28 20:13:52 +03:00
|
|
|
#define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
|
2016-01-15 16:24:29 +03:00
|
|
|
#endif
|
2012-04-17 22:00:04 +04:00
|
|
|
|
|
|
|
#define S_ISUID 0004000
|
|
|
|
#define S_ISGID 0002000
|
|
|
|
#define S_ISVTX 0001000
|
2007-12-01 23:24:59 +03:00
|
|
|
|
2009-07-04 23:26:38 +04:00
|
|
|
#define WIFEXITED(x) 1
|
|
|
|
#define WIFSIGNALED(x) 0
|
2007-12-01 23:24:59 +03:00
|
|
|
#define WEXITSTATUS(x) ((x) & 0xff)
|
2009-07-04 23:26:38 +04:00
|
|
|
#define WTERMSIG(x) SIGTERM
|
2007-12-01 23:24:59 +03:00
|
|
|
|
2013-09-11 03:22:34 +04:00
|
|
|
#ifndef EWOULDBLOCK
|
2010-10-12 20:39:41 +04:00
|
|
|
#define EWOULDBLOCK EAGAIN
|
2013-09-11 03:22:34 +04:00
|
|
|
#endif
|
2014-07-16 02:53:27 +04:00
|
|
|
#ifndef ELOOP
|
|
|
|
#define ELOOP EMLINK
|
|
|
|
#endif
|
2010-10-12 20:39:41 +04:00
|
|
|
#define SHUT_WR SD_SEND
|
|
|
|
|
2009-01-22 08:57:34 +03:00
|
|
|
#define SIGHUP 1
|
|
|
|
#define SIGQUIT 3
|
|
|
|
#define SIGKILL 9
|
|
|
|
#define SIGPIPE 13
|
|
|
|
#define SIGALRM 14
|
|
|
|
#define SIGCHLD 17
|
2007-12-01 23:24:59 +03:00
|
|
|
|
|
|
|
#define F_GETFD 1
|
|
|
|
#define F_SETFD 2
|
|
|
|
#define FD_CLOEXEC 0x1
|
|
|
|
|
2016-08-22 15:47:55 +03:00
|
|
|
#if !defined O_CLOEXEC && defined O_NOINHERIT
|
|
|
|
#define O_CLOEXEC O_NOINHERIT
|
|
|
|
#endif
|
|
|
|
|
2013-09-11 03:22:34 +04:00
|
|
|
#ifndef EAFNOSUPPORT
|
2010-11-04 04:35:09 +03:00
|
|
|
#define EAFNOSUPPORT WSAEAFNOSUPPORT
|
2013-09-11 03:22:34 +04:00
|
|
|
#endif
|
|
|
|
#ifndef ECONNABORTED
|
2010-11-04 04:35:09 +03:00
|
|
|
#define ECONNABORTED WSAECONNABORTED
|
2013-09-11 03:22:34 +04:00
|
|
|
#endif
|
2016-07-21 23:59:06 +03:00
|
|
|
#ifndef ENOTSOCK
|
|
|
|
#define ENOTSOCK WSAENOTSOCK
|
|
|
|
#endif
|
2010-11-04 04:35:09 +03:00
|
|
|
|
2007-12-01 23:24:59 +03: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 SA_RESTART 0
|
|
|
|
|
|
|
|
struct itimerval {
|
|
|
|
struct timeval it_value, it_interval;
|
|
|
|
};
|
|
|
|
#define ITIMER_REAL 0
|
|
|
|
|
2015-03-08 13:12:45 +03:00
|
|
|
struct utsname {
|
|
|
|
char sysname[16];
|
|
|
|
char nodename[1];
|
|
|
|
char release[16];
|
|
|
|
char version[16];
|
|
|
|
char machine[1];
|
|
|
|
};
|
|
|
|
|
2010-09-27 15:01:59 +04: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 23:24:59 +03: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; }
|
2016-01-14 19:51:59 +03:00
|
|
|
#ifndef __MINGW64_VERSION_MAJOR
|
2011-11-16 03:39:33 +04:00
|
|
|
static inline pid_t fork(void)
|
|
|
|
{ errno = ENOSYS; return -1; }
|
2016-01-14 19:51:59 +03:00
|
|
|
#endif
|
2007-12-01 23:24:59 +03:00
|
|
|
static inline unsigned int alarm(unsigned int seconds)
|
|
|
|
{ return 0; }
|
|
|
|
static inline int fsync(int fd)
|
2010-05-20 22:57:54 +04:00
|
|
|
{ return _commit(fd); }
|
2007-12-01 23:24:59 +03:00
|
|
|
static inline void sync(void)
|
|
|
|
{}
|
2009-12-28 20:04:21 +03:00
|
|
|
static inline uid_t getuid(void)
|
2007-12-01 23:24:59 +03:00
|
|
|
{ return 1; }
|
|
|
|
static inline struct passwd *getpwnam(const char *name)
|
|
|
|
{ return NULL; }
|
2010-03-06 18:40:40 +03:00
|
|
|
static inline int fcntl(int fd, int cmd, ...)
|
2007-12-01 23:24:59 +03:00
|
|
|
{
|
|
|
|
if (cmd == F_GETFD || cmd == F_SETFD)
|
|
|
|
return 0;
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
2009-07-05 22:57:46 +04:00
|
|
|
/* bash cannot reliably detect negative return codes as failure */
|
|
|
|
#define exit(code) exit((code) & 0xff)
|
2014-09-22 22:24:34 +04:00
|
|
|
#define sigemptyset(x) (void)0
|
|
|
|
static inline int sigaddset(sigset_t *set, int signum)
|
|
|
|
{ return 0; }
|
2016-05-01 22:08:21 +03:00
|
|
|
#define SIG_BLOCK 0
|
2014-09-22 22:24:34 +04:00
|
|
|
#define SIG_UNBLOCK 0
|
|
|
|
static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
|
|
|
|
{ return 0; }
|
2015-04-15 21:29:30 +03:00
|
|
|
static inline pid_t getppid(void)
|
|
|
|
{ return 1; }
|
|
|
|
static inline pid_t getpgid(pid_t pid)
|
|
|
|
{ return pid == 0 ? getpid() : pid; }
|
|
|
|
static inline pid_t tcgetpgrp(int fd)
|
|
|
|
{ return getpid(); }
|
2007-12-01 23:24:59 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* simple adaptors
|
|
|
|
*/
|
|
|
|
|
2012-03-15 21:21:28 +04:00
|
|
|
int mingw_mkdir(const char *path, int mode);
|
2007-12-01 23:24:59 +03:00
|
|
|
#define mkdir mingw_mkdir
|
|
|
|
|
2010-11-04 04:35:14 +03:00
|
|
|
#define WNOHANG 1
|
2011-12-08 23:39:57 +04:00
|
|
|
pid_t waitpid(pid_t pid, int *status, int options);
|
2007-12-01 23:24:59 +03:00
|
|
|
|
2010-11-04 04:35:15 +03:00
|
|
|
#define kill mingw_kill
|
|
|
|
int mingw_kill(pid_t pid, int sig);
|
|
|
|
|
2009-10-19 19:42:07 +04: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 23:24:59 +03: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-08 00:05:36 +03:00
|
|
|
int pipe(int filedes[2]);
|
2007-12-01 23:24:59 +03:00
|
|
|
unsigned int sleep (unsigned int seconds);
|
|
|
|
int mkstemp(char *template);
|
|
|
|
int gettimeofday(struct timeval *tv, void *tz);
|
2016-01-14 19:51:59 +03:00
|
|
|
#ifndef __MINGW64_VERSION_MAJOR
|
2007-12-01 23:24:59 +03:00
|
|
|
struct tm *gmtime_r(const time_t *timep, struct tm *result);
|
|
|
|
struct tm *localtime_r(const time_t *timep, struct tm *result);
|
2016-01-14 19:51:59 +03:00
|
|
|
#endif
|
2007-12-01 23:24:59 +03:00
|
|
|
int getpagesize(void); /* defined in MinGW's libgcc.a */
|
2009-12-28 20:04:21 +03:00
|
|
|
struct passwd *getpwuid(uid_t uid);
|
2007-12-01 23:24:59 +03:00
|
|
|
int setitimer(int type, struct itimerval *in, struct itimerval *out);
|
|
|
|
int sigaction(int sig, struct sigaction *in, struct sigaction *out);
|
2009-01-24 17:04:39 +03:00
|
|
|
int link(const char *oldpath, const char *newpath);
|
2015-03-08 13:12:45 +03:00
|
|
|
int uname(struct utsname *buf);
|
2007-12-03 23:55:57 +03:00
|
|
|
|
2008-03-05 23:51:27 +03:00
|
|
|
/*
|
|
|
|
* replacements of existing functions
|
|
|
|
*/
|
|
|
|
|
2011-02-07 23:49:33 +03:00
|
|
|
int mingw_unlink(const char *pathname);
|
|
|
|
#define unlink mingw_unlink
|
|
|
|
|
2011-02-07 23:52:34 +03:00
|
|
|
int mingw_rmdir(const char *path);
|
|
|
|
#define rmdir mingw_rmdir
|
|
|
|
|
2007-11-16 00:22:47 +03:00
|
|
|
int mingw_open (const char *filename, int oflags, ...);
|
|
|
|
#define open mingw_open
|
|
|
|
|
2012-12-04 12:10:38 +04:00
|
|
|
int mingw_fgetc(FILE *stream);
|
|
|
|
#define fgetc mingw_fgetc
|
|
|
|
|
2010-02-25 23:03:44 +03: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 11:05:51 +04:00
|
|
|
int mingw_fflush(FILE *stream);
|
|
|
|
#define fflush mingw_fflush
|
|
|
|
|
2015-12-17 20:08:15 +03:00
|
|
|
ssize_t mingw_write(int fd, const void *buf, size_t len);
|
|
|
|
#define write mingw_write
|
|
|
|
|
2012-03-15 21:21:28 +04:00
|
|
|
int mingw_access(const char *filename, int mode);
|
|
|
|
#undef access
|
|
|
|
#define access mingw_access
|
|
|
|
|
|
|
|
int mingw_chdir(const char *dirname);
|
|
|
|
#define chdir mingw_chdir
|
|
|
|
|
|
|
|
int mingw_chmod(const char *filename, int mode);
|
|
|
|
#define chmod mingw_chmod
|
|
|
|
|
|
|
|
char *mingw_mktemp(char *template);
|
|
|
|
#define mktemp mingw_mktemp
|
|
|
|
|
2008-03-05 23:51:27 +03:00
|
|
|
char *mingw_getcwd(char *pointer, int len);
|
|
|
|
#define getcwd mingw_getcwd
|
|
|
|
|
2008-06-22 13:35:21 +04:00
|
|
|
char *mingw_getenv(const char *name);
|
|
|
|
#define getenv mingw_getenv
|
2014-07-17 19:37:56 +04:00
|
|
|
int mingw_putenv(const char *namevalue);
|
|
|
|
#define putenv mingw_putenv
|
2014-07-17 19:37:57 +04:00
|
|
|
#define unsetenv mingw_putenv
|
2008-06-22 13:35:21 +04:00
|
|
|
|
2011-10-15 18:05:20 +04:00
|
|
|
int mingw_gethostname(char *host, int namelen);
|
|
|
|
#define gethostname mingw_gethostname
|
|
|
|
|
2007-12-26 15:51:18 +03:00
|
|
|
struct hostent *mingw_gethostbyname(const char *host);
|
|
|
|
#define gethostbyname mingw_gethostbyname
|
|
|
|
|
2009-11-24 01:55:50 +03: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 15:51:18 +03: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 04:35:09 +03: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-19 00:24:37 +04:00
|
|
|
int mingw_shutdown(int sockfd, int how);
|
|
|
|
#define shutdown mingw_shutdown
|
|
|
|
|
2010-11-04 04:35:09 +03: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-08 00:19:40 +03:00
|
|
|
int mingw_rename(const char*, const char*);
|
|
|
|
#define rename mingw_rename
|
|
|
|
|
2009-11-07 23:10:31 +03:00
|
|
|
#if defined(USE_WIN32_MMAP) || defined(_MSC_VER)
|
2009-03-13 18:50:45 +03:00
|
|
|
int mingw_getpagesize(void);
|
|
|
|
#define getpagesize mingw_getpagesize
|
|
|
|
#endif
|
|
|
|
|
2011-03-01 00:13:22 +03: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 03:23:13 +04:00
|
|
|
/*
|
|
|
|
* Use mingw specific stat()/lstat()/fstat() implementations on Windows.
|
2007-09-03 22:40:26 +04:00
|
|
|
*/
|
2016-01-14 19:51:59 +03:00
|
|
|
#ifndef __MINGW64_VERSION_MAJOR
|
2009-03-05 19:05:12 +03:00
|
|
|
#define off_t off64_t
|
|
|
|
#define lseek _lseeki64
|
2016-01-14 19:51:59 +03:00
|
|
|
#endif
|
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 03:23:13 +04:00
|
|
|
|
|
|
|
/* use struct stat with 64 bit st_size */
|
2013-09-11 20:02:09 +04:00
|
|
|
#ifdef stat
|
|
|
|
#undef stat
|
|
|
|
#endif
|
2010-01-15 23:12:19 +03:00
|
|
|
#define stat _stati64
|
2008-08-19 00:01:06 +04:00
|
|
|
int mingw_lstat(const char *file_name, struct stat *buf);
|
2010-03-17 18:17:34 +03:00
|
|
|
int mingw_stat(const char *file_name, struct stat *buf);
|
2008-08-19 00:01:06 +04:00
|
|
|
int mingw_fstat(int fd, struct stat *buf);
|
2013-09-11 20:02:09 +04:00
|
|
|
#ifdef fstat
|
|
|
|
#undef fstat
|
|
|
|
#endif
|
2007-09-03 22:40:26 +04:00
|
|
|
#define fstat mingw_fstat
|
2013-09-11 20:02:09 +04:00
|
|
|
#ifdef lstat
|
|
|
|
#undef lstat
|
|
|
|
#endif
|
2007-09-03 22:40:26 +04: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 03:23:13 +04: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 23:12:19 +03:00
|
|
|
#endif
|
2007-09-03 22:40:26 +04:00
|
|
|
|
2007-09-07 15:05:00 +04:00
|
|
|
int mingw_utime(const char *file_name, const struct utimbuf *times);
|
|
|
|
#define utime mingw_utime
|
mingw: abort on invalid strftime formats
On Windows, strftime() does not silently ignore invalid formats, but
warns about them and then returns 0 and sets errno to EINVAL.
Unfortunately, Git does not expect such a behavior, as it disagrees
with strftime()'s semantics on Linux. As a consequence, Git
misinterprets the return value 0 as "I need more space" and grows the
buffer. As the larger buffer does not fix the format, the buffer grows
and grows and grows until we are out of memory and abort.
Ideally, we would switch off the parameter validation just for
strftime(), but we cannot even override the invalid parameter handler
via _set_thread_local_invalid_parameter_handler() using MINGW because
that function is not declared. Even _set_invalid_parameter_handler(),
which *is* declared, does not help, as it simply does... nothing.
So let's just bite the bullet and override strftime() for MINGW and
abort on an invalid format string. While this does not provide the
best user experience, it is the best we can do.
See https://msdn.microsoft.com/en-us/library/fe06s4ak.aspx for more
details.
This fixes https://github.com/git-for-windows/git/issues/863
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-19 19:49:22 +03:00
|
|
|
size_t mingw_strftime(char *s, size_t max,
|
|
|
|
const char *format, const struct tm *tm);
|
|
|
|
#define strftime mingw_strftime
|
2007-09-07 15:05:00 +04:00
|
|
|
|
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 23:12:18 +03:00
|
|
|
pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
|
2010-04-12 00:40:12 +04: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 23:12:18 +03:00
|
|
|
int fhin, int fhout, int fherr);
|
2012-04-05 21:48:46 +04:00
|
|
|
int mingw_execvp(const char *cmd, char *const *argv);
|
2007-12-04 14:38:32 +03:00
|
|
|
#define execvp mingw_execvp
|
2012-04-05 21:48:46 +04:00
|
|
|
int mingw_execv(const char *cmd, char *const *argv);
|
2010-09-27 15:02:17 +04:00
|
|
|
#define execv mingw_execv
|
2007-12-04 14:38:32 +03:00
|
|
|
|
2007-11-17 21:16:53 +03:00
|
|
|
static inline unsigned int git_ntohl(unsigned int x)
|
|
|
|
{ return (unsigned int)ntohl(x); }
|
|
|
|
#define ntohl git_ntohl
|
|
|
|
|
2007-11-13 12:14:45 +03:00
|
|
|
sig_handler_t mingw_signal(int sig, sig_handler_t handler);
|
|
|
|
#define signal mingw_signal
|
|
|
|
|
2012-12-04 12:10:38 +04:00
|
|
|
int mingw_raise(int sig);
|
|
|
|
#define raise mingw_raise
|
|
|
|
|
2008-07-18 11:34:44 +04:00
|
|
|
/*
|
|
|
|
* ANSI emulation wrappers
|
|
|
|
*/
|
|
|
|
|
mingw: intercept isatty() to handle /dev/null as Git expects it
When Git's source code calls isatty(), it really asks whether the
respective file descriptor is connected to an interactive terminal.
Windows' _isatty() function, however, determines whether the file
descriptor is associated with a character device. And NUL, Windows'
equivalent of /dev/null, is a character device.
Which means that for years, Git mistakenly detected an associated
interactive terminal when being run through the test suite, which
almost always redirects stdin, stdout and stderr to /dev/null.
This bug only became obvious, and painfully so, when the new
bisect--helper entered the `pu` branch and made the automatic build & test
time out because t6030 was waiting for an answer.
For details, see
https://msdn.microsoft.com/en-us/library/f4s0ddew.aspx
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-11 14:16:57 +03:00
|
|
|
int winansi_isatty(int fd);
|
|
|
|
#define isatty winansi_isatty
|
|
|
|
|
Win32: Thread-safe windows console output
Winansi.c has many static variables that are accessed and modified from
the [v][f]printf / fputs functions overridden in the file. This may cause
multi threaded git commands that print to the console to produce corrupted
output or even crash.
Additionally, winansi.c doesn't override all functions that can be used to
print to the console (e.g. fwrite, write, fputc are missing), so that ANSI
escapes don't work properly for some git commands (e.g. git-grep).
Instead of doing ANSI emulation in just a few wrapped functions on top of
the IO API, let's plug into the IO system and take advantage of the thread
safety inherent to the IO system.
Redirect stdout and stderr to a pipe if they point to the console. A
background thread reads from the pipe, handles ANSI escape sequences and
UTF-8 to UTF-16 conversion, then writes to the console.
The pipe-based stdout and stderr replacements must be set to unbuffered, as
MSVCRT doesn't support line buffering and fully buffered streams are
inappropriate for console output.
Due to the byte-oriented pipe, ANSI escape sequences and multi-byte UTF-8
sequences can no longer be expected to arrive in one piece. Replace the
string-based ansi_emulate() with a simple stateful parser (this also fixes
colored diff hunk headers, which were broken as of commit 2efcc977).
Override isatty to return true for the pipes redirecting to the console.
Exec/spawn obtain the original console handle to pass to the next process
via winansi_get_osfhandle().
All other overrides are gone, the default stdio implementations work as
expected with the piped stdout/stderr descriptors.
Global variables are either initialized on startup (single threaded) or
exclusively modified by the background thread. Threads communicate through
the pipe, no further synchronization is necessary.
The background thread is terminated by disonnecting the pipe after flushing
the stdio and pipe buffers. This doesn't work for anonymous pipes (created
via CreatePipe), as DisconnectNamedPipe only works on the read end, which
discards remaining data. Thus we have to setup the pipe manually, with the
write end beeing the server (opened with CreateNamedPipe) and the read end
the client (opened with CreateFile).
Limitations: doesn't track reopened or duped file descriptors, i.e.:
- fdopen(1/2) returns fully buffered streams
- dup(1/2), dup2(1/2) returns normal pipe descriptors (i.e. isatty() =
false, winansi_get_osfhandle won't return the original console handle)
Currently, only the git-format-patch command uses xfdopen(xdup(1)) (see
"realstdout" in builtin/log.c), but works well with these limitations.
Many thanks to Atsushi Nakagawa <atnak@chejz.com> for suggesting and
reviewing the thread-exit-mechanism.
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-01-15 01:24:19 +04:00
|
|
|
void winansi_init(void);
|
|
|
|
HANDLE winansi_get_osfhandle(int fd);
|
2008-07-18 11:34:44 +04:00
|
|
|
|
2007-12-03 23:55:57 +03:00
|
|
|
/*
|
|
|
|
* git specific compatibility
|
|
|
|
*/
|
|
|
|
|
2016-01-12 10:57:22 +03:00
|
|
|
#define has_dos_drive_prefix(path) \
|
|
|
|
(isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
|
2016-01-26 00:47:56 +03:00
|
|
|
int mingw_skip_dos_drive_prefix(char **path);
|
2016-01-12 10:57:22 +03:00
|
|
|
#define skip_dos_drive_prefix mingw_skip_dos_drive_prefix
|
2017-05-22 21:58:32 +03:00
|
|
|
static inline int mingw_is_dir_sep(int c)
|
|
|
|
{
|
|
|
|
return c == '/' || c == '\\';
|
|
|
|
}
|
|
|
|
#define is_dir_sep mingw_is_dir_sep
|
2011-05-27 20:00:39 +04: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;
|
|
|
|
}
|
2016-03-23 13:55:00 +03:00
|
|
|
static inline void convert_slashes(char *path)
|
|
|
|
{
|
|
|
|
for (; *path; path++)
|
|
|
|
if (*path == '\\')
|
|
|
|
*path = '/';
|
|
|
|
}
|
2011-05-27 20:00:39 +04:00
|
|
|
#define find_last_dir_sep mingw_find_last_dir_sep
|
2010-07-13 18:17:43 +04:00
|
|
|
int mingw_offset_1st_component(const char *path);
|
|
|
|
#define offset_1st_component mingw_offset_1st_component
|
2007-12-03 23:55:57 +03:00
|
|
|
#define PATH_SEP ';'
|
2016-03-30 14:37:36 +03:00
|
|
|
#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
|
2007-03-23 12:57:05 +03:00
|
|
|
#define PRIuMAX "I64u"
|
2013-09-19 11:17:07 +04:00
|
|
|
#define PRId64 "I64d"
|
2016-01-14 19:51:59 +03:00
|
|
|
#else
|
|
|
|
#include <inttypes.h>
|
|
|
|
#endif
|
2007-12-08 00:08:59 +03:00
|
|
|
|
2011-11-26 00:05:06 +04:00
|
|
|
/**
|
|
|
|
* Converts UTF-8 encoded string to UTF-16LE.
|
|
|
|
*
|
|
|
|
* To support repositories with legacy-encoded file names, invalid UTF-8 bytes
|
|
|
|
* 0xa0 - 0xff are converted to corresponding printable Unicode chars \u00a0 -
|
|
|
|
* \u00ff, and invalid UTF-8 bytes 0x80 - 0x9f (which would make non-printable
|
|
|
|
* Unicode) are converted to hex-code.
|
|
|
|
*
|
|
|
|
* Lead-bytes not followed by an appropriate number of trail-bytes, over-long
|
|
|
|
* encodings and 4-byte encodings > \u10ffff are detected as invalid UTF-8.
|
|
|
|
*
|
|
|
|
* Maximum space requirement for the target buffer is two wide chars per UTF-8
|
|
|
|
* char (((strlen(utf) * 2) + 1) [* sizeof(wchar_t)]).
|
|
|
|
*
|
|
|
|
* The maximum space is needed only if the entire input string consists of
|
|
|
|
* invalid UTF-8 bytes in range 0x80-0x9f, as per the following table:
|
|
|
|
*
|
|
|
|
* | | UTF-8 | UTF-16 |
|
|
|
|
* Code point | UTF-8 sequence | bytes | words | ratio
|
|
|
|
* --------------+-------------------+-------+--------+-------
|
|
|
|
* 000000-00007f | 0-7f | 1 | 1 | 1
|
|
|
|
* 000080-0007ff | c2-df + 80-bf | 2 | 1 | 0.5
|
|
|
|
* 000800-00ffff | e0-ef + 2 * 80-bf | 3 | 1 | 0.33
|
|
|
|
* 010000-10ffff | f0-f4 + 3 * 80-bf | 4 | 2 (a) | 0.5
|
|
|
|
* invalid | 80-9f | 1 | 2 (b) | 2
|
|
|
|
* invalid | a0-ff | 1 | 1 | 1
|
|
|
|
*
|
|
|
|
* (a) encoded as UTF-16 surrogate pair
|
|
|
|
* (b) encoded as two hex digits
|
|
|
|
*
|
|
|
|
* Note that, while the UTF-8 encoding scheme can be extended to 5-byte, 6-byte
|
|
|
|
* or even indefinite-byte sequences, the largest valid code point \u10ffff
|
|
|
|
* encodes as only 4 UTF-8 bytes.
|
|
|
|
*
|
|
|
|
* Parameters:
|
|
|
|
* wcs: wide char target buffer
|
|
|
|
* utf: string to convert
|
|
|
|
* wcslen: size of target buffer (in wchar_t's)
|
|
|
|
* utflen: size of string to convert, or -1 if 0-terminated
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* length of converted string (_wcslen(wcs)), or -1 on failure
|
|
|
|
*
|
|
|
|
* Errors:
|
|
|
|
* EINVAL: one of the input parameters is invalid (e.g. NULL)
|
|
|
|
* ERANGE: the output buffer is too small
|
|
|
|
*/
|
|
|
|
int xutftowcsn(wchar_t *wcs, const char *utf, size_t wcslen, int utflen);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Simplified variant of xutftowcsn, assumes input string is \0-terminated.
|
|
|
|
*/
|
|
|
|
static inline int xutftowcs(wchar_t *wcs, const char *utf, size_t wcslen)
|
|
|
|
{
|
|
|
|
return xutftowcsn(wcs, utf, wcslen, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Simplified file system specific variant of xutftowcsn, assumes output
|
|
|
|
* buffer size is MAX_PATH wide chars and input string is \0-terminated,
|
|
|
|
* fails with ENAMETOOLONG if input string is too long.
|
|
|
|
*/
|
|
|
|
static inline int xutftowcs_path(wchar_t *wcs, const char *utf)
|
|
|
|
{
|
|
|
|
int result = xutftowcsn(wcs, utf, MAX_PATH, -1);
|
|
|
|
if (result < 0 && errno == ERANGE)
|
|
|
|
errno = ENAMETOOLONG;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Converts UTF-16LE encoded string to UTF-8.
|
|
|
|
*
|
|
|
|
* Maximum space requirement for the target buffer is three UTF-8 chars per
|
|
|
|
* wide char ((_wcslen(wcs) * 3) + 1).
|
|
|
|
*
|
|
|
|
* The maximum space is needed only if the entire input string consists of
|
|
|
|
* UTF-16 words in range 0x0800-0xd7ff or 0xe000-0xffff (i.e. \u0800-\uffff
|
|
|
|
* modulo surrogate pairs), as per the following table:
|
|
|
|
*
|
|
|
|
* | | UTF-16 | UTF-8 |
|
|
|
|
* Code point | UTF-16 sequence | words | bytes | ratio
|
|
|
|
* --------------+-----------------------+--------+-------+-------
|
|
|
|
* 000000-00007f | 0000-007f | 1 | 1 | 1
|
|
|
|
* 000080-0007ff | 0080-07ff | 1 | 2 | 2
|
|
|
|
* 000800-00ffff | 0800-d7ff / e000-ffff | 1 | 3 | 3
|
|
|
|
* 010000-10ffff | d800-dbff + dc00-dfff | 2 | 4 | 2
|
|
|
|
*
|
|
|
|
* Note that invalid code points > 10ffff cannot be represented in UTF-16.
|
|
|
|
*
|
|
|
|
* Parameters:
|
|
|
|
* utf: target buffer
|
|
|
|
* wcs: wide string to convert
|
|
|
|
* utflen: size of target buffer
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* length of converted string, or -1 on failure
|
|
|
|
*
|
|
|
|
* Errors:
|
|
|
|
* EINVAL: one of the input parameters is invalid (e.g. NULL)
|
|
|
|
* ERANGE: the output buffer is too small
|
|
|
|
*/
|
|
|
|
int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen);
|
|
|
|
|
2013-04-27 23:18:55 +04: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 23:19:57 +04:00
|
|
|
/*
|
2011-01-07 21:47:23 +03:00
|
|
|
* A replacement of main() that adds win32 specific initialization.
|
2008-07-21 23:19:57 +04:00
|
|
|
*/
|
|
|
|
|
2016-06-18 15:38:36 +03:00
|
|
|
void mingw_startup(void);
|
|
|
|
#define main(c,v) dummy_decl_mingw_main(void); \
|
2013-04-27 23:19:47 +04:00
|
|
|
static int mingw_main(c,v); \
|
2016-07-01 16:01:28 +03:00
|
|
|
int main(int argc, const char **argv) \
|
2008-07-21 23:19:57 +04:00
|
|
|
{ \
|
2011-01-07 21:47:23 +03:00
|
|
|
mingw_startup(); \
|
2014-06-07 10:46:41 +04:00
|
|
|
return mingw_main(__argc, (void *)__argv); \
|
2008-07-21 23:19:57 +04:00
|
|
|
} \
|
|
|
|
static int mingw_main(c,v)
|
2009-05-31 20:15:22 +04:00
|
|
|
|
2010-01-15 23:12:20 +03:00
|
|
|
/*
|
|
|
|
* Used by Pthread API implementation for Windows
|
|
|
|
*/
|
|
|
|
extern int err_win_to_posix(DWORD winerr);
|