[systemd-commits] 2 commits - src/core src/libsystemd

[Zbigniew Jędrzejewski-Szmek]

 src/core/service.c                |    8 +++++++-
 src/libsystemd/sd-bus/bus-match.c |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a3e648ccbb6b4ded2a9d4a95598df156de973db1
Author: Simon Peeters <peeters.simon at gmail.com>
Date:   Sun Feb 16 03:01:17 2014 +0100

    bus: fix match_parse for unquoted matches

diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index ffc9756..8280488 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -814,7 +814,7 @@ int bus_match_parse(
 
                 value = NULL;
 
-                if (q[1] == 0)
+                if (q[quoted] == 0)
                         break;
 
                 if (q[quoted] != ',') {

commit e3025da104f96ab428a9121f738c6343964d5260
Author: Yuxuan Shui <yshuiv7 at gmail.com>
Date:   Sat Feb 15 13:20:55 2014 +0800

    core: check for return value from get_process_state
    
    Fix for commit e10c9985bb.

diff --git a/src/core/service.c b/src/core/service.c
index 3a2ef01..8e07bd0 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1376,7 +1376,13 @@ static int service_load_pid_file(Service *s, bool may_warn) {
                 return -ESRCH;
         }
 
-        if (get_process_state(pid) == 'Z') {
+        r = get_process_state(pid);
+        if (r < 0) {
+                if (may_warn)
+                        log_info_unit(UNIT(s)->id, "Failed to read /proc/%d/stat: %s",
+                                      pid, strerror(-r));
+                return r;
+        } else if (r == 'Z') {
                 if (may_warn)
                         log_info_unit(UNIT(s)->id,
                                       "PID "PID_FMT" read from file %s is a zombie.",