From: sin <sin@2f30.org>
Date: Wed, 6 Jan 2016 15:53:04 +0000 (+0000)
Subject: Avoid unneeded memory allocation in xdirname()
X-Git-Tag: v1.0~92^2~25
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=fa6b45a96de53621d4e89bd63ee810210712f043;p=nnn.git

Avoid unneeded memory allocation in xdirname()
---

diff --git a/noice.c b/noice.c
index ada28fcb..50674243 100644
--- a/noice.c
+++ b/noice.c
@@ -158,21 +158,17 @@ xstrdup(const char *s)
 char *
 xdirname(const char *path)
 {
-	char *p, *tmp;
+	char tmp[PATH_MAX], *p;
 
 	/* Some implementations of dirname(3) may modify `path' and some
 	 * return a pointer inside `path' and we cannot free(3) the
 	 * original string if we lose track of it. */
-	tmp = xstrdup(path);
+	strlcpy(tmp, path, sizeof(tmp));
 	p = dirname(tmp);
-	if (p == NULL) {
-		free(tmp);
+	if (p == NULL)
 		printerr(1, "dirname");
-	}
 	/* Make sure this is a malloc(3)-ed string */
-	p = xstrdup(p);
-	free(tmp);
-	return p;
+	return xstrdup(p);
 }
 
 void