Skip to contentSkip to conversation

compat/mkdtemp.c: patch for gitmkdtemp() compatibility implementation

PATCH Filippo Negroni 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore

Filippo Negroni

author
#0 lore raw

Dear all,

I noticed that the current implementation of mkdtemp() in the compat/ directory does not seem to be correct.

gitmkdtemp() is needed for platforms such as Solaris 9 and 10 which do not implement mkdtemp().

The current implementation (compat/mkdtemp.c):

----
char *gitmkdtemp(char *template)

{
       if (!mktemp(template) || mkdir(template, 0700))
               return NULL;
       return template;
}

----

seems to be testing the return value of mktemp incorrectly.

mktemp() always returns the argument 'template', even on failure.

This is an extract from Solaris's mktemp(2) manual page:

RETURN VALUES
The mktemp() function will assign to template the empty string if it cannot create a unique name.

Upon failure, 'template' is set to an empty string, i.e., it's first character is '\0'.

The fixed implementation should read:

----
char *gitmkdtemp(char *template)

{
       if (!*mktemp(template) || mkdir(template, 0700))
               return NULL;
       return template;
}

----

I.e., simply add the pointer dereference operator when calling mktemp().

I have attached a patch against the most current git repo, branch master.

Please let me know if you need the patch in any other way.

Quoted 1 line

From 00b2a96d93d801d06eb710bc03b3e4804d3583ec Mon Sep 17 00:00:00 2001

From: Filippo Negroni <[email protected]>
Date: Thu, 25 Feb 2010 08:39:35 +0000
Subject: [PATCH] Fixed return value check for mkdtemp implementation.

mktemp() returns an 'empty' string, not a NULL pointer.

---
 compat/mkdtemp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
compat/mkdtemp.c +1 -1
index 34d4b49..1136119 100644
@@ -2,7 +2,7 @@
 
 char *gitmkdtemp(char *template)
 {
-	if (!mktemp(template) || mkdir(template, 0700))
+	if (!*mktemp(template) || mkdir(template, 0700))
 		return NULL;
 	return template;
 }
Signature · 1 line
1.6.4