for (;;) {
int k;
- char *p, *f;
+ char *p;
k = readdir_r(dir, &buffer, &de);
if (k != 0) {
goto finish;
}
- f = canonicalize_file_name(p);
- if (!f) {
- log_error("Failed to canonicalize file name '%s': %m", p);
+ if (hashmap_put(h, file_name_from_path(p), p) <= 0) {
+ log_debug("Skip overridden file: %s.", p);
free(p);
- continue;
}
- free(p);
-
- log_debug("found: %s\n", f);
- if (hashmap_put(h, file_name_from_path(f), f) <= 0)
- free(f);
}
finish:
return strcmp(file_name_from_path(s1), file_name_from_path(s2));
}
-int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) {
+int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs) {
Hashmap *fh = NULL;
- char **dirs = NULL;
char **files = NULL;
- char **p;
- va_list ap;
+ const char **p;
int r = 0;
- va_start(ap, dir);
- dirs = strv_new_ap(dir, ap);
- va_end(ap);
- if (!dirs) {
- r = -ENOMEM;
- goto finish;
- }
- if (!strv_path_canonicalize(dirs)) {
- r = -ENOMEM;
- goto finish;
- }
- if (!strv_uniq(dirs)) {
- r = -ENOMEM;
- goto finish;
- }
+ assert(dirs);
fh = hashmap_new(string_hash_func, string_compare_func);
if (!fh) {
r = -ENOMEM;
goto finish;
}
-
qsort(files, hashmap_size(fh), sizeof(char *), base_cmp);
finish:
- strv_free(dirs);
hashmap_free(fh);
*strv = files;
return r;
}
+int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) {
+ char **dirs = NULL;
+ va_list ap;
+ int r;
+
+ va_start(ap, dir);
+ dirs = strv_new_ap(dir, ap);
+ va_end(ap);
+ if (!dirs) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!strv_path_canonicalize(dirs)) {
+ r = -ENOMEM;
+ goto finish;
+ }
+ strv_uniq(dirs);
+
+ r = conf_files_list_strv(strv, suffix, (const char **)dirs);
+
+finish:
+ strv_free(dirs);
+ return r;
+}
+
int hwclock_is_localtime(void) {
FILE *f;
bool local = false;
if (!b)
return -EIO;
-
truncate_nl(line);
local = streq(line, "LOCAL");
if (ioctl(fd, RTC_RD_TIME, tm) < 0)
err = -errno;
- /* We don't now daylight saving, so we reset this in order not
+ /* We don't know daylight saving, so we reset this in order not
* to confused mktime(). */
tm->tm_isdst = -1;
return !!(st.f_flag & ST_RDONLY);
}
+
+int getenv_for_pid(pid_t pid, const char *field, char **_value) {
+ char path[sizeof("/proc/")-1+10+sizeof("/environ")], *value = NULL;
+ int r;
+ FILE *f;
+ bool done = false;
+ size_t l;
+
+ assert(field);
+ assert(_value);
+
+ if (pid == 0)
+ pid = getpid();
+
+ snprintf(path, sizeof(path), "/proc/%lu/environ", (unsigned long) pid);
+ char_array_0(path);
+
+ f = fopen(path, "re");
+ if (!f)
+ return -errno;
+
+ l = strlen(field);
+ r = 0;
+
+ do {
+ char line[LINE_MAX];
+ unsigned i;
+
+ for (i = 0; i < sizeof(line)-1; i++) {
+ int c;
+
+ c = getc(f);
+ if (_unlikely_(c == EOF)) {
+ done = true;
+ break;
+ } else if (c == 0)
+ break;
+
+ line[i] = c;
+ }
+ line[i] = 0;
+
+ if (memcmp(line, field, l) == 0 && line[l] == '=') {
+ value = strdup(line + l + 1);
+ if (!value) {
+ r = -ENOMEM;
+ break;
+ }
+
+ r = 1;
+ break;
+ }
+
+ } while (!done);
+
+ fclose(f);
+
+ if (r >= 0)
+ *_value = value;
+
+ return r;
+}