user/sven/git.git/compat, branch v1.5.6.4

compat/fopen.c: avoid clobbering the system defined fopen macro

2008-05-09T00:43:01Z

Some systems define fopen as a macro based on compiler settings. The previous technique for reverting to the system fopen function by merely undefining fopen is inadequate in this case. Instead, avoid defining fopen entirely when compiling this source file. Signed-off-by: Brandon Casey Tested-by: Mike Ralphson Signed-off-by: Junio C Hamano

Add compat/snprintf.c for systems that return bogus

2008-03-05T21:12:07Z

Some systems (namely HPUX and Windows) return -1 when maxsize in snprintf() and in vsnprintf() is reached. So replace snprintf() and vsnprintf() functions with our own ones that return correct value upon overflow. [jc: verified that review comments by J6t have been incorporated, and tightened the check to verify the resulting buffer contents, suggested by Wayne Davison] Signed-off-by: Michal Rokos Signed-off-by: Junio C Hamano

Merge branch 'bc/fopen'

2008-02-21T00:13:19Z

* bc/fopen: Add compat/fopen.c which returns NULL on attempt to open directory

Add compat/fopen.c which returns NULL on attempt to open directory

2008-02-12T02:25:10Z

Some systems do not fail as expected when fread et al. are called on a directory stream. Replace fopen on such systems which will fail when the supplied path is a directory. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

compat: Add simplified merge sort implementation from glibc

2008-02-07T06:35:28Z

qsort in Windows 2000 (and various other C libraries) is a Quicksort with the usual O(n^2) worst case. Unfortunately, sorting Git trees seems to get very close to that worst case quite often: $ /git/gitbad runstatus # On branch master qsort, nmemb = 30842 done, 237838087 comparisons. This patch adds a simplified version of the merge sort that is glibc's qsort(3). As a merge sort, this needs a temporary array equal in size to the array that is to be sorted, but has a worst-case performance of O(n log n). The complexity that was removed is: * Doing direct stores for word-size and -aligned data. * Falling back to quicksort if the allocation required to perform the merge sort would likely push the machine into swap. Even with these simplifications, this seems to outperform the Windows qsort(3) implementation, even in Windows XP (where it is "fixed" and doesn't trigger O(n^2) complexity on trees). [jes: moved into compat/qsort.c, as per Johannes Sixt's suggestion] [bcd: removed gcc-ism, thanks to Edgar Toernig. renamed make variable per Junio's comment.] Signed-off-by: Brian Downing Signed-off-by: Steffen Prohaska Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-11-06T06:03:47Z

* maint: Remove a couple of duplicated include grep with unmerged index git-daemon: fix remote port number in log entry git-svn: t9114: verify merge commit message in test git-svn: fix dcommit clobbering when committing a series of diffs

Remove a couple of duplicated include

2007-11-06T04:50:38Z

Signed-off-by: Marco Costalba Signed-off-by: Junio C Hamano

Define compat version of mkdtemp for systems lacking it

2007-10-21T02:52:21Z

Solaris 9 doesn't have mkdtemp() so we need to emulate it for the rsync transport implementation. Since Solaris 9 is lacking this function we can also reasonably assume it is not available on Solaris 8 either. The new Makfile definition NO_MKDTEMP can be set to enable the git compat version. Signed-off-by: Shawn O. Pearce

add memmem()

2007-09-07T05:46:00Z

memmem() is a nice GNU extension for searching a length limited string in another one. This compat version is based on the version found in glibc 2.2 (GPL 2); I only removed the optimization of checking the first char by hand, and generally tried to keep the code simple. We can add it back if memcmp shows up high in a profile, but for now I prefer to keep it (almost trivially) simple. Since I don't really know which platforms beside those with a glibc have their own memmem(), I used a heuristic: if NO_STRCASESTR is set, then NO_MEMMEM is set, too. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'maint' to sync with GIT 1.5.2.2

2007-06-16T08:22:10Z