X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fpath-util.c;h=fc42a704b7fd77742da60639333e848452e90d6b;hp=2dddc8f2f689001e4b5dbd8dab206a9c01d5b508;hb=c50e4f95d8cfcd21bde2b0d1ff24b4de8fef4976;hpb=1640a0b6b05b8ae01abbe5939f86f17a61e7998f diff --git a/src/shared/path-util.c b/src/shared/path-util.c index 2dddc8f2f..fc42a704b 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -45,17 +45,6 @@ bool is_path(const char *p) { return !!strchr(p, '/'); } -char *path_get_file_name(const char *p) { - char *r; - - assert(p); - - if ((r = strrchr(p, '/'))) - return r + 1; - - return (char*) p; -} - int path_get_parent(const char *path, char **_r) { const char *e, *a = NULL, *b = NULL, *p; char *r; @@ -101,7 +90,8 @@ char **path_split_and_make_absolute(const char *p) { char **l; assert(p); - if (!(l = strv_split(p, ":"))) + l = strv_split(p, ":"); + if (!l) return NULL; if (!path_strv_make_absolute_cwd(l)) { @@ -125,7 +115,7 @@ char *path_make_absolute(const char *p, const char *prefix) { } char *path_make_absolute_cwd(const char *p) { - char *cwd, *r; + _cleanup_free_ char *cwd = NULL; assert(p); @@ -135,13 +125,11 @@ char *path_make_absolute_cwd(const char *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); - free(cwd); - - return r; + return path_make_absolute(p, cwd); } char **path_strv_make_absolute_cwd(char **l) { @@ -154,7 +142,8 @@ char **path_strv_make_absolute_cwd(char **l) { STRV_FOREACH(s, l) { char *t; - if (!(t = path_make_absolute_cwd(*s))) + t = path_make_absolute_cwd(*s); + if (!t) return NULL; free(*s); @@ -181,6 +170,7 @@ char **path_strv_canonicalize(char **l) { t = path_make_absolute_cwd(*s); free(*s); + *s = NULL; if (!t) { enomem = true; @@ -189,14 +179,18 @@ char **path_strv_canonicalize(char **l) { errno = 0; u = canonicalize_file_name(t); - free(t); - 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; } @@ -209,24 +203,14 @@ char **path_strv_canonicalize(char **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; - 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) { @@ -264,12 +248,12 @@ char *path_kill_slashes(char *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] == '/')) - return false; + return NULL; for (;;) { size_t a, b; @@ -278,19 +262,19 @@ bool path_startswith(const char *path, const char *prefix) { prefix += strspn(prefix, "/"); if (*prefix == 0) - return true; + return (char*) path; if (*path == 0) - return false; + return NULL; a = strcspn(path, "/"); b = strcspn(prefix, "/"); if (a != b) - return false; + return NULL; if (memcmp(path, prefix, a) != 0) - return false; + return NULL; path += a; prefix += b; @@ -349,8 +333,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) { - if (errno == ENOTSUP) - /* This file system does not support + if (errno == ENOSYS || errno == ENOTSUP) + /* This kernel or file system does not support * name_to_handle_at(), hence fallback to the * traditional stat() logic */ goto fallback; @@ -385,10 +369,14 @@ fallback: if (allow_symlink) r = stat(t, &a); else - r = lstat(t, &b); + r = lstat(t, &a); + + if (r < 0) { + if (errno == ENOENT) + return 0; - if (r < 0) return -errno; + } r = path_get_parent(t, &parent); if (r < 0) @@ -413,3 +401,100 @@ int path_is_read_only_fs(const char *path) { return !!(st.f_flag & ST_RDONLY); } + +int path_is_os_tree(const char *path) { + char *p; + int r; + + /* We use /etc/os-release as flag file if something is an OS */ + + p = strappenda(path, "/etc/os-release"); + r = access(p, F_OK); + + return r < 0 ? 0 : 1; +} + +int find_binary(const char *name, char **filename) { + assert(name); + assert(filename); + + if (strchr(name, '/')) { + char *p; + + if (path_is_absolute(name)) + p = strdup(name); + else + p = path_make_absolute_cwd(name); + if (!p) + return -ENOMEM; + + *filename = p; + return 0; + } else { + const char *path; + char *state, *w; + size_t l; + + /** + * Plain getenv, not secure_getenv, because we want + * to actually allow the user to pick the binary. + */ + path = getenv("PATH"); + if (!path) + path = DEFAULT_PATH; + + FOREACH_WORD_SEPARATOR(w, l, path, ":", state) { + char *p; + + if (asprintf(&p, "%.*s/%s", (int) l, w, name) < 0) + return -ENOMEM; + + if (access(p, X_OK) < 0) { + free(p); + continue; + } + + path_kill_slashes(p); + *filename = p; + + return 0; + } + + return -ENOENT; + } +} + +bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool update) { + bool changed = false; + const char* const* i; + + assert(timestamp); + + if (paths == NULL) + return false; + + STRV_FOREACH(i, paths) { + struct stat stats; + usec_t u; + + if (stat(*i, &stats) < 0) + continue; + + u = timespec_load(&stats.st_mtim); + + /* first check */ + if (*timestamp >= u) + continue; + + log_debug("timestamp of '%s' changed", *i); + + /* update timestamp */ + if (update) { + *timestamp = u; + changed = true; + } else + return true; + } + + return changed; +}