chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: rename cg_update_unified() → cg_unified_update()
[elogind.git]
/
src
/
sleep
/
sleep.c
diff --git
a/src/sleep/sleep.c
b/src/sleep/sleep.c
index 415893ba74e907833fd46400a32a3b27296ffa54..cf03c34b30e327accaa9fa7e78db1653f5b60efe 100644
(file)
--- 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.
/***
This file is part of systemd.
@@
-20,20
+18,23
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <getopt.h>
+//#include <errno.h>
+//#include <getopt.h>
+//#include <stdio.h>
-#include "sd-id128.h"
#include "sd-messages.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 "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;
static char* arg_verb = NULL;
@@
-44,7
+45,7
@@
static int write_mode(char **modes) {
STRV_FOREACH(mode, modes) {
int k;
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;
if (k == 0)
return 0;
@@
-67,7
+68,7
@@
static int write_state(FILE **f, char **states) {
STRV_FOREACH(state, states) {
int k;
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_errno(k, "Failed to write '%s' to /sys/power/state: %m",
if (k == 0)
return 0;
log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m",
@@
-92,6
+93,7
@@
static int execute(char **modes, char **states) {
arg_verb,
NULL
};
arg_verb,
NULL
};
+ static const char* const dirs[] = {SYSTEM_SLEEP_PATH, NULL};
int r;
_cleanup_fclose_ FILE *f = NULL;
int r;
_cleanup_fclose_ FILE *f = NULL;
@@
-107,7
+109,7
@@
static int execute(char **modes, char **states) {
if (r < 0)
return r;
if (r < 0)
return r;
- execute_director
y(SYSTEM_SLEEP_PATH, NULL, DEFAULT_TIMEOUT_USEC
, arguments);
+ execute_director
ies(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL
, arguments);
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
@@
-121,16
+123,17
@@
static int execute(char **modes, char **states) {
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
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";
"SLEEP=%s", arg_verb,
NULL);
arguments[1] = (char*) "post";
- execute_director
y(SYSTEM_SLEEP_PATH, NULL, DEFAULT_TIMEOUT_USEC
, arguments);
+ execute_director
ies(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL
, arguments);
return r;
}
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"
static void help(void) {
printf("%s COMMAND\n\n"
"Suspend the system, hibernate the system, or both.\n\n"
@@
-166,9
+169,7
@@
static int parse_argv(int argc, char *argv[]) {
return 0; /* done */
case ARG_VERSION:
return 0; /* done */
case ARG_VERSION:
- puts(PACKAGE_STRING);
- puts(SYSTEMD_FEATURES);
- return 0 /* done */;
+ return version();
case '?':
return -EINVAL;
case '?':
return -EINVAL;
@@
-216,3
+217,10
@@
int main(int argc, char *argv[]) {
finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
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