X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fsleep-config.c;h=a57ebacd2a124bf2a74dccf68dffd95f32c2710a;hb=cb4c5148b5dab1eaf42347bde0368b6df916a206;hp=a0aef66bc820bc3cac8e6fb95a2b5c1c3842d102;hpb=2774f4e488e1b86960c6ff74c2195de6643bfd52;p=elogind.git

diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index a0aef66bc..a57ebacd2 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -17,27 +17,29 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
+//#include <errno.h>
+//#include <stdbool.h>
+//#include <stddef.h>
+//#include <stdio.h>
+//#include <string.h>
+//#include <syslog.h>
+//#include <unistd.h>
 
 #include "alloc-util.h"
-#include "conf-parser.h"
-#include "def.h"
+//#include "conf-parser.h"
+//#include "def.h"
+//#include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "log.h"
-#include "macro.h"
+//#include "log.h"
+//#include "macro.h"
 #include "parse-util.h"
 #include "sleep-config.h"
 #include "string-util.h"
 #include "strv.h"
 
-#define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0)
+#if 0 /// UNNEEDED by elogind
+#define USE(x, y) do { (x) = (y); (y) = NULL; } while (0)
 
 int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
 
@@ -57,7 +59,7 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
                 {}
         };
 
-        config_parse_many(PKGSYSCONFDIR "/sleep.conf",
+        config_parse_many_nulstr(PKGSYSCONFDIR "/sleep.conf",
                           CONF_PATHS_NULSTR("systemd/sleep.conf.d"),
                           "Sleep\0", config_item_table_lookup, items,
                           false, NULL);
@@ -106,7 +108,11 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
         *_states = states;
         return 0;
 }
+#endif // 0
 
+#if 1 /// Only available in this file for elogind
+static
+#endif // 0
 int can_sleep_state(char **types) {
         char **type;
         int r;
@@ -136,6 +142,9 @@ int can_sleep_state(char **types) {
         return false;
 }
 
+#if 1 /// Only available in this file for elogind
+static
+#endif // 0
 int can_sleep_disk(char **types) {
         char **type;
         int r;
@@ -231,6 +240,11 @@ static bool enough_memory_for_hibernation(void) {
         size_t size = 0, used = 0;
         int r;
 
+#if 0 /// elogind does not allow any bypass, we are never init!
+        if (getenv_bool("SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK") > 0)
+                return true;
+#endif // 0
+
         r = hibernation_partition_size(&size, &used);
         if (r < 0)
                 return false;
@@ -255,6 +269,7 @@ static bool enough_memory_for_hibernation(void) {
         return r;
 }
 
+#if 0 /// elogind has to do, or better, *can* do it differently
 int can_sleep(const char *verb) {
         _cleanup_strv_free_ char **modes = NULL, **states = NULL;
         int r;
@@ -272,3 +287,29 @@ int can_sleep(const char *verb) {
 
         return streq(verb, "suspend") || enough_memory_for_hibernation();
 }
+#else
+int can_sleep(Manager *m, const char *verb) {
+
+        assert(streq(verb, "suspend") ||
+               streq(verb, "hibernate") ||
+               streq(verb, "hybrid-sleep"));
+
+        if ( streq(verb, "suspend")
+          && ( !can_sleep_state(m->suspend_state)
+            || !can_sleep_disk(m->suspend_mode) ) )
+                return false;
+
+        if ( streq(verb, "hibernate")
+          && ( !can_sleep_state(m->hibernate_state)
+            || !can_sleep_disk(m->hibernate_mode) ) )
+                return false;
+
+        if ( streq(verb, "hybrid-sleep")
+          && ( !can_sleep_state(m->hybrid_sleep_state)
+            || !can_sleep_disk(m->hybrid_sleep_mode) ) )
+                return false;
+
+
+        return streq(verb, "suspend") || enough_memory_for_hibernation();
+}
+#endif // 0