Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"
This reverts commit 6c642a8786
.
The previous commit introduced a size limit on IO chunks on all
platforms. The compat clipped_write() is not needed anymore.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0b6806b9e4
commit
a487916dd5
8
Makefile
8
Makefile
@ -69,9 +69,6 @@ all::
|
|||||||
# Define NO_MSGFMT_EXTENDED_OPTIONS if your implementation of msgfmt
|
# Define NO_MSGFMT_EXTENDED_OPTIONS if your implementation of msgfmt
|
||||||
# doesn't support GNU extensions like --check and --statistics
|
# doesn't support GNU extensions like --check and --statistics
|
||||||
#
|
#
|
||||||
# Define NEEDS_CLIPPED_WRITE if your write(2) cannot write more than
|
|
||||||
# INT_MAX bytes at once (e.g. MacOS X).
|
|
||||||
#
|
|
||||||
# Define HAVE_PATHS_H if you have paths.h and want to use the default PATH
|
# Define HAVE_PATHS_H if you have paths.h and want to use the default PATH
|
||||||
# it specifies.
|
# it specifies.
|
||||||
#
|
#
|
||||||
@ -1493,11 +1490,6 @@ ifndef NO_MSGFMT_EXTENDED_OPTIONS
|
|||||||
MSGFMT += --check --statistics
|
MSGFMT += --check --statistics
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NEEDS_CLIPPED_WRITE
|
|
||||||
BASIC_CFLAGS += -DNEEDS_CLIPPED_WRITE
|
|
||||||
COMPAT_OBJS += compat/clipped-write.o
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (,$(XDL_FAST_HASH))
|
ifneq (,$(XDL_FAST_HASH))
|
||||||
BASIC_CFLAGS += -DXDL_FAST_HASH
|
BASIC_CFLAGS += -DXDL_FAST_HASH
|
||||||
endif
|
endif
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#include "../git-compat-util.h"
|
|
||||||
#undef write
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Version of write that will write at most INT_MAX bytes.
|
|
||||||
* Workaround a xnu bug on Mac OS X
|
|
||||||
*/
|
|
||||||
ssize_t clipped_write(int fildes, const void *buf, size_t nbyte)
|
|
||||||
{
|
|
||||||
if (nbyte > INT_MAX)
|
|
||||||
nbyte = INT_MAX;
|
|
||||||
return write(fildes, buf, nbyte);
|
|
||||||
}
|
|
@ -95,7 +95,6 @@ ifeq ($(uname_S),Darwin)
|
|||||||
NO_MEMMEM = YesPlease
|
NO_MEMMEM = YesPlease
|
||||||
USE_ST_TIMESPEC = YesPlease
|
USE_ST_TIMESPEC = YesPlease
|
||||||
HAVE_DEV_TTY = YesPlease
|
HAVE_DEV_TTY = YesPlease
|
||||||
NEEDS_CLIPPED_WRITE = YesPlease
|
|
||||||
COMPAT_OBJS += compat/precompose_utf8.o
|
COMPAT_OBJS += compat/precompose_utf8.o
|
||||||
BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
|
BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
|
||||||
endif
|
endif
|
||||||
|
@ -185,11 +185,6 @@ typedef unsigned long uintptr_t;
|
|||||||
#define probe_utf8_pathname_composition(a,b)
|
#define probe_utf8_pathname_composition(a,b)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef NEEDS_CLIPPED_WRITE
|
|
||||||
ssize_t clipped_write(int fildes, const void *buf, size_t nbyte);
|
|
||||||
#define write(x,y,z) clipped_write((x),(y),(z))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MKDIR_WO_TRAILING_SLASH
|
#ifdef MKDIR_WO_TRAILING_SLASH
|
||||||
#define mkdir(a,b) compat_mkdir_wo_trailing_slash((a),(b))
|
#define mkdir(a,b) compat_mkdir_wo_trailing_slash((a),(b))
|
||||||
extern int compat_mkdir_wo_trailing_slash(const char*, mode_t);
|
extern int compat_mkdir_wo_trailing_slash(const char*, mode_t);
|
||||||
|
Loading…
Reference in New Issue
Block a user