chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
env: considerably beef up environment cleaning logic
[elogind.git]
/
src
/
binfmt
/
binfmt.c
diff --git
a/src/binfmt/binfmt.c
b/src/binfmt/binfmt.c
index 5bd763339e025c64cca164021cb2514a71603e8f..296607d6a270f7e017a3ee8992d9e5a12a4f74b5 100644
(file)
--- a/
src/binfmt/binfmt.c
+++ b/
src/binfmt/binfmt.c
@@
-31,6
+31,7
@@
#include "hashmap.h"
#include "strv.h"
#include "util.h"
#include "hashmap.h"
#include "strv.h"
#include "util.h"
+#include "conf-files.h"
static int delete_rule(const char *rule) {
char *x, *fn = NULL, *e;
static int delete_rule(const char *rule) {
char *x, *fn = NULL, *e;
@@
-39,7
+40,7
@@
static int delete_rule(const char *rule) {
assert(rule[0]);
if (!(x = strdup(rule)))
assert(rule[0]);
if (!(x = strdup(rule)))
- return
-ENOMEM
;
+ return
log_oom()
;
e = strchrnul(x+1, x[0]);
*e = 0;
e = strchrnul(x+1, x[0]);
*e = 0;
@@
-48,7
+49,7
@@
static int delete_rule(const char *rule) {
free(x);
if (!fn)
free(x);
if (!fn)
- return
-ENOMEM
;
+ return
log_oom()
;
r = write_one_line_file(fn, "-1");
free(fn);
r = write_one_line_file(fn, "-1");
free(fn);
@@
-137,7
+138,7
@@
int main(int argc, char *argv[]) {
} else {
char **files, **f;
} else {
char **files, **f;
- r = conf_files_list(&files, ".conf",
+ r = conf_files_list(&files, ".conf",
NULL,
"/etc/binfmt.d",
"/run/binfmt.d",
"/usr/local/lib/binfmt.d",
"/etc/binfmt.d",
"/run/binfmt.d",
"/usr/local/lib/binfmt.d",