mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-06 01:05:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2025-04-25 07:43:19 +05:30
parent 1f9a5647d4
commit 9f11782920
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kitty/launcher/main.c
View File

@@ -16,12 +16,6 @@
#else
#include <limits.h>
#endif
#include <pwd.h>
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include <fcntl.h>
#include "launcher.h"
#include "utils.h"
@@ -41,7 +35,7 @@ static bool
safe_realpath(const char* src, char *buf, size_t buf_sz) {
RAII_ALLOC(char, ans, realpath(src, NULL));
if (ans == NULL) return false;
snprintf(buf, buf_sz, "%s", ans);
safe_snprintf(buf, buf_sz, "%s", ans);
return true;
}
#endif
@@ -170,7 +164,7 @@ run_embedded(RunData *run_data) {
#else
const char *python_relpath = "../" KITTY_LIB_DIR_NAME;
#endif
int num = snprintf(extensions_dir_full, PATH_MAX, "%s/%s/kitty-extensions", run_data->exe_dir, python_relpath);
int num = safe_snprintf(extensions_dir_full, PATH_MAX, "%s/%s/kitty-extensions", run_data->exe_dir, python_relpath);
if (num < 0 || num >= PATH_MAX) { fprintf(stderr, "Failed to create path to extensions_dir: %s/%s\n", run_data->exe_dir, python_relpath); return 1; }
wchar_t extensions_dir[num+2];
if (!canonicalize_path_wide(extensions_dir_full, extensions_dir, num+1)) {
@@ -220,7 +214,7 @@ run_embedded(RunData *run_data) {
#ifdef SET_PYTHON_HOME
#ifndef __APPLE__
char pyhome[256];
snprintf(pyhome, sizeof(pyhome), "%s/%s", run_data->lib_dir, SET_PYTHON_HOME);
safe_snprintf(pyhome, sizeof(pyhome), "%s/%s", run_data->lib_dir, SET_PYTHON_HOME);
status = PyConfig_SetBytesString(&config, &config.home, pyhome);
if (PyStatus_Exception(status)) goto fail;
#endif
@@ -285,7 +279,7 @@ read_exe_path(char *exe, size_t buf_sz) {
char *token = strtok(buf, ":");
while (token != NULL) {
char q[PATH_MAX + 1] = {0};
snprintf(q, PATH_MAX, "%s/kitty", token);
safe_snprintf(q, PATH_MAX, "%s/kitty", token);
if (safe_realpath(q, exe, buf_sz)) return true;
token = strtok(NULL, ":");
}
@@ -351,14 +345,14 @@ ensure_working_stdio(void) {
static bool
is_wrapped_kitten(const char *arg) {
char buf[64];
snprintf(buf, sizeof(buf)-1, " %s ", arg);
safe_snprintf(buf, sizeof(buf)-1, " %s ", arg);
return strstr(" " WRAPPED_KITTENS " ", buf);
}
static void
exec_kitten(int argc, char *argv[], char *exe_dir) {
char exe[PATH_MAX+1] = {0};
snprintf(exe, PATH_MAX, "%s/kitten", exe_dir);
safe_snprintf(exe, PATH_MAX, "%s/kitten", exe_dir);
char **newargv = malloc(sizeof(char*) * (argc + 1));
memcpy(newargv, argv, sizeof(char*) * argc);
newargv[argc] = 0;
@@ -373,7 +367,7 @@ static bool
is_boolean_flag(const char *x) {
static const char *all_boolean_options = KITTY_CLI_BOOL_OPTIONS;
char buf[128];
snprintf(buf, sizeof(buf), " %s ", x);
safe_snprintf(buf, sizeof(buf), " %s ", x);
return strstr(all_boolean_options, buf) != NULL;
}
@@ -474,7 +468,7 @@ handle_option_value:
char igbuf[256];
if (instance_group_prefix && instance_group_prefix[0]) {
if (opts.instance_group && opts.instance_group[0]) {
snprintf(igbuf, sizeof(igbuf), "%s-%s", instance_group_prefix, opts.instance_group ? opts.instance_group : "");
safe_snprintf(igbuf, sizeof(igbuf), "%s-%s", instance_group_prefix, opts.instance_group ? opts.instance_group : "");
opts.instance_group = igbuf;
} else {
opts.instance_group = instance_group_prefix;
@@ -527,15 +521,13 @@ int main(int argc, char *argv[], char* envp[]) {
strncpy(exe_dir_buf, exe, sizeof(exe_dir_buf));
char *exe_dir = dirname(exe_dir_buf);
if (!delegate_to_kitten_if_possible(argc, argv, exe_dir)) handle_fast_commandline(argc, argv, NULL);
int num, ret=0;
int ret=0;
char lib[PATH_MAX+1] = {0};
if (KITTY_LIB_PATH[0] == '/') {
num = snprintf(lib, PATH_MAX, "%s", KITTY_LIB_PATH);
safe_snprintf(lib, PATH_MAX, "%s", KITTY_LIB_PATH);
} else {
num = snprintf(lib, PATH_MAX, "%s/%s", exe_dir, KITTY_LIB_PATH);
safe_snprintf(lib, PATH_MAX, "%s/%s", exe_dir, KITTY_LIB_PATH);
}
if (num < 0 || num >= PATH_MAX) { fprintf(stderr, "Failed to create path to kitty lib\n"); return 1; }
RunData run_data = {
.exe = exe, .exe_dir = exe_dir, .lib_dir = lib, .argc = argc, .argv = argv, .lc_ctype = lc_ctype,
.launched_by_launch_services=launched_by_launch_services, .config_dir = config_dir,

11
kitty/launcher/utils.h
View File

@@ -34,6 +34,8 @@ ensure_home_path(void) {
}
}
#define safe_snprintf(buf, sz, fmt, ...) { int n = snprintf(buf, sz, fmt, __VA_ARGS__); if (n < 0 || (size_t)n >= sz) { fprintf(stderr, "Out of buffer space calling sprintf for format: %s at line: %d\n", fmt, __LINE__); exit(1); }}
static const char*
home_path_for(const char *username) {
struct passwd* pw = getpwnam(username);
@@ -44,7 +46,7 @@ home_path_for(const char *username) {
static void
expand_tilde(const char* path, char *ans, size_t ans_sz) {
if (path[0] != '~') {
snprintf(ans, ans_sz, "%s", path);
safe_snprintf(ans, ans_sz, "%s", path);
return;
}
const char *prefix = NULL, *sep = "";
@@ -65,7 +67,7 @@ expand_tilde(const char* path, char *ans, size_t ans_sz) {
}
}
// Construct the expanded path
snprintf(ans, ans_sz, "%s%s%s", prefix, sep, path + 1);
safe_snprintf(ans, ans_sz, "%s%s%s", prefix, sep, path + 1);
}
static size_t
@@ -177,7 +179,7 @@ get_config_dir(char *output, size_t outputsz) {
#endif
q = getenv("XDG_CONFIG_DIRS");
if (q && q[0]) {
snprintf(buf2, sizeof(buf2), "%s", q);
safe_snprintf(buf2, sizeof(buf2), "%s", q);
char *s, *token = strtok_r(buf2, ":", &s);
while (token) {
check_and_ret(token);
@@ -187,8 +189,7 @@ get_config_dir(char *output, size_t outputsz) {
q = getenv("XDG_CONFIG_HOME");
if (!q || !q[0]) q = "~/.config";
expand(q, buf2, sizeof(buf2));
int n = snprintf(output, outputsz, "%s/kitty", buf2);
if (n <= 0 || (size_t)n >= outputsz) return false;
safe_snprintf(output, outputsz, "%s/kitty", buf2);
if (makedirs(output, 0755)) return true;
return false;
#undef expand