# Using VC build git (new patch) 5 messages from 2009-08-15 to 2009-08-16. Participants: Frank Li, Johannes Schindelin. Thread: https://gitlist.dev/t/20606 ## Frank Li, 2009-08-15 16:21 Subject: Using VC build git (new patch) Message-ID: <1976ea660908150921n516178dbs2ce024ed729e2e02@mail.gmail.com> URL: https://gitlist.dev/e/1976ea660908150921n516178dbs2ce024ed729e2e02%40mail.gmail.com ``` New patch. pull from git://repo.or.cz/tgit.git branch vcpatch From 3136d3b72e199ad1484629e8ff4563a918cad953 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Tue, 4 Aug 2009 23:53:38 +0800 Subject: [PATCH] Enable Visual Studio 2008 Build Git Enable VC Build Git. Reuse many msysgit porting working. Build Git need some external library, such zlib. Please read Readme to get how to build git with VS2008 Signed-off-by: Frank Li --- builtin-fast-export.c | 1 + compat/fnmatch/fnmatch.c | 2 + compat/mingw.c | 68 ++- compat/mingw.h | 21 +- compat/regex/regex.c | 8 +- compat/snprintf.c | 7 +- compat/vcbuild/.gitignore | 3 + compat/vcbuild/ReadMe | 13 + compat/vcbuild/git/git.vcproj | 197 +++++ compat/vcbuild/include/dirent.h | 127 ++++ compat/vcbuild/include/unistd.h | 174 +++++ compat/vcbuild/libgit/libgit.vcproj | 1347 +++++++++++++++++++++++++++++++++++ compat/vcbuild/porting.c | 13 + compat/vcbuild/sys/time.h | 21 + compat/winansi.c | 8 + git-compat-util.h | 2 +- help.c | 5 +- pager.c | 4 +- run-command.c | 11 +- run-command.h | 2 +- setup.c | 2 +- 21 files changed, 2011 insertions(+), 25 deletions(-) create mode 100644 compat/vcbuild/.gitignore create mode 100644 compat/vcbuild/ReadMe create mode 100644 compat/vcbuild/git/git.vcproj create mode 100644 compat/vcbuild/include/dirent.h create mode 100644 compat/vcbuild/include/unistd.h create mode 100644 compat/vcbuild/include/utime.h create mode 100644 compat/vcbuild/libgit/libgit.vcproj create mode 100644 compat/vcbuild/porting.c create mode 100644 compat/vcbuild/sys/param.h create mode 100644 compat/vcbuild/sys/socket.h create mode 100644 compat/vcbuild/sys/time.h diff --git a/builtin-fast-export.c b/builtin-fast-export.c index c48c18d..24a50ae 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -24,6 +24,7 @@ static const char *fast_export_usage[] = { static int progress; static enum { ABORT, VERBATIM, WARN, STRIP } signed_tag_mode = ABORT; +#undef ERROR static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ABORT; static int fake_missing_tagger; diff --git a/compat/fnmatch/fnmatch.c b/compat/fnmatch/fnmatch.c index 14feac7..4e3d8e7 100644 --- a/compat/fnmatch/fnmatch.c +++ b/compat/fnmatch/fnmatch.c @@ -16,6 +16,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "git-compat-util.h" + #if HAVE_CONFIG_H # include #endif diff --git a/compat/mingw.c b/compat/mingw.c index bed4178..4ff2e84 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -123,13 +123,19 @@ int mingw_open (const char *filename, int oflags, ...) { va_list args; unsigned mode; + int fd; + va_start(args, oflags); mode = va_arg(args, int); va_end(args); if (!strcmp(filename, "/dev/null")) filename = "nul"; - int fd = open(filename, oflags, mode); +#if defined(_MSC_VER) + fd = _open(filename, oflags|_O_BINARY, mode); +#else + fd = open(filename, oflags, mode); +#endif if (fd < 0 && (oflags & O_CREAT) && errno == EACCES) { DWORD attrs = GetFileAttributes(filename); if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY)) @@ -274,7 +280,11 @@ int mkstemp(char *template) char *filename = mktemp(template); if (filename == NULL) return -1; +#if defined(_MSC_VER) + return _open(filename, _O_RDWR | _O_CREAT | _O_BINARY, 0600); +#else return open(filename, O_RDWR | O_CREAT, 0600); +#endif } int gettimeofday(struct timeval *tv, void *tz) @@ -580,10 +590,11 @@ static char **get_path_split(void) static void free_path_split(char **path) { + char **p = path; + if (!path) return; - - char **p = path; + while (*p) free(*p++); free(path); @@ -938,7 +949,6 @@ int mingw_rename(const char *pold, const char *pnew) DWORD attrs, gle; int tries = 0; static const int delay[] = { 0, 1, 10, 20, 40 }; - /* * Try native rename() first to get errno right. * It is based on MoveFile(), which cannot overwrite existing files. @@ -1011,7 +1021,9 @@ static sig_handler_t timer_fn = SIG_DFL; * But ticktack() interrupts the wait state after the timer's interval * length to call the signal handler. */ - +#if defined(_MSC_VER) +#define __stdcall +#endif static __stdcall unsigned ticktack(void *dummy) { while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) { @@ -1108,9 +1120,11 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out) #undef signal sig_handler_t mingw_signal(int sig, sig_handler_t handler) { + sig_handler_t old; + if (sig != SIGALRM) return signal(sig, handler); - sig_handler_t old = timer_fn; + old = timer_fn; timer_fn = handler; return old; } @@ -1141,6 +1155,12 @@ int link(const char *oldpath, const char *newpath) { typedef BOOL WINAPI (*T)(const char*, const char*, LPSECURITY_ATTRIBUTES); static T create_hard_link = NULL; + +#if defined(_MSC_VER) + errno = ENOSYS; + return -1; +#endif + if (!create_hard_link) { create_hard_link = (T) GetProcAddress( GetModuleHandle("kernel32.dll"), "CreateHardLinkA"); @@ -1197,8 +1217,9 @@ struct dirent *mingw_readdir(DIR *dir) if (dir->dd_handle == (long)INVALID_HANDLE_VALUE && dir->dd_stat == 0) { + DWORD lasterr; handle = FindFirstFileA(dir->dd_name, &buf); - DWORD lasterr = GetLastError(); + lasterr = GetLastError(); dir->dd_handle = (long)handle; if (handle == INVALID_HANDLE_VALUE && (lasterr != ERROR_NO_MORE_FILES)) { errno = err_win_to_posix(lasterr); @@ -1230,4 +1251,37 @@ struct dirent *mingw_readdir(DIR *dir) return (struct dirent*)&dir->dd_dir; } +#if defined(_MSC_VER) +DIR *opendir(const char *name) +{ + int len; + DIR *p; + p=(DIR*)malloc(sizeof(DIR)); + memset(p,0,sizeof(DIR)); + strncpy(p->dd_name,name,PATH_MAX); + len=strlen(p->dd_name); + p->dd_name[len]='/'; + p->dd_name[len+1]='*'; + + if(p==NULL) + return NULL; + + p->dd_handle=_findfirst(p->dd_name,&p->dd_dta); + + if(p->dd_handle == -1) + { + free(p); + return NULL; + } + return p; +} +int closedir(DIR *dir) +{ + _findclose(dir->dd_handle); + free(dir); + return 0; +} +#endif //_MSC_VER + #endif // !NO_MINGW_REPLACE_READDIR + diff --git a/compat/mingw.h b/compat/mingw.h index c1859c5..0eb2bc7 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -171,14 +171,31 @@ int mingw_getpagesize(void); /* Use mingw_lstat() instead of lstat()/stat() and * mingw_fstat() instead of fstat() on Windows. */ +#undef off_t #define off_t off64_t + +#ifdef _MSC_VER +#define stat(x,y) mingw_lstat(x,y) +#define stat _stat64 +#else #define stat _stati64 +#endif + +#undef lseek #define lseek _lseeki64 + int mingw_lstat(const char *file_name, struct stat *buf); int mingw_fstat(int fd, struct stat *buf); + +#undef fstat #define fstat mingw_fstat + +#undef lstat #define lstat mingw_lstat + +#ifndef _MSC_VER #define _stati64(x,y) mingw_lstat(x,y) +#endif int mingw_utime(const char *file_name, const struct utimbuf *times); #define utime mingw_utime @@ -197,7 +214,9 @@ sig_handler_t mingw_signal(int sig, sig_handler_t handler); /* * ANSI emulation wrappers */ - +#ifdef _MSC_VER +#define __attribute__(x) +#endif 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))); diff --git a/compat/regex/regex.c b/compat/regex/regex.c index 5ea0075..a291543 100644 --- a/compat/regex/regex.c +++ b/compat/regex/regex.c @@ -20,6 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* AIX requires this to be the first thing in the file. */ +#include "git-compat-util.h" + #if defined (_AIX) && !defined (REGEX_MALLOC) #pragma alloca #endif @@ -4852,11 +4854,7 @@ regexec (preg, string, nmatch, pmatch, eflags) from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (errcode, preg, errbuf, errbuf_size) - int errcode; - const regex_t *preg; - char *errbuf; - size_t errbuf_size; +regerror (int errcode, const regex_t * preg, char * errbuf,size_t errbuf_size) { const char *msg; size_t msg_size; diff --git a/compat/snprintf.c b/compat/snprintf.c index 6c0fb05..47b2b8a 100644 --- a/compat/snprintf.c +++ b/compat/snprintf.c @@ -6,7 +6,7 @@ * number of characters to write without the trailing NUL. */ #ifndef SNPRINTF_SIZE_CORR -#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ < 4 +#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ < 4 || defined(_MSC_VER) #define SNPRINTF_SIZE_CORR 1 #else #define SNPRINTF_SIZE_CORR 0 @@ -14,6 +14,11 @@ #endif #undef vsnprintf + +#if defined(_MSC_VER) +#define vsnprintf _vsnprintf +#endif + int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap) { char *s; diff --git a/compat/vcbuild/.gitignore b/compat/vcbuild/.gitignore new file mode 100644 index 0000000..7796990 --- /dev/null +++ b/compat/vcbuild/.gitignore @@ -0,0 +1,3 @@ +Debug +Release +*.user \ No newline at end of file diff --git a/compat/vcbuild/ReadMe b/compat/vcbuild/ReadMe new file mode 100644 index 0000000..47c089e --- /dev/null +++ b/compat/vcbuild/ReadMe @@ -0,0 +1,13 @@ +The Steps of Build Git with VS2008 + +1. Create VC Build Environment. + + git clone git://repo.or.cz/gitbuild.git + + gitbuild include VS solution file and library such as zlib. + +2. Get Submodule + + git submodule update + +3. Open gitbuild\gitbuild.sln with VS2008. Then press F7. \ No newline at end of file diff --git a/compat/vcbuild/git/git.vcproj b/compat/vcbuild/git/git.vcproj new file mode 100644 index 0000000..6f85de3 --- /dev/null +++ b/compat/vcbuild/git/git.vcproj @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/compat/vcbuild/include/dirent.h b/compat/vcbuild/include/dirent.h new file mode 100644 index 0000000..a6b6f4c --- /dev/null +++ b/compat/vcbuild/include/dirent.h @@ -0,0 +1,127 @@ +/* + * DIRENT.H (formerly DIRLIB.H) + * This file has no copyright assigned and is placed in the Public Domain. + * This file is a part of the mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within the package. + * + */ +#ifndef _DIRENT_H_ +#define _DIRENT_H_ + +/* All the headers include this file. */ +//#include <_mingw.h> + +#include + +#define PATH_MAX 512 + +#define __MINGW_NOTHROW + +#ifndef RC_INVOKED + +#ifdef __cplusplus +extern "C" { +#endif + +struct dirent +{ + long d_ino; /* Always zero. */ + unsigned short d_reclen; /* Always zero. */ + unsigned short d_namlen; /* Length of name in d_name. */ + char d_name[FILENAME_MAX]; /* File name. */ +}; + +/* + * This is an internal data structure. Good programmers will not use it + * except as an argument to one of the functions below. + * dd_stat field is now int (was short in older versions). + */ +typedef struct +{ + /* disk transfer area for this dir */ + struct _finddata_t dd_dta; + + /* dirent struct to return from dir (NOTE: this makes this thread + * safe as long as only one thread uses a particular DIR struct at + * a time) */ + struct dirent dd_dir; + + /* _findnext handle */ + long dd_handle; + + /* + * Status of search: + * 0 = not started yet (next entry to read is first entry) + * -1 = off the end + * positive = 0 based index of next entry + */ + int dd_stat; + + /* given path for dir with search pattern (struct is extended) */ + char dd_name[PATH_MAX+3]; +} DIR; + +DIR* __cdecl __MINGW_NOTHROW opendir (const char*); +struct dirent* __cdecl __MINGW_NOTHROW readdir (DIR*); +int __cdecl __MINGW_NOTHROW closedir (DIR*); +void __cdecl __MINGW_NOTHROW rewinddir (DIR*); +long __cdecl __MINGW_NOTHROW telldir (DIR*); +void __cdecl __MINGW_NOTHROW seekdir (DIR*, long); + + +/* wide char versions */ + +struct _wdirent +{ + long d_ino; /* Always zero. */ + unsigned short d_reclen; /* Always zero. */ + unsigned short d_namlen; /* Length of name in d_name. */ + wchar_t d_name[FILENAME_MAX]; /* File name. */ +}; + +/* + * This is an internal data structure. Good programmers will not use it + * except as an argument to one of the functions below. + */ +typedef struct +{ + /* disk transfer area for this dir */ + //struct _wfinddata_t dd_dta; + + /* dirent struct to return from dir (NOTE: this makes this thread + * safe as long as only one thread uses a particular DIR struct at + * a time) */ + struct _wdirent dd_dir; + + /* _findnext handle */ + long dd_handle; + + /* + * Status of search: + * 0 = not started yet (next entry to read is first entry) + * -1 = off the end + * positive = 0 based index of next entry + */ + int dd_stat; + + /* given path for dir with search pattern (struct is extended) */ + wchar_t dd_name[1]; +} _WDIR; + + + +_WDIR* __cdecl __MINGW_NOTHROW _wopendir (const wchar_t*); +struct _wdirent* __cdecl __MINGW_NOTHROW _wreaddir (_WDIR*); +int __cdecl __MINGW_NOTHROW _wclosedir (_WDIR*); +void __cdecl __MINGW_NOTHROW _wrewinddir (_WDIR*); +long __cdecl __MINGW_NOTHROW _wtelldir (_WDIR*); +void __cdecl __MINGW_NOTHROW _wseekdir (_WDIR*, long); + + +#ifdef __cplusplus +} +#endif + +#endif /* Not RC_INVOKED */ + +#endif /* Not _DIRENT_H_ */ diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h new file mode 100644 index 0000000..0c06957 --- /dev/null +++ b/compat/vcbuild/include/unistd.h @@ -0,0 +1,174 @@ +#ifndef _UNISTD_ +#define _UNISTD_ + +/*Configuration*/ + +#define NO_PREAD +#define NO_OPENSSL +#define NO_LIBGEN_H +#define NO_SYMLINK_HEAD +#define NO_IPV6 +#define NO_SETENV +#define NO_UNSETENV +#define NO_STRCASESTR +#define NO_STRLCPY +#define NO_MEMMEM +#define NO_C99_FORMAT +#define NO_STRTOUMAX +#define NO_MKDTEMP +#define NO_MKSTEMPS + +#define RUNTIME_PREFIX +#define NO_ST_BLOCKS_IN_STRUCT_STAT +#define NO_NSEC +#define USE_WIN32_MMAP +#define USE_NED_ALLOCATOR + +#define NO_REGEX + +#define NO_SYS_SELECT_H +#define NO_PTHEADS +#define HAVE_STRING_H 1 +#define STDC_HEADERS +#define NO_ICONV + +#define WINVER 0x0500 +#define _WIN32_WINNT 0x0500 +#define _WIN32_WINDOWS 0x0410 +#define _WIN32_IE 0x0700 +#define NTDDI_VERSION NTDDI_WIN2KSP1 +#define inline __inline +#define __inline__ __inline + +#define SNPRINTF_RETURNS_BOGUS + +#define SHA1_HEADER "mozilla-sha1\\sha1.h" + +#define ETC_GITCONFIG "%HOME%" + +#define NO_PTHREADS +#define NO_CURL + + +#define va_copy va_start +#define NO_STRTOUMAX +#define REGEX_MALLOC + + + + +/* Win32 define for porting git*/ + +#ifndef _MODE_T_ +#define _MODE_T_ +typedef unsigned short _mode_t; + +#ifndef _NO_OLDNAMES +typedef _mode_t mode_t; +#endif +#endif /* Not _MODE_T_ */ + +#ifndef _SSIZE_T_ +#define _SSIZE_T_ +typedef long _ssize_t; + +#ifndef _OFF_T_ +#define _OFF_T_ +typedef long _off_t; + +#ifndef _NO_OLDNAMES +typedef _off_t off_t; +#endif +#endif /* Not _OFF_T_ */ + + +#ifndef _NO_OLDNAMES +typedef _ssize_t ssize_t; +#endif +#endif /* Not _SSIZE_T_ */ + +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef short int16_t; +typedef unsigned short uint16_t; +typedef int int32_t; +typedef unsigned uint32_t; +typedef long long int64_t; +typedef unsigned long long uint64_t; + +typedef long long intmax_t; +typedef unsigned long long uintmax_t; + +typedef int64_t off64_t; + +#define STDOUT_FILENO 1 +#define STDERR_FILENO 2 + +/* Some defines for _access nAccessMode (MS doesn't define them, but + * it doesn't seem to hurt to add them). */ +#define F_OK 0 /* Check for file existence */ +/* Well maybe it does hurt. On newer versions of MSVCRT, an access mode + of 1 causes invalid parameter error. */ +#define X_OK 0 /* MS access() doesn't check for execute permission. */ +#define W_OK 2 /* Check for write permission */ +#define R_OK 4 /* Check for read permission */ + +#define _S_IFIFO 0x1000 /* FIFO */ +#define _S_IFCHR 0x2000 /* Character */ +#define _S_IFBLK 0x3000 /* Block: Is this ever set under w32? */ +#define _S_IFDIR 0x4000 /* Directory */ +#define _S_IFREG 0x8000 /* Regular */ + +#define _S_IFMT 0xF000 /* File type mask */ + +#define _S_IXUSR _S_IEXEC +#define _S_IWUSR _S_IWRITE +#define _S_IRUSR _S_IREAD +#define _S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) + +#define S_IFIFO _S_IFIFO +#define S_IFCHR _S_IFCHR +#define S_IFBLK _S_IFBLK +#define S_IFDIR _S_IFDIR +#define S_IFREG _S_IFREG +#define S_IFMT _S_IFMT +#define S_IEXEC _S_IEXEC +#define S_IWRITE _S_IWRITE +#define S_IREAD _S_IREAD +#define S_IRWXU _S_IRWXU +#define S_IXUSR _S_IXUSR +#define S_IWUSR _S_IWUSR +#define S_IRUSR _S_IRUSR + + +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) + +//#define S_IWGRP _S_IWGRP + + +#define GIT_EXEC_PATH "bin" +#define GIT_VERSION "1.6" +#define BINDIR "bin" +#define PREFIX "." +#define GIT_MAN_PATH "man" +#define GIT_INFO_PATH "info" +#define GIT_HTML_PATH "html" +#define DEFAULT_GIT_TEMPLATE_DIR "templates" + +#define NO_STRLCPY +#define NO_UNSETENV +#define NO_SETENV + +#define strdup _strdup +#define read _read +#define close _close +#define dup _dup +#define dup2 _dup2 +#define strncasecmp _strnicmp +#define strtoull _strtoui64 + +//#define lseek _lseek +//#define write vs_write +#endif \ No newline at end of file diff --git a/compat/vcbuild/include/utime.h b/compat/vcbuild/include/utime.h new file mode 100644 index 0000000..e69de29 diff --git a/compat/vcbuild/libgit/libgit.vcproj b/compat/vcbuild/libgit/libgit.vcproj new file mode 100644 index 0000000..06dcdef --- /dev/null +++ b/compat/vcbuild/libgit/libgit.vcproj @@ -0,0 +1,1347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/compat/vcbuild/porting.c b/compat/vcbuild/porting.c new file mode 100644 index 0000000..f9bd82d --- /dev/null +++ b/compat/vcbuild/porting.c @@ -0,0 +1,13 @@ +#include "stdio.h" +#include "STDARG.H" +#include +#include "dirent.h" +#include "unistd.h" + +int strcasecmp (const char *s1, const char *s2) +{ + int size1=strlen(s1); + int sisz2=strlen(s2); + + return _strnicmp(s1,s2,sisz2>size1?sisz2:size1); +} \ No newline at end of file diff --git a/compat/vcbuild/sys/param.h b/compat/vcbuild/sys/param.h new file mode 100644 index 0000000..e69de29 diff --git a/compat/vcbuild/sys/socket.h b/compat/vcbuild/sys/socket.h new file mode 100644 index 0000000..e69de29 diff --git a/compat/vcbuild/sys/time.h b/compat/vcbuild/sys/time.h new file mode 100644 index 0000000..6ed82c0 --- /dev/null +++ b/compat/vcbuild/sys/time.h @@ -0,0 +1,21 @@ +#ifndef _UTIME_H_ +#define _UTIME_H_ +/* + * Structure used by _utime function. + */ +struct _utimbuf +{ + time_t actime; /* Access time */ + time_t modtime; /* Modification time */ +}; + +#ifndef _NO_OLDNAMES +/* NOTE: Must be the same as _utimbuf above. */ +struct utimbuf +{ + time_t actime; + time_t modtime; +}; +#endif /* Not _NO_OLDNAMES */ + +#endif diff --git a/compat/winansi.c b/compat/winansi.c index 9217c24..6091138 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -3,7 +3,11 @@ */ #include +#ifdef _MSC_VER +#include +#else #include "../git-compat-util.h" +#endif /* Functions to be wrapped: @@ -310,9 +314,13 @@ static int winansi_vfprintf(FILE *stream, const char *format, va_list list) if (!console) goto abort; +#ifndef _MSC_VER va_copy(cp, list); len = vsnprintf(small_buf, sizeof(small_buf), format, cp); va_end(cp); +#else + len= sizeof(small_buf) ; +#endif if (len > sizeof(small_buf) - 1) { buf = malloc(len + 1); diff --git a/git-compat-util.h b/git-compat-util.h index 9f941e4..3b683e6 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -87,7 +87,7 @@ #include #include #include -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) #include #include #include diff --git a/help.c b/help.c index 6c46d8b..a311241 100644 --- a/help.c +++ b/help.c @@ -126,8 +126,8 @@ static int is_executable(const char *name) !S_ISREG(st.st_mode)) return 0; -#ifdef __MINGW32__ - /* cannot trust the executable bit, peek into the file instead */ +#if defined(__MINGW32__) || defined(_MSC_VER) +{ /* cannot trust the executable bit, peek into the file instead */ char buf[3] = { 0 }; int n; int fd = open(name, O_RDONLY); @@ -140,6 +140,7 @@ static int is_executable(const char *name) st.st_mode |= S_IXUSR; close(fd); } +} #endif return st.st_mode & S_IXUSR; } diff --git a/pager.c b/pager.c index 4921843..28122c5 100644 --- a/pager.c +++ b/pager.c @@ -9,7 +9,7 @@ static int spawned_pager; -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) static void pager_preexec(void) { /* @@ -70,7 +70,7 @@ void setup_pager(void) pager_argv[2] = pager; pager_process.argv = pager_argv; pager_process.in = -1; -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) pager_process.preexec_cb = pager_preexec; #endif if (start_command(&pager_process)) diff --git a/run-command.c b/run-command.c index ff3d8e2..1ea1c16 100644 --- a/run-command.c +++ b/run-command.c @@ -67,7 +67,7 @@ int start_command(struct child_process *cmd) trace_argv_printf(cmd->argv, "trace: run_command:"); -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) fflush(NULL); cmd->pid = fork(); if (!cmd->pid) { @@ -123,6 +123,7 @@ int start_command(struct child_process *cmd) exit(127); } #else +{ int s0 = -1, s1 = -1, s2 = -1; /* backups of stdin, stdout, stderr */ const char **sargv = cmd->argv; char **env = environ; @@ -186,6 +187,7 @@ int start_command(struct child_process *cmd) dup2(s1, 1), close(s1); if (s2 >= 0) dup2(s2, 2), close(s2); +} #endif if (cmd->pid < 0) { @@ -292,7 +294,8 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const return run_command(&cmd); } -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(_MSC_VER) +#define __stdcall static __stdcall unsigned run_thread(void *data) { struct async *async = data; @@ -308,7 +311,7 @@ int start_async(struct async *async) return error("cannot create pipe: %s", strerror(errno)); async->out = pipe_out[0]; -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) /* Flush stdio before fork() to avoid cloning buffers */ fflush(NULL); @@ -337,7 +340,7 @@ int start_async(struct async *async) int finish_async(struct async *async) { -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) int ret = 0; if (wait_or_whine(async->pid)) diff --git a/run-command.h b/run-command.h index e345502..57a707b 100644 --- a/run-command.h +++ b/run-command.h @@ -79,7 +79,7 @@ struct async { int (*proc)(int fd, void *data); void *data; int out; /* caller reads from here and closes it */ -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) pid_t pid; #else HANDLE tid; diff --git a/setup.c b/setup.c index e3781b6..14e3ca7 100644 --- a/setup.c +++ b/setup.c @@ -41,7 +41,7 @@ const char *prefix_path(const char *prefix, int len, const char *path) const char *prefix_filename(const char *pfx, int pfx_len, const char *arg) { static char path[PATH_MAX]; -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(_MSC_VER) if (!pfx || !*pfx || is_absolute_path(arg)) return arg; memcpy(path, pfx, pfx_len); -- 1.6.4.msysgit.0 ``` ## Johannes Schindelin, 2009-08-15 16:57 Subject: Re: Using VC build git (new patch) Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0908151851280.8306%40pacific.mpi-cbg.de In-Reply-To: <1976ea660908150921n516178dbs2ce024ed729e2e02@mail.gmail.com> ``` Hi, On Sun, 16 Aug 2009, Frank Li wrote: > New patch. A single monster patch? Hmm. Please understand that I will not review that unless it is split up into nice little and reviewable chunks. This diffstat does not let me expect well-defined changes, either, sorry: builtin-fast-export.c | 1 + compat/fnmatch/fnmatch.c | 2 + compat/mingw.c | 68 ++- compat/mingw.h | 21 +- compat/regex/regex.c | 8 +- compat/snprintf.c | 7 +- compat/vcbuild/.gitignore | 3 + compat/vcbuild/ReadMe | 13 + compat/vcbuild/git/git.vcproj | 197 +++++ compat/vcbuild/include/dirent.h | 127 ++++ compat/vcbuild/include/unistd.h | 174 +++++ compat/vcbuild/libgit/libgit.vcproj | 1347 +++++++++++++++++++++++++++++++++++ compat/vcbuild/porting.c | 13 + compat/vcbuild/sys/time.h | 21 + compat/winansi.c | 8 + git-compat-util.h | 2 +- help.c | 5 +- pager.c | 4 +- run-command.c | 11 +- run-command.h | 2 +- setup.c | 2 +- 21 files changed, 2011 insertions(+), 25 deletions(-) It still modifies mingw.c and mingw.h, even if it has been strongly suggested to leave those alone. It touches all kinds of files that appear to be completely unrelated to Microsoft Visual C++. Remember: breaking things for existing users (and changing something that works for them quite well readily risks that) is not an option. And the commit message does not even explain half of it... Ciao, Dscho ``` ## Johannes Schindelin, 2009-08-15 17:29 Subject: Re: Using VC build git (new patch) Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0908151908300.8306%40pacific.mpi-cbg.de In-Reply-To: ``` Hi, On Sat, 15 Aug 2009, Johannes Schindelin wrote: > A single monster patch? > > Hmm. > > Please understand that I will not review that unless it is split up into > nice little and reviewable chunks. Well, I try to improve. So I had a look at your patch. The changes fall naturally into one of the following categories: - decl-after-statement fixes - missing #include "git-compat-util.h" - converting a K&R style function definition to modern C - #undef's only needed for Microsoft Visual C++ - the addition of O_BINARY in the file modes - disabling link() (why?) - double-#define'ing stat (which puzzles me greatly) - dummy #define'ing of a few compiler attributes - adding _MSVC to a conditional to avoid #define'ing SNPRINTF_SIZE_CORR yourself - #define'ing several symbols without leading underscore to the MS-specific version with a leading underscore - implementing strcasecmp() in a misnamed file - "fixing" the return value of winansi_vfprintf for Microsoft Visual C++ (I think this fix is wrong) - correctly adding a Visual C++-specific conditional to git-compat-util.h, pager.c, run-command.c, run-command.h, setup.c and help.c, although the latter five could use some refactoring into git-compat-util.h Maybe there is also room to change the MinGW-conditional into a NO_TRUSTABLE_FILEMODE one - adding several headers missing from Visual C++'s installation - adding _huge_ .vcproj files (can they not be smaller?) As you can see, there is a pretty natural way to split that huge patch into chunks that most people on these lists can review easily, and that would actually be a pleasure to look at. Even better, there are a few fixes (the first three, if you ask me), which are not even Windows-specific. Further, I would like to suggest adding a header file compat/msvc.h which contains all the #undef's and #define's necessary only for Visual C++, and which can be #include'd from git-compat-util.h, to better separate your work from the other platforms (who do not want those changes). That should avoid those unwanted changes to mingw.c and mingw.h. You just have to make sure that msvc.h is #include'd before mingw.h. With these comments, I look forward to your next iteration. Ciao, Dscho ``` ## Frank Li, 2009-08-16 04:07 Subject: Re: Using VC build git (new patch) Message-ID: <1976ea660908152107s8b8f3e5l3c2f043fb3e4d62@mail.gmail.com> URL: https://gitlist.dev/e/1976ea660908152107s8b8f3e5l3c2f043fb3e4d62%40mail.gmail.com In-Reply-To: ``` 2009/8/16 Johannes Schindelin : > Hi, > > On Sat, 15 Aug 2009, Johannes Schindelin wrote: > >> A single monster patch? >> >> Hmm. >> >> Please understand that I will not review that unless it is split up into >> nice little and reviewable chunks. > > Well, I try to improve. > > So I had a look at your patch.  The changes fall naturally into one of the > following categories: > >        - decl-after-statement fixes > >        - missing #include "git-compat-util.h" > >        - converting a K&R style function definition to modern C > >        - #undef's only needed for Microsoft Visual C++ #undef ERROR is necessary. #undef in mingw.h is only for clean some warning. > >        - the addition of O_BINARY in the file modes Yes, default is text mode if no O_BINARY, _read _write will do union code and cr\cf convert. > >        - disabling link() (why?) VC report stack error. I also don't know why. I have not deep debug this problem. > >        - double-#define'ing stat (which puzzles me greatly) old define is #define stat stati64 #define stati64 msys_stati64. stat is used for both struct and function name. In C code: struct stat a; stat -> stati64 -> msys_stati64, so compiler report struct msys_stati64 have not defined. > >        - dummy #define'ing of a few compiler attributes > >        - adding _MSVC to a conditional to avoid  #define'ing >          SNPRINTF_SIZE_CORR yourself > >        - #define'ing several symbols without leading underscore to the >          MS-specific version with a leading underscore > >        - implementing strcasecmp() in a misnamed file > >        - "fixing" the return value of winansi_vfprintf for Microsoft >          Visual C++ (I think this fix is wrong) > >        - correctly adding a Visual C++-specific conditional to >          git-compat-util.h, pager.c, run-command.c, run-command.h, >          setup.c and help.c, although the latter five could use some >          refactoring into git-compat-util.h Do you means add #ifdef _MSC_VER #include git-compat-util.h #endif > >          Maybe there is also room to change the MinGW-conditional into a >          NO_TRUSTABLE_FILEMODE one > >        - adding several headers missing from Visual C++'s installation > >        - adding _huge_ .vcproj files (can they not be smaller?) It is created by VS2008. I think it is difficult to make smaller. > > As you can see, there is a pretty natural way to split that huge patch > into chunks that most people on these lists can review easily, and that > would actually be a pleasure to look at. > > Even better, there are a few fixes (the first three, if you ask me), which > are not even Windows-specific. > > Further, I would like to suggest adding a header file compat/msvc.h which > contains all the #undef's and #define's necessary only for Visual C++, and > which can be #include'd from git-compat-util.h, to better separate your > work from the other platforms (who do not want those changes).  That > should avoid those unwanted changes to mingw.c and mingw.h.  You just have > to make sure that msvc.h is #include'd before mingw.h. VC build will reuse msysgit work. I will reduce change to mingw.c and mingw.h But there are some problem at mingw.c and mingw.h 1. stat defination. Because both struct and function use the same name stat. 2. open need binary mode. 3. mingw.c use C99 style to break build at VC. 4. mingw.c use special DIR structure, So I need add open_dir in mingw.c. If I don't change mingw.c, I need copy it to new file totally. > > With these comments, I look forward to your next iteration. > > Ciao, > Dscho > > > > ``` ## Johannes Schindelin, 2009-08-16 08:38 Subject: Re: Using VC build git (new patch) Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0908161018370.8306%40pacific.mpi-cbg.de In-Reply-To: <1976ea660908152107s8b8f3e5l3c2f043fb3e4d62@mail.gmail.com> ``` Hi, [please quote only those parts that you actually reply to.] On Sun, 16 Aug 2009, Frank Li wrote: > 2009/8/16 Johannes Schindelin : > > >        - the addition of O_BINARY in the file modes > > Yes, default is text mode if no O_BINARY, _read _write will do union > code and cr\cf convert. As Git _never_ wants to open files in text mode, this is a change that can come _separately_ from your VC patches. It could even be considered a bug fix (MinGW's current GCC implies O_BINARY, but previous ones may not, and it is wrong of us to rely on this magic). > >        - disabling link() (why?) > > VC report stack error. I also don't know why. I have not deep debug this > problem. You should. What with Visual Studio's superior debugging capabilities, it should not be a problem. Right? > >        - double-#define'ing stat (which puzzles me greatly) > > old define is > #define stat stati64 > #define stati64 msys_stati64. Not exactly. #define stat _stati64 [...] #define _stati64(x,y) mingw_lstat(x,y) And even VC should handle that just fine. > stat is used for both struct and function name. > In C code: > struct stat a; > stat -> stati64 -> msys_stati64, so compiler report struct > msys_stati64 have not defined. It is a real pity that you did not inline your patch, and that I could not quote it as a consequence, because now we could discuss code properly: The original code was done on purpose as it is, to use the _stati64 struct (which allows long pointers, as Microsoft decided off_t was not good enough to represent 64 bit offsets). I could imagine that your patch breaks that for Visual C++. > >        - adding _huge_ .vcproj files (can they not be smaller?) > > It is created by VS2008. I think it is difficult to make smaller. Is there not some magic to make a compact export version? But maybe it is not that bad? I have 72 (out of 1730) files in my repository that are larger, gitk being the king. FWIW I would have loved it if _you_ defended the size of the file, instead of having to do it myself. > > Further, I would like to suggest adding a header file compat/msvc.h > > which contains all the #undef's and #define's necessary only for > > Visual C++, and which can be #include'd from git-compat-util.h, to > > better separate your work from the other platforms (who do not want > > those changes).  That should avoid those unwanted changes to mingw.c > > and mingw.h.  You just have to make sure that msvc.h is #include'd > > before mingw.h. > > VC build will reuse msysgit work. That is no question. We made it easy for you. > I will reduce change to mingw.c and mingw.h > But there are some problem at mingw.c and mingw.h > > 1. stat defination. Because both struct and function use the same name stat. That needs to be resolved somehow, and you would get _much_ more help if you had split your patch series properly and this was _one_ patch. > 2. open need binary mode. As I said, this can be a separate change. In my original reply I _implied_ that it is okay, and in this reply I elaborated on that (namely that it might be considered a bug fix). > 3. mingw.c use C99 style to break build at VC. The same applies here as to O_BINARY. > 4. mingw.c use special DIR structure, So I need add open_dir in mingw.c. No, you do not need to add that to mingw.c. MinGW does not need it. So it has no place in mingw.c. > If I don't change mingw.c, I need copy it to new file totally. NOOOO!!! You #include it after making sure that you have #undef'ed and #define'd whatever needs to, and in a separate file -- which is only referenced in the .vcproj -- you can implement whatever Visual C++ misses. > > With these comments, I look forward to your next iteration. > > > > Ciao, > > Dscho Please, please, PLEASE, do not quote things that you are not addressing. And please, please, PLEASE adher to Documentation/SubmittingPatches. Actually, the only thing SubmittingPatches does is spell out how to make things easier for reviewers, should you not know how to do so. Remember: the more time it takes me to cull the quoted parts of your mail, the more time it takes me to have a look at your patches, the more time it takes me to refer to your patch and make suggestions, the more am I inclined to spend my time elsewhere, doing something that is much more enjoyable. Ciao, Dscho ```