[PATCH] Improved error messages when temporary file creation fails
- From
Arnout Engelen <arnouten@bzzt.net>
- Date
- Dec 7, 2010, 18:16 UTC
- Message-ID
- <20101207181633.GF25767@bzzt.net>
This patch has been submitted/discussed before, but that version doesn't apply cleanly to the newest git anymore, so here's an updated version.
It improves diagnostic error messages when creating a temporary file fails.
Signed-off-by: Arnout Engelen <arnouten@bzzt.net> --- Makefile | 1 + t/t0070-fundamental.sh | 13 +++++++++++++ test-mktemp.c | 16 ++++++++++++++++ wrapper.c | 29 +++++++++++++++++++++++++---- wrapper.h | 4 ++++ 5 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 test-mktemp.c create mode 100644 wrapper.h
diff --git a/Makefile b/Makefile index 7a5fb69..10cfab2 100644 --- a/Makefile +++ b/Makefile @@ -434,6 +434,7 @@ TEST_PROGRAMS_NEED_X += test-string-pool TEST_PROGRAMS_NEED_X += test-svn-fe TEST_PROGRAMS_NEED_X += test-treap TEST_PROGRAMS_NEED_X += test-index-version +TEST_PROGRAMS_NEED_X += test-mktemp TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X)) diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh index 680d7d6..9bee8bf 100755 --- a/t/t0070-fundamental.sh +++ b/t/t0070-fundamental.sh @@ -12,4 +12,17 @@ test_expect_success 'character classes (isspace, isalpha etc.)' ' test-ctype ' +test_expect_success 'mktemp to nonexistent directory prints filename' ' + test_must_fail test-mktemp doesnotexist/testXXXXXX 2>err && + grep "doesnotexist/test" err +' + +test_expect_success POSIXPERM 'mktemp to unwritable directory prints filename' ' + mkdir cannotwrite && + chmod -w cannotwrite && + test_when_finished "chmod +w cannotwrite" && + test_must_fail test-mktemp cannotwrite/testXXXXXX 2>err && + grep "cannotwrite/test" err +' + test_done diff --git a/test-mktemp.c b/test-mktemp.c new file mode 100644 index 0000000..d392fa7 --- /dev/null +++ b/test-mktemp.c @@ -0,0 +1,16 @@ +/* + * test-mktemp.c: code to exercise the creation of temporary files + */ +#include <string.h> +#include "git-compat-util.h" +#include "wrapper.h" + +int main(int argc, char *argv[]) +{ + if (argc != 2) { + usage("Expected 1 parameter defining the temporary file template"); + } + xmkstemp(strdup(argv[1])); + + return 0; +} diff --git a/wrapper.c b/wrapper.c index 4c1639f..6640c87 100644 --- a/wrapper.c +++ b/wrapper.c @@ -2,6 +2,7 @@ * Various trivial helper wrappers around standard functions */ #include "cache.h" +#include "wrapper.h" static void do_nothing(size_t size) { @@ -196,10 +197,20 @@ FILE *xfdopen(int fd, const char *mode) int xmkstemp(char *template) { int fd; + char origtemplate[255]; + strlcpy(origtemplate, template, 255); fd = mkstemp(template); - if (fd < 0) - die_errno("Unable to create temporary file"); + if (fd < 0) { + if (!template[0]) + template = origtemplate; + + if (is_absolute_path(template)) + die_errno("Unable to create temporary file '%s'", template); + else + die_errno("Unable to create temporary file '%s' at %s", + template, getcwd(NULL, 0)); + } return fd; } @@ -319,10 +330,20 @@ int gitmkstemps(char *pattern, int suffix_len) int xmkstemp_mode(char *template, int mode) { int fd; + char origtemplate[255]; + strlcpy(origtemplate, template, 255); fd = git_mkstemp_mode(template, mode); - if (fd < 0) - die_errno("Unable to create temporary file"); + if (fd < 0) { + if (!template[0]) + template = origtemplate; + + if (is_absolute_path(template)) + die_errno("Unable to create temporary file '%s'", template); + else + die_errno("Unable to create temporary file '%s' at %s", + template, getcwd(NULL, 0)); + } return fd; } diff --git a/wrapper.h b/wrapper.h new file mode 100644 index 0000000..b06ff0d --- /dev/null +++ b/wrapper.h @@ -0,0 +1,4 @@ +/* + * Various trivial helper wrappers around standard functions + */ +int xmkstemp(char *template);
-- 1.7.2.3