chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: inline trivial auto-cleanup functions
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 39f77f64540eec6595f46b9d86a2d8a5b2f46f3a..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);
@@
-181,6
+182,7
@@
char **path_strv_canonicalize(char **l) {
t = path_make_absolute_cwd(*s);
free(*s);
t = path_make_absolute_cwd(*s);
free(*s);
+ *s = NULL;
if (!t) {
enomem = true;
if (!t) {
enomem = true;
@@
-189,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;
}
@@
-209,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) {
@@
-264,12
+260,12
@@
char *path_kill_slashes(char *path) {
return path;
}
return path;
}
-
bool
path_startswith(const char *path, const char *prefix) {
+
char*
path_startswith(const char *path, const char *prefix) {
assert(path);
assert(prefix);
if ((path[0] == '/') != (prefix[0] == '/'))
assert(path);
assert(prefix);
if ((path[0] == '/') != (prefix[0] == '/'))
- return
false
;
+ return
NULL
;
for (;;) {
size_t a, b;
for (;;) {
size_t a, b;
@@
-278,19
+274,19
@@
bool path_startswith(const char *path, const char *prefix) {
prefix += strspn(prefix, "/");
if (*prefix == 0)
prefix += strspn(prefix, "/");
if (*prefix == 0)
- return
true
;
+ return
(char*) path
;
if (*path == 0)
if (*path == 0)
- return
false
;
+ return
NULL
;
a = strcspn(path, "/");
b = strcspn(prefix, "/");
if (a != b)
a = strcspn(path, "/");
b = strcspn(prefix, "/");
if (a != b)
- return
false
;
+ return
NULL
;
if (memcmp(path, prefix, a) != 0)
if (memcmp(path, prefix, a) != 0)
- return
false
;
+ return
NULL
;
path += a;
prefix += b;
path += a;
prefix += b;
@@
-349,8
+345,8
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
- if (errno == ENOTSUP)
- /* This file system does not support
+ if (errno == ENO
SYS || errno == ENO
TSUP)
+ /* This
kernel or
file system does not support
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
goto fallback;
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
goto fallback;
@@
-387,8
+383,12
@@
fallback:
else
r = lstat(t, &a);
else
r = lstat(t, &a);
- if (r < 0)
+ if (r < 0) {
+ if (errno == ENOENT)
+ return 0;
+
return -errno;
return -errno;
+ }
r = path_get_parent(t, &parent);
if (r < 0)
r = path_get_parent(t, &parent);
if (r < 0)