From e8f63ab90c10358a7e14121e66fa29d269ad1d16 Mon Sep 17 00:00:00 2001
From: Thomas Voss <thomas.voss@humanwave.nl>
Date: Thu, 18 Jan 2024 16:52:45 +0100
Subject: Append to sv instead of overwriting it
---
cbs.h | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/cbs.h b/cbs.h
index b94f7b7..b807742 100644
--- a/cbs.h
+++ b/cbs.h
@@ -614,21 +614,19 @@ env_or_defaultv(struct strv *sv, const char *s, char **p, size_t n)
die("wordexp");
}
- sv->buf = bufalloc(NULL, we.we_wordc, sizeof(*sv->buf));
- for (size_t i = 0; i < we.we_wordc; i++) {
- if (!(sv->buf[i] = strdup(we.we_wordv[i])))
- die("strdup");
- }
- sv->len = we.we_wordc;
- wordfree(&we);
- } else {
- sv->buf = bufalloc(NULL, n, sizeof(*sv->buf));
- for (size_t i = 0; i < n; i++) {
- if (!(sv->buf[i] = strdup(p[i])))
- die("strdup");
- }
- sv->len = n;
+ p = we.we_wordv;
+ n = we.we_wordc;
+ }
+
+ sv->buf = bufalloc(sv->buf, sv->len + n, sizeof(*sv->buf));
+ for (size_t i = 0; i < n; i++) {
+ if (!(sv->buf[sv->len + i] = strdup(p[i])))
+ die("strdup");
}
+ sv->len += n;
+
+ if (ev && *ev)
+ wordfree(&we);
}
bool
--
cgit v1.2.3