chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract looping over /proc/cmdline into a shared function
[elogind.git]
/
src
/
shared
/
install.c
diff --git
a/src/shared/install.c
b/src/shared/install.c
index 16504eef0fe7aee6c4306de9a8dbc7e5c7c80ef8..1f9d7e2e3a99f9055082c5cc6668f5d858621ef2 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-212,11
+212,10
@@
static int remove_marked_symlinks_fd(
for (;;) {
struct dirent *de;
for (;;) {
struct dirent *de;
- union dirent_storage buf;
- int k;
- k = readdir_r(d, &buf.de, &de);
- if (k != 0) {
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0) {
r = -errno;
break;
}
r = -errno;
break;
}
@@
-276,10
+275,10
@@
static int remove_marked_symlinks_fd(
found =
set_get(remove_symlinks_to, dest) ||
found =
set_get(remove_symlinks_to, dest) ||
- set_get(remove_symlinks_to,
path_get_file_
name(dest));
+ set_get(remove_symlinks_to,
base
name(dest));
if (unit_name_is_instance(p))
if (unit_name_is_instance(p))
- found = found && strv_contains(files,
path_get_file_
name(p));
+ found = found && strv_contains(files,
base
name(p));
if (found) {
if (found) {
@@
-373,12
+372,11
@@
static int find_symlinks_fd(
}
for (;;) {
}
for (;;) {
- int k;
struct dirent *de;
struct dirent *de;
- union dirent_storage buf;
- k = readdir_r(d, &buf.de, &de);
- if (k != 0)
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0)
return -errno;
if (!de)
return -errno;
if (!de)
@@
-451,7
+449,7
@@
static int find_symlinks_fd(
if (path_is_absolute(name))
found_dest = path_equal(dest, name);
else
if (path_is_absolute(name))
found_dest = path_equal(dest, name);
else
- found_dest = streq(
path_get_file_
name(dest), name);
+ found_dest = streq(
base
name(dest), name);
if (found_path && found_dest) {
_cleanup_free_ char *t = NULL;
if (found_path && found_dest) {
_cleanup_free_ char *t = NULL;
@@
-558,7
+556,7
@@
int unit_file_mask(
UnitFileScope scope,
bool runtime,
const char *root_dir,
UnitFileScope scope,
bool runtime,
const char *root_dir,
- char *
files[]
,
+ char *
*files
,
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
@@
-577,7
+575,7
@@
int unit_file_mask(
STRV_FOREACH(i, files) {
_cleanup_free_ char *path = NULL;
STRV_FOREACH(i, files) {
_cleanup_free_ char *path = NULL;
- if (!unit_name_is_valid(*i,
true
)) {
+ if (!unit_name_is_valid(*i,
TEMPLATE_VALID
)) {
if (r == 0)
r = -EINVAL;
continue;
if (r == 0)
r = -EINVAL;
continue;
@@
-627,7
+625,7
@@
int unit_file_unmask(
UnitFileScope scope,
bool runtime,
const char *root_dir,
UnitFileScope scope,
bool runtime,
const char *root_dir,
- char *
files[]
,
+ char *
*files
,
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
@@
-645,7
+643,7
@@
int unit_file_unmask(
STRV_FOREACH(i, files) {
char *path;
STRV_FOREACH(i, files) {
char *path;
- if (!unit_name_is_valid(*i,
true
)) {
+ if (!unit_name_is_valid(*i,
TEMPLATE_VALID
)) {
if (r == 0)
r = -EINVAL;
continue;
if (r == 0)
r = -EINVAL;
continue;
@@
-692,7
+690,7
@@
int unit_file_link(
UnitFileScope scope,
bool runtime,
const char *root_dir,
UnitFileScope scope,
bool runtime,
const char *root_dir,
- char *
files[]
,
+ char *
*files
,
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
@@
-718,10
+716,10
@@
int unit_file_link(
char *fn;
struct stat st;
char *fn;
struct stat st;
- fn =
path_get_file_
name(*i);
+ fn =
base
name(*i);
if (!path_is_absolute(*i) ||
if (!path_is_absolute(*i) ||
- !unit_name_is_valid(fn,
true
)) {
+ !unit_name_is_valid(fn,
TEMPLATE_VALID
)) {
if (r == 0)
r = -EINVAL;
continue;
if (r == 0)
r = -EINVAL;
continue;
@@
-861,9
+859,9
@@
static int install_info_add(
assert(name || path);
if (!name)
assert(name || path);
if (!name)
- name =
path_get_file_
name(path);
+ name =
base
name(path);
- if (!unit_name_is_valid(name,
true
))
+ if (!unit_name_is_valid(name,
TEMPLATE_VALID
))
return -EINVAL;
if (hashmap_get(c->have_installed, name) ||
return -EINVAL;
if (hashmap_get(c->have_installed, name) ||
@@
-922,6
+920,7
@@
static int config_parse_also(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-957,6
+956,7
@@
static int config_parse_user(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-1020,9
+1020,9
@@
static int unit_file_load(
return r;
return
return r;
return
- strv_length(info->aliases) +
- strv_length(info->wanted_by) +
- strv_length(info->required_by);
+
(int)
strv_length(info->aliases) +
+
(int)
strv_length(info->wanted_by) +
+
(int)
strv_length(info->required_by);
}
static int unit_file_search(
}
static int unit_file_search(
@@
-1132,9
+1132,9
@@
static int unit_file_can_install(
if (r >= 0)
r =
if (r >= 0)
r =
- strv_length(i->aliases) +
- strv_length(i->wanted_by) +
- strv_length(i->required_by);
+
(int)
strv_length(i->aliases) +
+
(int)
strv_length(i->wanted_by) +
+
(int)
strv_length(i->required_by);
return r;
}
return r;
}
@@
-1235,7
+1235,7
@@
static int install_info_symlink_wants(
if (q < 0)
return q;
if (q < 0)
return q;
- if (!unit_name_is_valid(dst,
true
)) {
+ if (!unit_name_is_valid(dst,
TEMPLATE_VALID
)) {
r = -EINVAL;
continue;
}
r = -EINVAL;
continue;
}
@@
-1272,7
+1272,7
@@
static int install_info_symlink_requires(
if (q < 0)
return q;
if (q < 0)
return q;
- if (!unit_name_is_valid(dst,
true
)) {
+ if (!unit_name_is_valid(dst,
TEMPLATE_VALID
)) {
r = -EINVAL;
continue;
}
r = -EINVAL;
continue;
}
@@
-1427,7
+1427,7
@@
static int install_context_mark_for_removal(
char *unit_file;
if (i->path) {
char *unit_file;
if (i->path) {
- unit_file =
path_get_file_
name(i->path);
+ unit_file =
base
name(i->path);
if (unit_name_is_instance(unit_file))
/* unit file named as instance exists, thus all symlinks
if (unit_name_is_instance(unit_file))
/* unit file named as instance exists, thus all symlinks
@@
-1462,7
+1462,7
@@
int unit_file_enable(
UnitFileScope scope,
bool runtime,
const char *root_dir,
UnitFileScope scope,
bool runtime,
const char *root_dir,
- char *
files[]
,
+ char *
*files
,
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
@@
-1502,7
+1502,7
@@
int unit_file_disable(
UnitFileScope scope,
bool runtime,
const char *root_dir,
UnitFileScope scope,
bool runtime,
const char *root_dir,
- char *
files[]
,
+ char *
*files
,
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
@@
-1543,7
+1543,7
@@
int unit_file_reenable(
UnitFileScope scope,
bool runtime,
const char *root_dir,
UnitFileScope scope,
bool runtime,
const char *root_dir,
- char *
files[]
,
+ char *
*files
,
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
@@
-1645,7
+1645,7
@@
int unit_file_get_default(
else if (r < 0)
return r;
else
else if (r < 0)
return r;
else
- n = strdup(
path_get_file_
name(tmp));
+ n = strdup(
base
name(tmp));
if (!n)
return -ENOMEM;
if (!n)
return -ENOMEM;
@@
-1675,7
+1675,7
@@
UnitFileState unit_file_get_state(
if (root_dir && scope != UNIT_FILE_SYSTEM)
return -EINVAL;
if (root_dir && scope != UNIT_FILE_SYSTEM)
return -EINVAL;
- if (!unit_name_is_valid(name,
true
))
+ if (!unit_name_is_valid(name,
TEMPLATE_VALID
))
return -EINVAL;
r = lookup_paths_init_from_scope(&paths, scope);
return -EINVAL;
r = lookup_paths_init_from_scope(&paths, scope);
@@
-1820,7
+1820,7
@@
int unit_file_preset(
UnitFileScope scope,
bool runtime,
const char *root_dir,
UnitFileScope scope,
bool runtime,
const char *root_dir,
- char *
files[]
,
+ char *
*files
,
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
bool force,
UnitFileChange **changes,
unsigned *n_changes) {
@@
-1845,7
+1845,7
@@
int unit_file_preset(
STRV_FOREACH(i, files) {
STRV_FOREACH(i, files) {
- if (!unit_name_is_valid(*i,
true
))
+ if (!unit_name_is_valid(*i,
TEMPLATE_VALID
))
return -EINVAL;
r = unit_file_query_preset(scope, *i);
return -EINVAL;
r = unit_file_query_preset(scope, *i);
@@
-1936,12
+1936,12
@@
int unit_file_get_list(
for (;;) {
struct dirent *de;
for (;;) {
struct dirent *de;
- union dirent_storage buffer;
_cleanup_unitfilelist_free_ UnitFileList *f = NULL;
_cleanup_unitfilelist_free_ UnitFileList *f = NULL;
- r = readdir_r(d, &buffer.de, &de);
- if (r != 0)
- return -r;
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0)
+ return -errno;
if (!de)
break;
if (!de)
break;
@@
-1949,7
+1949,7
@@
int unit_file_get_list(
if (ignore_file(de->d_name))
continue;
if (ignore_file(de->d_name))
continue;
- if (!unit_name_is_valid(de->d_name,
true
))
+ if (!unit_name_is_valid(de->d_name,
TEMPLATE_VALID
))
continue;
if (hashmap_get(h, de->d_name))
continue;
if (hashmap_get(h, de->d_name))
@@
-2005,7
+2005,7
@@
int unit_file_get_list(
f->state = UNIT_FILE_STATIC;
found:
f->state = UNIT_FILE_STATIC;
found:
- r = hashmap_put(h,
path_get_file_
name(f->path), f);
+ r = hashmap_put(h,
base
name(f->path), f);
if (r < 0)
return r;
f = NULL; /* prevent cleanup */
if (r < 0)
return r;
f = NULL; /* prevent cleanup */