X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fsleep-config.c;h=3dedbd1f6269db89a72569a466b9ce7a4296300d;hp=d76e3ad0365411b46dd4c4ac7e7c985675833f2e;hb=d2338db3145922b1dfcb3b458e5bce2568a9347a;hpb=db69869f264af2d1afcdd3e573e0e9fdd5bef065 diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c index d76e3ad03..3dedbd1f6 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -28,11 +28,15 @@ #include "strv.h" #include "util.h" -int parse_sleep_config(const char *verb, char ***modes, char ***states) { +#define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0) + +int parse_sleep_config(const char *verb, char ***_modes, char ***_states) { + _cleanup_strv_free_ char **suspend_mode = NULL, **suspend_state = NULL, **hibernate_mode = NULL, **hibernate_state = NULL, **hybrid_mode = NULL, **hybrid_state = NULL; + char **modes, **states; const ConfigTableItem items[] = { { "Sleep", "SuspendMode", config_parse_strv, 0, &suspend_mode }, @@ -41,70 +45,61 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) { { "Sleep", "HibernateState", config_parse_strv, 0, &hibernate_state }, { "Sleep", "HybridSleepMode", config_parse_strv, 0, &hybrid_mode }, { "Sleep", "HybridSleepState", config_parse_strv, 0, &hybrid_state }, - {}}; + {} + }; - int r; - FILE _cleanup_fclose_ *f; - - f = fopen(PKGSYSCONFDIR "/sleep.conf", "re"); - if (!f) - log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING, - "Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m"); - else { - r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0", - config_item_table_lookup, (void*) items, false, false, NULL); - if (r < 0) - log_warning("Failed to parse configuration file: %s", strerror(-r)); - } + config_parse_many(PKGSYSCONFDIR "/sleep.conf", + CONF_DIRS_NULSTR("systemd/sleep.conf"), + "Sleep\0", config_item_table_lookup, items, + false, NULL); if (streq(verb, "suspend")) { /* empty by default */ - *modes = suspend_mode; + USE(modes, suspend_mode); if (suspend_state) - *states = suspend_state; + USE(states, suspend_state); else - *states = strv_split_nulstr("mem\0standby\0freeze\0"); + states = strv_new("mem", "standby", "freeze", NULL); - suspend_mode = suspend_state = NULL; } else if (streq(verb, "hibernate")) { if (hibernate_mode) - *modes = hibernate_mode; + USE(modes, hibernate_mode); else - *modes = strv_split_nulstr("platform\0shutdown\0"); + modes = strv_new("platform", "shutdown", NULL); if (hibernate_state) - *states = hibernate_state; + USE(states, hibernate_state); else - *states = strv_split_nulstr("disk\0"); + states = strv_new("disk", NULL); - hibernate_mode = hibernate_state = NULL; } else if (streq(verb, "hybrid-sleep")) { if (hybrid_mode) - *modes = hybrid_mode; + USE(modes, hybrid_mode); else - *modes = strv_split_nulstr("suspend\0platform\0shutdown\0"); + modes = strv_new("suspend", "platform", "shutdown", NULL); if (hybrid_state) - *states = hybrid_state; + USE(states, hybrid_state); else - *states = strv_split_nulstr("disk\0"); + states = strv_new("disk", NULL); - hybrid_mode = hybrid_state = NULL; } else assert_not_reached("what verb"); - if (!modes || !states) { - strv_free(*modes); - strv_free(*states); + if ((!modes && !streq(verb, "suspend")) || !states) { + strv_free(modes); + strv_free(states); return log_oom(); } + *_modes = modes; + *_states = states; return 0; } int can_sleep_state(char **types) { - char *w, *state, **type; + char **type; int r; _cleanup_free_ char *p = NULL; @@ -120,11 +115,12 @@ int can_sleep_state(char **types) { return false; STRV_FOREACH(type, types) { + const char *word, *state; size_t l, k; k = strlen(*type); - FOREACH_WORD_SEPARATOR(w, l, p, WHITESPACE, state) - if (l == k && memcmp(w, *type, l) == 0) + FOREACH_WORD_SEPARATOR(word, l, p, WHITESPACE, state) + if (l == k && memcmp(word, *type, l) == 0) return true; } @@ -132,7 +128,7 @@ int can_sleep_state(char **types) { } int can_sleep_disk(char **types) { - char *w, *state, **type; + char **type; int r; _cleanup_free_ char *p = NULL; @@ -148,14 +144,18 @@ int can_sleep_disk(char **types) { return false; STRV_FOREACH(type, types) { + const char *word, *state; size_t l, k; k = strlen(*type); - FOREACH_WORD_SEPARATOR(w, l, p, WHITESPACE, state) { - if (l == k && memcmp(w, *type, l) == 0) + FOREACH_WORD_SEPARATOR(word, l, p, WHITESPACE, state) { + if (l == k && memcmp(word, *type, l) == 0) return true; - if (l == k + 2 && w[0] == '[' && memcmp(w + 1, *type, l - 2) == 0 && w[l-1] == ']') + if (l == k + 2 && + word[0] == '[' && + memcmp(word + 1, *type, l - 2) == 0 && + word[l-1] == ']') return true; } } @@ -167,12 +167,12 @@ int can_sleep_disk(char **types) { static int hibernation_partition_size(size_t *size, size_t *used) { _cleanup_fclose_ FILE *f; - int i; + unsigned i; assert(size); assert(used); - f = fopen("/proc/swaps", "r"); + f = fopen("/proc/swaps", "re"); if (!f) { log_full(errno == ENOENT ? LOG_DEBUG : LOG_WARNING, "Failed to retrieve open /proc/swaps: %m"); @@ -190,8 +190,8 @@ static int hibernation_partition_size(size_t *size, size_t *used) { k = fscanf(f, "%ms " /* device/file */ "%ms " /* type of swap */ - "%zd " /* swap size */ - "%zd " /* used */ + "%zu " /* swap size */ + "%zu " /* used */ "%*i\n", /* priority */ &dev, &type, &size_field, &used_field); if (k != 4) { @@ -218,24 +218,24 @@ static int hibernation_partition_size(size_t *size, size_t *used) { static bool enough_memory_for_hibernation(void) { _cleanup_free_ char *active = NULL; - unsigned long long act; - size_t size, used; + unsigned long long act = 0; + size_t size = 0, used = 0; int r; r = hibernation_partition_size(&size, &used); 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("Failed to retrieve Active(anon) from /proc/meminfo: %s", strerror(-r)); + log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m"); return false; } r = safe_atollu(active, &act); if (r < 0) { - log_error("Failed to parse Active(anon) from /proc/meminfo: %s: %s", - active, strerror(-r)); + log_error_errno(r, "Failed to parse Active(anon) from /proc/meminfo: %s: %m", + active); return false; }