mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

common/string-helpers.c: add strdup_printf()

Browse source
This commit is contained in:
Johan Malm 2023-06-25 09:00:41 +01:00 • committed by Johan Malm
parent 41de529fff
commit f4f35a9dff
4 changed files with 47 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/common/string-helpers.c
View file

@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "common/mem.h"
#include "common/string-helpers.h"
static void
@ -37,3 +39,32 @@ string_truncate_at_pattern(char *buf, const char *pattern)
}
*p = '\0';
}
char *
strdup_printf(const char *fmt, ...)
{
size_t size = 0;
char *p = NULL;
va_list ap;
va_start(ap, fmt);
int n = vsnprintf(p, size, fmt, ap);
va_end(ap);
if (n < 0) {
return NULL;
}
size = (size_t)n + 1;
p = xzalloc(size);
va_start(ap, fmt);
n = vsnprintf(p, size, fmt, ap);
va_end(ap);
if (n < 0) {
free(p);
return NULL;
}
return p;
}

4
src/config/rcxml.c
View file

@ -1096,11 +1096,9 @@ post_processing(void)
int nr_workspaces = wl_list_length(&rc.workspace_config.workspaces);
if (nr_workspaces < rc.workspace_config.min_nr_workspaces) {
struct workspace *workspace;
char workspace_name[32];
for (int i = nr_workspaces; i < rc.workspace_config.min_nr_workspaces; i++) {
workspace = znew(*workspace);
snprintf(workspace_name, sizeof(workspace_name), "Workspace %d", i + 1);
workspace->name = xstrdup(workspace_name);
workspace->name = strdup_printf("Workspace %d", i + 1);
wl_list_append(&rc.workspace_config.workspaces, &workspace->link);
}
}

24
src/config/session.c
View file

@ -79,12 +79,7 @@ build_path(const char *dir, const char *filename)
if (string_empty(dir) || string_empty(filename)) {
return NULL;
}
int len = strlen(dir) + strlen(filename) + 2;
char *buffer = znew_n(char, len);
strcat(buffer, dir);
strcat(buffer, "/");
strcat(buffer, filename);
return buffer;
return strdup_printf("%s/%s", dir, filename);
}
static void
@ -98,19 +93,11 @@ update_activation_env(const char *env_keys)
}
wlr_log(WLR_INFO, "Updating dbus execution environment");
char *cmd;
const char *dbus = "dbus-update-activation-environment ";
const char *systemd = "systemctl --user import-environment ";
cmd = znew_n(char, strlen(dbus) + strlen(env_keys) + 1);
strcat(cmd, dbus);
strcat(cmd, env_keys);
char *cmd = strdup_printf("dbus-update-activation-environment %s", env_keys);
spawn_async_no_shell(cmd);
free(cmd);
cmd = znew_n(char, strlen(systemd) + strlen(env_keys) + 1);
strcat(cmd, systemd);
strcat(cmd, env_keys);
cmd = strdup_printf("systemctl --user import-environment %s", env_keys);
spawn_async_no_shell(cmd);
free(cmd);
}
@ -148,10 +135,7 @@ session_autostart_init(const char *dir)
goto out;
}
wlr_log(WLR_INFO, "run autostart file %s", autostart);
int len = strlen(autostart) + 4;
char *cmd = znew_n(char, len);
strcat(cmd, "sh ");
strcat(cmd, autostart);
char *cmd = strdup_printf("sh %s", autostart);
spawn_async_no_shell(cmd);
free(cmd);
out: