Re: write() _will_ fail on Mac OS X/XNU if nbytes > INT_MAX
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 10, 2013, 23:10 UTC
- Message-ID
- <7v38tuzb0m.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7va9o2zba9.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Also I have a small suggestion I'd like you to try on top of it, > which I'll be sending in a separate message.
The first hunk is to match other Makefile knobs the builders can tweak with minimum documentation.
As you hinted that there may be other platforms that may want to use the clipped-write, I would prefer to see this file _not_ directly include any system headers, but let git-compat-util.h to absorb platform differences instead.
Of course, inside this file, we do need to use the underlying write(2), so immediately after including the header, we #undef write so that this compilation unit will make a call to the platform implementation of the function.
I do not expect the follow-up patch to Makefile to cause any problem, but I'd like to see the change to compat/clipped-write.c double checked on a real Mac OS X system, so that we can squash this patch into your original.
Thanks.
Makefile | 3 +++ compat/clipped-write.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index 7076b15..0434715 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,9 @@ all:: # Define NO_MSGFMT_EXTENDED_OPTIONS if your implementation of msgfmt # 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 # it specifies. # diff --git a/compat/clipped-write.c b/compat/clipped-write.c index 9183698..b8f98ff 100644 --- a/compat/clipped-write.c +++ b/compat/clipped-write.c @@ -1,5 +1,5 @@ -#include <limits.h> -#include <unistd.h> +#include "../git-compat-util.h" +#undef write /* * Version of write that will write at most INT_MAX bytes.