From: sin <sin@2f30.org>
Date: Wed, 22 Oct 2014 13:44:16 +0000 (+0100)
Subject: Remove xdirname()
X-Git-Tag: v1.0~92^2~174
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=577e0284a11f675b7b9845da7e3a8006905b4fcf;p=nnn.git

Remove xdirname()

dirname(3) should be shot to death.
---

diff --git a/noice.c b/noice.c
index ff11b2f2..7a6d6751 100644
--- a/noice.c
+++ b/noice.c
@@ -118,20 +118,6 @@ xrealpath(const char *path)
 	return p;
 }
 
-char *
-xdirname(const char *path)
-{
-	char *p, *tmp;
-
-	/* Some implementations of dirname(3) may modify `path' */
-	tmp = xstrdup(path);
-	p = dirname(tmp);
-	free(tmp);
-	if (p == NULL)
-		printerr(1, "dirname");
-	return p;
-}
-
 void
 spawn(const char *file, const char *arg)
 {
@@ -546,7 +532,7 @@ nochange:
 			if (strcmp(path, "/") == 0) {
 				goto nochange;
 			} else {
-				dir = xdirname(path);
+				dir = dirname(path);
 				tmp = xmalloc(strlen(dir) + 1);
 				strlcpy(tmp, dir, strlen(dir) + 1);
 				free(path);