X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsleep%2Fsleep.c;h=cf03c34b30e327accaa9fa7e78db1653f5b60efe;hb=c0e8baacdbcf4cee407eb0c50c6fbb7e4e089158;hp=0d7c1e3fbe6f41905af262a91585a039b8f93ae3;hpb=e2cc6eca73cd1df8be552d7c23f9ff3d69c06f1e;p=elogind.git
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 0d7c1e3fb..cf03c34b3 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -20,20 +18,23 @@
along with systemd; If not, see .
***/
-#include
-#include
-#include
-#include
+//#include
+//#include
+//#include
-#include "sd-id128.h"
#include "sd-messages.h"
-#include "log.h"
-#include "util.h"
-#include "strv.h"
-#include "fileio.h"
-#include "build.h"
-#include "sleep-config.h"
+
#include "def.h"
+#include "fd-util.h"
+#include "fileio.h"
+//#include "log.h"
+//#include "sleep-config.h"
+//#include "string-util.h"
+#include "strv.h"
+//#include "util.h"
+
+/// Additional includes needed by elogind
+#include "sleep.h"
static char* arg_verb = NULL;
@@ -44,19 +45,18 @@ static int write_mode(char **modes) {
STRV_FOREACH(mode, modes) {
int k;
- k = write_string_file("/sys/power/disk", *mode);
+ k = write_string_file("/sys/power/disk", *mode, 0);
if (k == 0)
return 0;
- log_debug("Failed to write '%s' to /sys/power/disk: %s",
- *mode, strerror(-k));
+ log_debug_errno(k, "Failed to write '%s' to /sys/power/disk: %m",
+ *mode);
if (r == 0)
r = k;
}
if (r < 0)
- log_error("Failed to write mode to /sys/power/disk: %s",
- strerror(-r));
+ log_error_errno(r, "Failed to write mode to /sys/power/disk: %m");
return r;
}
@@ -68,20 +68,18 @@ static int write_state(FILE **f, char **states) {
STRV_FOREACH(state, states) {
int k;
- k = write_string_stream(*f, *state);
+ k = write_string_stream(*f, *state, true);
if (k == 0)
return 0;
- log_debug("Failed to write '%s' to /sys/power/state: %s",
- *state, strerror(-k));
+ log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m",
+ *state);
if (r == 0)
r = k;
fclose(*f);
*f = fopen("/sys/power/state", "we");
- if (!*f) {
- log_error("Failed to open /sys/power/state: %m");
- return -errno;
- }
+ if (!*f)
+ return log_error_errno(errno, "Failed to open /sys/power/state: %m");
}
return r;
@@ -95,6 +93,7 @@ static int execute(char **modes, char **states) {
arg_verb,
NULL
};
+ static const char* const dirs[] = {SYSTEM_SLEEP_PATH, NULL};
int r;
_cleanup_fclose_ FILE *f = NULL;
@@ -102,17 +101,15 @@ static int execute(char **modes, char **states) {
/* This file is opened first, so that if we hit an error,
* we can abort before modifying any state. */
f = fopen("/sys/power/state", "we");
- if (!f) {
- log_error("Failed to open /sys/power/state: %m");
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to open /sys/power/state: %m");
/* Configure the hibernation mode */
r = write_mode(modes);
if (r < 0)
return r;
- execute_directory(SYSTEM_SLEEP_PATH, NULL, DEFAULT_TIMEOUT_USEC, arguments);
+ execute_directories(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL, arguments);
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
@@ -126,16 +123,17 @@ static int execute(char **modes, char **states) {
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
- LOG_MESSAGE("MESSAGE=System resumed."),
+ LOG_MESSAGE("System resumed."),
"SLEEP=%s", arg_verb,
NULL);
arguments[1] = (char*) "post";
- execute_directory(SYSTEM_SLEEP_PATH, NULL, DEFAULT_TIMEOUT_USEC, arguments);
+ execute_directories(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL, arguments);
return r;
}
+#if 0 /// elogind calls execute() by itself and does not need another binary
static void help(void) {
printf("%s COMMAND\n\n"
"Suspend the system, hibernate the system, or both.\n\n"
@@ -171,9 +169,7 @@ static int parse_argv(int argc, char *argv[]) {
return 0; /* done */
case ARG_VERSION:
- puts(PACKAGE_STRING);
- puts(SYSTEMD_FEATURES);
- return 0 /* done */;
+ return version();
case '?':
return -EINVAL;
@@ -221,3 +217,10 @@ int main(int argc, char *argv[]) {
finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
+#else
+int do_sleep(const char *verb, char **modes, char **states) {
+ assert(verb);
+ arg_verb = (char*)verb;
+ return execute(modes, states);
+}
+#endif // 0