chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy: also copy AF_UNIX sockets
[elogind.git]
/
src
/
basic
/
fileio.c
diff --git
a/src/basic/fileio.c
b/src/basic/fileio.c
index f2a8f29e677c7180077959994c0cac76c24c4911..da53c3e7589e5e6ac6cd37e81a797a70f2566e2f 100644
(file)
--- a/
src/basic/fileio.c
+++ b/
src/basic/fileio.c
@@
-352,7
+352,7
@@
static int parse_env_file_internal(
case KEY:
if (strchr(newline, c)) {
state = PRE_KEY;
case KEY:
if (strchr(newline, c)) {
state = PRE_KEY;
- line
++;
+ line++;
n_key = 0;
} else if (c == '=') {
state = PRE_VALUE;
n_key = 0;
} else if (c == '=') {
state = PRE_VALUE;
@@
-376,7
+376,7
@@
static int parse_env_file_internal(
case PRE_VALUE:
if (strchr(newline, c)) {
state = PRE_KEY;
case PRE_VALUE:
if (strchr(newline, c)) {
state = PRE_KEY;
- line
++;
+ line++;
key[n_key] = 0;
if (value)
key[n_key] = 0;
if (value)
@@
-416,7
+416,7
@@
static int parse_env_file_internal(
case VALUE:
if (strchr(newline, c)) {
state = PRE_KEY;
case VALUE:
if (strchr(newline, c)) {
state = PRE_KEY;
- line
++;
+ line++;
key[n_key] = 0;
key[n_key] = 0;
@@
-535,7
+535,7
@@
static int parse_env_file_internal(
state = COMMENT_ESCAPE;
else if (strchr(newline, c)) {
state = PRE_KEY;
state = COMMENT_ESCAPE;
else if (strchr(newline, c)) {
state = PRE_KEY;
- line
++;
+ line++;
}
break;
}
break;
@@
-588,7
+588,7
@@
static int parse_env_file_push(
va_list aq, *ap = userdata;
if (!utf8_is_valid(key)) {
va_list aq, *ap = userdata;
if (!utf8_is_valid(key)) {
- _cleanup_free_ char *p;
+ _cleanup_free_ char *p
= NULL
;
p = utf8_escape_invalid(key);
log_error("%s:%u: invalid UTF-8 in key '%s', ignoring.", strna(filename), line, p);
p = utf8_escape_invalid(key);
log_error("%s:%u: invalid UTF-8 in key '%s', ignoring.", strna(filename), line, p);
@@
-596,7
+596,7
@@
static int parse_env_file_push(
}
if (value && !utf8_is_valid(value)) {
}
if (value && !utf8_is_valid(value)) {
- _cleanup_free_ char *p;
+ _cleanup_free_ char *p
= NULL
;
p = utf8_escape_invalid(value);
log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.", strna(filename), line, key, p);
p = utf8_escape_invalid(value);
log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.", strna(filename), line, key, p);
@@
-645,6
+645,7
@@
int parse_env_file(
return r < 0 ? r : n_pushed;
}
return r < 0 ? r : n_pushed;
}
+#if 0 /// UNNEEDED by elogind
static int load_env_file_push(
const char *filename, unsigned line,
const char *key, char *value,
static int load_env_file_push(
const char *filename, unsigned line,
const char *key, char *value,
@@
-700,7
+701,6
@@
int load_env_file(FILE *f, const char *fname, const char *newline, char ***rl) {
return 0;
}
return 0;
}
-#if 0 /// UNNEDED by elogind
static int load_env_file_push_pairs(
const char *filename, unsigned line,
const char *key, char *value,
static int load_env_file_push_pairs(
const char *filename, unsigned line,
const char *key, char *value,
@@
-759,7
+759,6
@@
int load_env_file_pairs(FILE *f, const char *fname, const char *newline, char **
*rl = m;
return 0;
}
*rl = m;
return 0;
}
-#endif // 0
static void write_env_var(FILE *f, const char *v) {
const char *p;
static void write_env_var(FILE *f, const char *v) {
const char *p;
@@
-821,7
+820,6
@@
int write_env_file(const char *fname, char **l) {
return r;
}
return r;
}
-#if 0 /// UNNEEDED by elogind
int executable_is_script(const char *path, char **interpreter) {
int r;
_cleanup_free_ char *line = NULL;
int executable_is_script(const char *path, char **interpreter) {
int r;
_cleanup_free_ char *line = NULL;
@@
-912,7
+910,7
@@
int get_proc_field(const char *filename, const char *pattern, const char *termin
/* Back off one char if there's nothing but whitespace
and zeros */
if (!*t || isspace(*t))
/* Back off one char if there's nothing but whitespace
and zeros */
if (!*t || isspace(*t))
- t
--;
+ t--;
}
len = strcspn(t, terminator);
}
len = strcspn(t, terminator);
@@
-1075,7
+1073,7
@@
int fflush_and_check(FILE *f) {
/* This is much like like mkostemp() but is subject to umask(). */
int mkostemp_safe(char *pattern, int flags) {
/* This is much like like mkostemp() but is subject to umask(). */
int mkostemp_safe(char *pattern, int flags) {
- _cleanup_umask_ mode_t u;
+ _cleanup_umask_ mode_t u
= 0
;
int fd;
assert(pattern);
int fd;
assert(pattern);