aboutsummaryrefslogtreecommitdiff
path: root/slave.c
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2024-08-03 07:12:13 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2024-08-03 07:51:06 +0000
commitf87c9bb9f70f1a6c8c7081c762c15ba7eaaf971e (patch)
treeaa30277b7b180ec4af22163aebf63686fc93e0be /slave.c
parentchangelog: add new 'unreleased' section (diff)
xmalloc: remove delim param from xstrjoin() and add separate xstrjoin3()
This avoids the need for an unused third argument for most xstrjoin() calls and replaces the cases where it's needed with a more flexible function. Code generation is the same in both cases, when there are 2 string params and a compile-time known delimiter. This commit also converts 4 uses of xasprintf() to use xstrjoin*(). See also: https://godbolt.org/z/xsjrhv9b6
Diffstat (limited to 'slave.c')
-rw-r--r--slave.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/slave.c b/slave.c
index 00105adb..bf1ca8e0 100644
--- a/slave.c
+++ b/slave.c
@@ -55,7 +55,7 @@ find_file_in_path(const char *file)
path != NULL;
path = strtok(NULL, ":"))
{
- char *full = xasprintf("%s/%s", path, file);
+ char *full = xstrjoin3(path, "/", file);
if (access(full, F_OK) == 0) {
free(path_list);
return full;
@@ -329,7 +329,7 @@ add_to_env(struct environ *env, const char *name, const char *value)
if (env->envp == NULL)
setenv(name, value, 1);
else {
- char *e = xasprintf("%s=%s", name, value);
+ char *e = xstrjoin3(name, "=", value);
/* Search for existing variable. If found, replace it with the
new value */