chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v229: Add missing fixes from upstream [6/6] src/systemd
[elogind.git]
/
src
/
shared
/
sleep-config.c
diff --git
a/src/shared/sleep-config.c
b/src/shared/sleep-config.c
index 1064fd5cbd3f73800bcd106df6fd4b82ac47cdf0..a0aef66bc820bc3cac8e6fb95a2b5c1c3842d102 100644
(file)
--- a/
src/shared/sleep-config.c
+++ b/
src/shared/sleep-config.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,14
+17,25
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
#include <stdio.h>
#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+#include "alloc-util.h"
#include "conf-parser.h"
#include "conf-parser.h"
-#include "sleep-config.h"
+#include "def.h"
+#include "fd-util.h"
#include "fileio.h"
#include "log.h"
#include "fileio.h"
#include "log.h"
+#include "macro.h"
+#include "parse-util.h"
+#include "sleep-config.h"
+#include "string-util.h"
#include "strv.h"
#include "strv.h"
-#include "util.h"
#define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0)
#define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0)
@@
-49,7
+58,7
@@
int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
};
config_parse_many(PKGSYSCONFDIR "/sleep.conf",
};
config_parse_many(PKGSYSCONFDIR "/sleep.conf",
- CONF_
DIRS_NULSTR("systemd/sleep.conf
"),
+ CONF_
PATHS_NULSTR("systemd/sleep.conf.d
"),
"Sleep\0", config_item_table_lookup, items,
false, NULL);
"Sleep\0", config_item_table_lookup, items,
false, NULL);
@@
-226,7
+235,7
@@
static bool enough_memory_for_hibernation(void) {
if (r < 0)
return false;
if (r < 0)
return false;
- r = get_
status_field("/proc/meminfo", "\nActive(anon):"
, &active);
+ r = get_
proc_field("/proc/meminfo", "Active(anon)", WHITESPACE
, &active);
if (r < 0) {
log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m");
return false;
if (r < 0) {
log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m");
return false;