Re: [PATCH 1/2] git_mkstemps: correctly test return value of open()
From: Dale R. Worley <hidden>
Date: 2016-06-15 22:58:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/2] git_mkstemps: correctly test return value of open() · Drew Northup <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git_mkstemps: correctly test return value of open() · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git_mkstemps: correctly test return value of open() · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git_mkstemps: correctly test return value of open() · Dale R. Worley <hidden>
- 2016-06-15 · Re: [PATCH 1/2] git_mkstemps: correctly test return value of open() · Eric Sunshine <hidden>
From: Junio C Hamano <redacted> That's just a plain-vanilla part of POSIX shell behaviour, no? http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_05
"Close standard input" is so weird I never thought it was Posix. In that case, we can eliminate the C helper program:
diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
index 986b2a8..d427f3a 100755
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh@@ -25,6 +25,13 @@ test_expect_success POSIXPERM,SANITY 'mktemp to unwritable directory prints file grep "cannotwrite/test" err ' +test_expect_success 'git_mkstemps_mode does not fail if fd 0 is not open' ' + git init && + echo Test. >test-file && + git add test-file && + git commit -m Message. <&- +' + test_expect_success 'check for a bug in the regex routines' ' # if this test fails, re-build git with NO_REGEX=1 test-regex
diff --git a/wrapper.c b/wrapper.c
index dd7ecbb..6a015de 100644
--- a/wrapper.c
+++ b/wrapper.c@@ -322,7 +322,7 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode) template[5] = letters[v % num_letters]; v /= num_letters; fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode); - if (fd > 0) + if (fd >= 0) return fd; /* * Fatal error (EPERM, ENOSPC etc).
Is this a sensible place to put this test? Dale