chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: reuse more code
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index dd12d3d63409654fb446028ba92a0860bc83e4c1..0b50ea646aa984a3a1a64b15946f438ac17527e1 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-135,7
+135,8
@@
char *path_make_absolute_cwd(const char *p) {
if (path_is_absolute(p))
return strdup(p);
if (path_is_absolute(p))
return strdup(p);
- if (!(cwd = get_current_dir_name()))
+ cwd = get_current_dir_name();
+ if (!cwd)
return NULL;
r = path_make_absolute(p, cwd);
return NULL;
r = path_make_absolute(p, cwd);
@@
-190,14
+191,18
@@
char **path_strv_canonicalize(char **l) {
errno = 0;
u = canonicalize_file_name(t);
errno = 0;
u = canonicalize_file_name(t);
- free(t);
-
if (!u) {
if (!u) {
- if (errno == ENOMEM || !errno)
- enomem = true;
-
- continue;
- }
+ if (errno == ENOENT)
+ u = t;
+ else {
+ free(t);
+ if (errno == ENOMEM || !errno)
+ enomem = true;
+
+ continue;
+ }
+ } else
+ free(t);
l[k++] = u;
}
l[k++] = u;
}
@@
-210,24
+215,14
@@
char **path_strv_canonicalize(char **l) {
return l;
}
return l;
}
-char **path_strv_remove_empty(char **l) {
- char **f, **t;
+char **path_strv_canonicalize_uniq(char **l) {
+ if (strv_isempty(l))
+ return l;
- if (!
l
)
+ if (!
path_strv_canonicalize(l)
)
return NULL;
return NULL;
- for (f = t = l; *f; f++) {
-
- if (dir_is_empty(*f) > 0) {
- free(*f);
- continue;
- }
-
- *(t++) = *f;
- }
-
- *t = NULL;
- return l;
+ return strv_uniq(l);
}
char *path_kill_slashes(char *path) {
}
char *path_kill_slashes(char *path) {