chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shutdown: don't chdir to /, since init is running with / as cwd anyway
[elogind.git]
/
src
/
util.c
diff --git
a/src/util.c
b/src/util.c
index bdc194e80c9ce45bde0975d7ef9c5ab4b4482bfd..434f311e71f9cdbbdafe85229fdeb653f0b22965 100644
(file)
--- a/
src/util.c
+++ b/
src/util.c
@@
-600,13
+600,13
@@
finish:
int parse_env_file(
const char *fname,
int parse_env_file(
const char *fname,
- const char *sep
e
rator, ...) {
+ const char *sep
a
rator, ...) {
- int r;
+ int r
= 0
;
char *contents, *p;
assert(fname);
char *contents, *p;
assert(fname);
- assert(sep
e
rator);
+ assert(sep
a
rator);
if ((r = read_full_file(fname, &contents)) < 0)
return r;
if ((r = read_full_file(fname, &contents)) < 0)
return r;
@@
-615,7
+615,7
@@
int parse_env_file(
for (;;) {
const char *key = NULL;
for (;;) {
const char *key = NULL;
- p += strspn(p, sep
e
rator);
+ p += strspn(p, sep
a
rator);
p += strspn(p, WHITESPACE);
if (!*p)
p += strspn(p, WHITESPACE);
if (!*p)
@@
-625,7
+625,7
@@
int parse_env_file(
va_list ap;
char **value;
va_list ap;
char **value;
- va_start(ap, sep
e
rator);
+ va_start(ap, sep
a
rator);
while ((key = va_arg(ap, char *))) {
size_t n;
char *v;
while ((key = va_arg(ap, char *))) {
size_t n;
char *v;
@@
-638,7
+638,7
@@
int parse_env_file(
continue;
p += n + 1;
continue;
p += n + 1;
- n = strcspn(p, sep
e
rator);
+ n = strcspn(p, sep
a
rator);
if (n >= 2 &&
strchr(QUOTES, p[0]) &&
if (n >= 2 &&
strchr(QUOTES, p[0]) &&
@@
-653,21
+653,27
@@
int parse_env_file(
goto fail;
}
goto fail;
}
+ if (v[0] == '\0') {
+ /* return empty value strings as NULL */
+ free(v);
+ v = NULL;
+ }
+
free(*value);
*value = v;
p += n;
free(*value);
*value = v;
p += n;
+
+ r ++;
break;
}
va_end(ap);
}
if (!key)
break;
}
va_end(ap);
}
if (!key)
- p += strcspn(p, sep
e
rator);
+ p += strcspn(p, sep
a
rator);
}
}
- r = 0;
-
fail:
free(contents);
return r;
fail:
free(contents);
return r;
@@
-2241,26
+2247,34
@@
int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocst
assert(notify >= 0);
for (;;) {
assert(notify >= 0);
for (;;) {
-
struct inotify_event e
;
+
uint8_t inotify_buffer[sizeof(struct inotify_event) + FILENAME_MAX]
;
ssize_t l;
ssize_t l;
+ struct inotify_event *e;
- if ((l = read(notify, &
e, sizeof(e))) != sizeof(e)
) {
+ if ((l = read(notify, &
inotify_buffer, sizeof(inotify_buffer))) < 0
) {
- if (l < 0) {
+ if (errno == EINTR)
+ continue;
- if (errno == EINTR)
- continue;
+ r = -errno;
+ goto fail;
+ }
+
+ e = (struct inotify_event*) inotify_buffer;
+
+ while (l > 0) {
+ size_t step;
- r = -errno;
- } else
+ if (e->wd != wd || !(e->mask & IN_CLOSE)) {
r = -EIO;
r = -EIO;
+ goto fail;
+ }
-
goto fail
;
- }
+
step = sizeof(struct inotify_event) + e->len
;
+ assert(step <= (size_t) l);
- if (e.wd != wd || !(e.mask & IN_CLOSE)) {
- r = -EIO;
- goto fail;
+ e = (struct inotify_event*) ((uint8_t*) e + step);
+ l -= step;
}
break;
}
break;
@@
-3302,6
+3316,23
@@
int wait_for_terminate_and_warn(const char *name, pid_t pid) {
}
}
+void freeze(void) {
+ for (;;)
+ pause();
+}
+
+bool null_or_empty(struct stat *st) {
+ assert(st);
+
+ if (S_ISREG(st->st_mode) && st->st_size <= 0)
+ return true;
+
+ if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode))
+ return true;
+
+ return false;
+}
+
static const char *const ioprio_class_table[] = {
[IOPRIO_CLASS_NONE] = "none",
[IOPRIO_CLASS_RT] = "realtime",
static const char *const ioprio_class_table[] = {
[IOPRIO_CLASS_NONE] = "none",
[IOPRIO_CLASS_RT] = "realtime",