Browse Source

Just use xstrdup() in makepath()

master
sin 10 years ago
parent
commit
3639f1bbb4
1 changed files with 8 additions and 9 deletions
  1. +8
    -9
      noice.c

+ 8
- 9
noice.c View File

@@ -452,24 +452,23 @@ dentfree(struct entry *dents, int n)
char * char *
makepath(char *dir, char *name) makepath(char *dir, char *name)
{ {
char *path;
char path[PATH_MAX];


/* Handle absolute path */ /* Handle absolute path */
if (name[0] == '/') { if (name[0] == '/') {
path = xstrdup(name);
strlcpy(path, name, sizeof(path));
} else { } else {
path = xmalloc(PATH_MAX);
/* Handle root case */ /* Handle root case */
if (strcmp(dir, "/") == 0) { if (strcmp(dir, "/") == 0) {
strlcpy(path, "/", PATH_MAX);
strlcat(path, name, PATH_MAX);
strlcpy(path, "/", sizeof(path));
strlcat(path, name, sizeof(path));
} else { } else {
strlcpy(path, dir, PATH_MAX);
strlcat(path, "/", PATH_MAX);
strlcat(path, name, PATH_MAX);
strlcpy(path, dir, sizeof(path));
strlcat(path, "/", sizeof(path));
strlcat(path, name, sizeof(path));
} }
} }
return path;
return xstrdup(path);
} }


/* Return the position of the matching entry or 0 otherwise */ /* Return the position of the matching entry or 0 otherwise */


Loading…
Cancel
Save