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.
This commit is contained in:
Lennart Poettering
2016-01-26 14:42:04 +01:00
parent b2a81c0b52
commit d390f8ef2d
5 changed files with 46 additions and 49 deletions
+2 -13
View File
@@ -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;