X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Ffileio.c;h=603a1c7b38755ad35fec95f48915367341776361;hp=4e2b4442db1fb8756ff52cd8cdbf0e2098da848d;hb=1e5413f74faa378172d556e5dec35ab55de16bbf;hpb=69ab80881552d5f79ca95f6b3be48ad122ab1ec2

diff --git a/src/shared/fileio.c b/src/shared/fileio.c
index 4e2b4442d..603a1c7b3 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -24,6 +24,7 @@
 #include "util.h"
 #include "strv.h"
 #include "utf8.h"
+#include "ctype.h"
 
 int write_string_to_file(FILE *f, const char *line) {
         errno = 0;
@@ -650,9 +651,9 @@ int executable_is_script(const char *path, char **interpreter) {
 }
 
 /**
- * Retrieve one field from a file like /proc/self/status.
- * pattern should start with '\n' and end with ':'. Whitespace
- * after ':' will be skipped. field must be freed afterwards.
+ * Retrieve one field from a file like /proc/self/status.  pattern
+ * should start with '\n' and end with a ':'. Whitespace and zeros
+ * after the ':' will be skipped. field must be freed afterwards.
  */
 int get_status_field(const char *filename, const char *pattern, char **field) {
         _cleanup_free_ char *status = NULL;
@@ -672,7 +673,20 @@ int get_status_field(const char *filename, const char *pattern, char **field) {
                 return -ENOENT;
 
         t += strlen(pattern);
-        t += strspn(t, WHITESPACE);
+        if (*t) {
+                t += strspn(t, " \t");
+
+                /* Also skip zeros, because when this is used for
+                 * capabilities, we don't want the zeros. This way the
+                 * same capability set always maps to the same string,
+                 * irrespective of the total capability set size. For
+                 * other numbers it shouldn't matter. */
+                t += strspn(t, "0");
+                /* Back off one char if there's nothing but whitespace
+                   and zeros */
+                if (!*t || isspace(*t))
+                        t --;
+        }
 
         len = strcspn(t, WHITESPACE);