Merge pull request #15309 from poettering/strv-split

remove dead-lock in strv_split()

TODO

@@ -117,7 +117,8 @@ Features:
 
 * systemd-repart: allow config of partition uuid
 
-* userdb: allow username prefix searches in varlink API
+* userdb: allow username prefix searches in varlink API, allow realname and
+  realname substr searches in varlink API
 
 * userdb: allow existence checks
 
@@ -864,6 +865,7 @@ Features:
     make assumptions about their slice anymore.
   - follow PropertiesChanged state more closely, to deal with quick logouts and
     relogins
+  - (optionally?) spawn seat-manager@$SEAT.service whenever a seat shows up that as CanGraphical set
 
 * journal:
   - consider introducing implicit _TTY= + _PPID= + _EUID= + _EGID= + _FSUID= + _FSGID= fields

src/basic/string-util.c

@@ -113,7 +113,7 @@ static size_t strcspn_escaped(const char *s, const char *reject) {
         bool escaped = false;
         int n;
 
-        for (n=0; s[n]; n++) {
+        for (n = 0; s[n] != '\0'; n++) {
                 if (escaped)
                         escaped = false;
                 else if (s[n] == '\\')
@@ -122,50 +122,62 @@ static size_t strcspn_escaped(const char *s, const char *reject) {
                         break;
         }
 
-        /* if s ends in \, return index of previous char */
+        return n;
-        return n - escaped;
 }
 
 /* Split a string into words. */
-const char* split(const char **state, size_t *l, const char *separator, SplitFlags flags) {
+const char* split(
+                const char **state,
+                size_t *l,
+                const char *separator,
+                SplitFlags flags) {
+
         const char *current;
 
+        assert(state);
+        assert(l);
+
+        if (!separator)
+                separator = WHITESPACE;
+
         current = *state;
 
-        if (!*current) {
+        if (*current == '\0') /* already at the end? */
-                assert(**state == '\0');
                 return NULL;
-        }
 
-        current += strspn(current, separator);
+        current += strspn(current, separator); /* skip leading separators */
-        if (!*current) {
+        if (*current == '\0') { /* at the end now? */
                 *state = current;
                 return NULL;
         }
 
-        if (flags & SPLIT_QUOTES && strchr("\'\"", *current)) {
+        if (FLAGS_SET(flags, SPLIT_QUOTES)) {
-                char quotechars[2] = {*current, '\0'};
 
-                *l = strcspn_escaped(current + 1, quotechars);
+                if (strchr(QUOTES, *current)) {
-                if (current[*l + 1] == '\0' || current[*l + 1] != quotechars[0] ||
+                        /* We are looking at a quote */
-                    (current[*l + 2] && !strchr(separator, current[*l + 2]))) {
+                        *l = strcspn_escaped(current + 1, CHAR_TO_STR(*current));
-                        /* right quote missing or garbage at the end */
+                        if (current[*l + 1] != *current ||
-                        if (flags & SPLIT_RELAX) {
+                            (current[*l + 2] != 0 && !strchr(separator, current[*l + 2]))) {
-                                *state = current + *l + 1 + (current[*l + 1] != '\0');
+                                /* right quote missing or garbage at the end */
-                                return current + 1;
+                                if (FLAGS_SET(flags, SPLIT_RELAX)) {
+                                        *state = current + *l + 1 + (current[*l + 1] != '\0');
+                                        return current + 1;
+                                }
+                                *state = current;
+                                return NULL;
                         }
-                        *state = current;
+                        *state = current++ + *l + 2;
-                        return NULL;
+
+                } else {
+                        /* We are looking at a something that is not a quote */
+                        *l = strcspn_escaped(current, separator);
+                        if (current[*l] && !strchr(separator, current[*l]) && !FLAGS_SET(flags, SPLIT_RELAX)) {
+                                /* unfinished escape */
+                                *state = current;
+                                return NULL;
+                        }
+                        *state = current + *l;
                 }
-                *state = current++ + *l + 2;
-        } else if (flags & SPLIT_QUOTES) {
-                *l = strcspn_escaped(current, separator);
-                if (current[*l] && !strchr(separator, current[*l]) && !(flags & SPLIT_RELAX)) {
-                        /* unfinished escape */
-                        *state = current;
-                        return NULL;
-                }
-                *state = current + *l;
         } else {
                 *l = strcspn(current, separator);
                 *state = current + *l;

src/basic/string-util.h

@@ -112,8 +112,10 @@ typedef enum SplitFlags {
         SPLIT_RELAX                      = 0x01 << 1,
 } SplitFlags;
 
+/* Smelly. Do not use this anymore. Use extract_first_word() instead! */
 const char* split(const char **state, size_t *l, const char *separator, SplitFlags flags);
 
+/* Similar, don't use this anymore */
 #define FOREACH_WORD(word, length, s, state)                            \
         _FOREACH_WORD(word, length, s, WHITESPACE, 0, state)
 

src/test/test-strv.c

@@ -307,6 +307,12 @@ static void test_strv_split(void) {
         l = strv_split_full("    'one'  \"  two\t three \"' four  five", NULL, SPLIT_QUOTES | SPLIT_RELAX);
         assert_se(l);
         assert_se(strv_equal(l, (char**) input_table_quoted));
+
+        strv_free_erase(l);
+
+        l = strv_split_full("\\", NULL, SPLIT_QUOTES | SPLIT_RELAX);
+        assert_se(l);
+        assert_se(strv_equal(l, STRV_MAKE("\\")));
 }
 
 static void test_strv_split_empty(void) {