chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
job: print the "OK" status messages in normal green
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index ae12c05317f4d34a4f3ae74a52afa46ac3f38e07..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,7
+191,6
@@
char **path_strv_canonicalize(char **l) {
errno = 0;
u = canonicalize_file_name(t);
errno = 0;
u = canonicalize_file_name(t);
-
if (!u) {
if (errno == ENOENT)
u = t;
if (!u) {
if (errno == ENOENT)
u = t;
@@
-201,7
+201,8
@@
char **path_strv_canonicalize(char **l) {
continue;
}
continue;
}
- }
+ } else
+ free(t);
l[k++] = u;
}
l[k++] = u;
}
@@
-214,6
+215,16
@@
char **path_strv_canonicalize(char **l) {
return l;
}
return l;
}
+char **path_strv_canonicalize_uniq(char **l) {
+ if (strv_isempty(l))
+ return l;
+
+ if (!path_strv_canonicalize(l))
+ return NULL;
+
+ return strv_uniq(l);
+}
+
char *path_kill_slashes(char *path) {
char *f, *t;
bool slash = false;
char *path_kill_slashes(char *path) {
char *f, *t;
bool slash = false;