strv: make sure FOREACH_STRING() can be nested

diff --git a/src/basic/strv.h b/src/basic/strv.h
index a56ef94139976263da24734321023fed9eaff0a6..2df16a8962eca50cbe0dd3afc95d428f26c3131a 100644 (file)
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -206,10 +206,13 @@ void strv_print(char * const *l);
                 _found;                                         \
         })
 
-#define FOREACH_STRING(x, y, ...)                                       \
-        for (char **_l = STRV_MAKE(({ x = y; }), ##__VA_ARGS__);        \
+#define _FOREACH_STRING(uniq, x, y, ...)                                \
+        for (char **UNIQ_T(l, uniq) = STRV_MAKE(({ x = y; }), ##__VA_ARGS__); \
              x;                                                         \
-             x = *(++_l))
+             x = *(++UNIQ_T(l, uniq)))
+
+#define FOREACH_STRING(x, y, ...)                       \
+        _FOREACH_STRING(UNIQ, x, y, ##__VA_ARGS__)
 
 char **strv_reverse(char **l);
 char **strv_shell_escape(char **l, const char *bad);