mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add xdirname() again and give dirname(3) another chance

Browse source
This commit is contained in:
lostd 2014-10-22 17:02:15 +03:00
parent 577e0284a1
commit 36cf4136b5
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
noice.c
View file

@ -118,6 +118,25 @@ xrealpath(const char *path)
return p;
}
char *
xdirname(const char *path)
{
char *p, *tmp;
/* 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);
p = dirname(tmp);
free(tmp);
if (p == NULL)
printerr(1, "dirname");
/* Make sure this is a malloc(3)-ed string */
p = xstrdup(p);
return p;
}
void
spawn(const char *file, const char *arg)
{
@ -532,7 +551,7 @@ nochange:
if (strcmp(path, "/") == 0) {
goto nochange;
} else {
dir = dirname(path);
dir = xdirname(path);
tmp = xmalloc(strlen(dir) + 1);
strlcpy(tmp, dir, strlen(dir) + 1);
free(path);