瀏覽代碼

Add xdirname() to avoid quirks with dirname(3)

master
sin 10 年之前
父節點
當前提交
75143cd93e
共有 1 個檔案被更改,包括 17 行新增3 行删除
  1. +17
    -3
      noice.c

+ 17
- 3
noice.c 查看文件

@@ -108,16 +108,30 @@ xstrdup(const char *s)
}

char *
xrealpath(const char *pathname)
xrealpath(const char *path)
{
char *p;

p = realpath(pathname, NULL);
p = realpath(path, NULL);
if (p == NULL)
printerr(1, "realpath");
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)
{
@@ -533,7 +547,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);


Loading…
取消
儲存