Merge branch 'ae/better-template-failure-report' into maint

* ae/better-template-failure-report:
Improve error messages when temporary file creation fails

diff --combined Makefile
index 775ee838c332c7311df34a98448fc3723c6bd95e,03a51cb8f2d4d9d63a9350e794d4ce6e463c7ee1..ade79232f4c3c080fa7d35c4b55870c416e49da6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -431,10 -431,10 +431,11 @@@ TEST_PROGRAMS_NEED_X += test-run-comman
  TEST_PROGRAMS_NEED_X += test-sha1
  TEST_PROGRAMS_NEED_X += test-sigchain
  TEST_PROGRAMS_NEED_X += test-string-pool
 +TEST_PROGRAMS_NEED_X += test-subprocess
  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))
  
@@@ -1004,7 -1004,6 +1005,7 @@@ ifeq ($(uname_S),IRIX
        # issue, comment out the NO_MMAP statement.
        NO_MMAP = YesPlease
        NO_REGEX = YesPlease
 +      NO_FNMATCH_CASEFOLD = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease
        SHELL_PATH = /usr/gnu/bin/bash
        NEEDS_LIBGEN = YesPlease
@@@ -1024,7 -1023,6 +1025,7 @@@ ifeq ($(uname_S),IRIX64
        # issue, comment out the NO_MMAP statement.
        NO_MMAP = YesPlease
        NO_REGEX = YesPlease
 +      NO_FNMATCH_CASEFOLD = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease
        SHELL_PATH=/usr/gnu/bin/bash
        NEEDS_LIBGEN = YesPlease

diff --combined wrapper.c
index 79635f2e1628a1ac25d62ca502c9ee4d0a2b61d6,55b074ec46b0a222b03f8bea42f4d5cdd9811293..4c147d6c48c000bab636fad3edc2fe7da6670948
--- 1/wrapper.c
--- 2/wrapper.c
+++ b/wrapper.c
@@@ -53,7 -53,7 +53,7 @@@ void *xmalloc(size_t size
  void *xmallocz(size_t size)
  {
        void *ret;
 -      if (size + 1 < size)
 +      if (unsigned_add_overflows(size, 1))
                die("Data too large to fit into virtual memory space.");
        ret = xmalloc(size + 1);
        ((char*)ret)[size] = 0;
@@@ -198,10 -198,22 +198,22 @@@ FILE *xfdopen(int fd, const char *mode
  int xmkstemp(char *template)
  {
        int fd;
+       char origtemplate[PATH_MAX];
+       strlcpy(origtemplate, template, sizeof(origtemplate));
  
        fd = mkstemp(template);
-       if (fd < 0)
-               die_errno("Unable to create temporary file");
+       if (fd < 0) {
+               int saved_errno = errno;
+               const char *nonrelative_template;
+ 
+               if (!template[0])
+                       template = origtemplate;
+ 
+               nonrelative_template = make_nonrelative_path(template);
+               errno = saved_errno;
+               die_errno("Unable to create temporary file '%s'",
+                       nonrelative_template);
+       }
        return fd;
  }
  
@@@ -321,10 -333,22 +333,22 @@@ int gitmkstemps(char *pattern, int suff
  int xmkstemp_mode(char *template, int mode)
  {
        int fd;
+       char origtemplate[PATH_MAX];
+       strlcpy(origtemplate, template, sizeof(origtemplate));
  
        fd = git_mkstemp_mode(template, mode);
-       if (fd < 0)
-               die_errno("Unable to create temporary file");
+       if (fd < 0) {
+               int saved_errno = errno;
+               const char *nonrelative_template;
+ 
+               if (!template[0])
+                       template = origtemplate;
+ 
+               nonrelative_template = make_nonrelative_path(template);
+               errno = saved_errno;
+               die_errno("Unable to create temporary file '%s'",
+                       nonrelative_template);
+       }
        return fd;
  }