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

Abort fast cmdline if help requested

Browse Source
This commit is contained in:
Kovid Goyal
2025-04-24 10:26:47 +05:30
parent 9ad8dfaf3f
commit f49dbfaa7e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/launcher/main.c
View File

@@ -392,21 +392,24 @@ handle_option_value:
} }
if (arg[1] == '-') { // long opt if (arg[1] == '-') { // long opt
const char *equal = strchr(arg, '='); const char *equal = strchr(arg, '=');
const char *q = arg + 2;
if (equal == NULL) { if (equal == NULL) {
if (strcmp(arg+2, "version") == 0) { if (strcmp(q, "version") == 0) {
opts.version_requested = true; opts.version_requested = true;
} else if (strcmp(arg+2, "single-instance") == 0) { } else if (strcmp(q, "single-instance") == 0) {
opts.single_instance = true; opts.single_instance = true;
} else if (strcmp(arg+2, "wait-for-single-instance-window-close") == 0) { } else if (strcmp(q, "wait-for-single-instance-window-close") == 0) {
opts.wait_for_single_instance_window_close = true; opts.wait_for_single_instance_window_close = true;
} else if (strcmp(arg+2, "detach") == 0) { } else if (strcmp(q, "detach") == 0) {
opts.detach = true; opts.detach = true;
} else if (strcmp(q, "help") == 0) {
return;
} else if (!is_boolean_flag(arg+2)) { } else if (!is_boolean_flag(arg+2)) {
strncpy(current_option_expecting_argument, arg+2, sizeof(current_option_expecting_argument)-1); strncpy(current_option_expecting_argument, q, sizeof(current_option_expecting_argument)-1);
} }
} else { } else {
memcpy(current_option_expecting_argument, arg+2, equal - (arg + 2)); memcpy(current_option_expecting_argument, q, equal - q);
current_option_expecting_argument[equal - (arg + 2)] = 0; current_option_expecting_argument[equal - q] = 0;
arg = equal + 1; arg = equal + 1;
goto handle_option_value; goto handle_option_value;
} }
@@ -420,6 +423,7 @@ handle_option_value:
goto handle_option_value; goto handle_option_value;
case 'v': opts.version_requested = true; break; case 'v': opts.version_requested = true; break;
case '1': opts.single_instance = true; break; case '1': opts.single_instance = true; break;
case 'h': return;
default: default:
buf[0] = arg[i]; buf[1] = 0; buf[0] = arg[i]; buf[1] = 0;
if (!is_boolean_flag(buf)) { current_option_expecting_argument[0] = arg[i]; current_option_expecting_argument[1] = 0; } if (!is_boolean_flag(buf)) { current_option_expecting_argument[0] = arg[i]; current_option_expecting_argument[1] = 0; }