util: introduce fputs_with_space() and make use of it at various places

The call combines outputing a string with prefixing it with a space, optionally. This is useful to shorten the logic
for outputing lists of strings, that are space separated.

1 files changed, 2 insertions, 13 deletions

diff --git a/src/basic/strv.c b/src/basic/strv.c
index dc5bafcf24..5532c53ad1 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -29,6 +29,7 @@
 #include "alloc-util.h"
 #include "escape.h"
 #include "extract-word.h"
+#include "fileio.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
@@ -879,25 +880,13 @@ int fputstrv(FILE *f, char **l, const char *separator, bool *space) {
 
         /* Like fputs(), but for strv, and with a less stupid argument order */
 
-        if (!f)
-                f = stdout;
-        if (!separator)
-                separator = " ";
         if (!space)
                 space = &b;
 
         STRV_FOREACH(s, l) {
-                if (*space) {
-                        r = fputs(separator, f);
-                        if (r < 0)
-                                return r;
-                }
-
-                r = fputs(*s, f);
+                r = fputs_with_space(f, *s, separator, space);
                 if (r < 0)
                         return r;
-
-                *space = true;
         }
 
         return 0;