mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-20 19:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash when failing to parse arguments

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2025-11-30 09:14:10 +01:00
parent 1980b2e479
commit 10854e643a
22 changed files with 89 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/config/Lang.zig
View File

@@ -9,6 +9,7 @@ brightness_up: []const u8 = "increase brightness",
capslock: []const u8 = "capslock",
custom: []const u8 = "custom",
err_alloc: []const u8 = "failed memory allocation",
err_args: []const u8 = "unable to parse command line arguments",
err_autologin_session: []const u8 = "autologin session not found",
err_bounds: []const u8 = "out-of-bounds index",
err_brightness_change: []const u8 = "failed to change brightness",

42
src/main.zig
View File

@@ -110,12 +110,14 @@ pub fn main() !void {
);
var diag = clap.Diagnostic{};
var res = clap.parse(clap.Help, &params, clap.parsers.default, .{ .diagnostic = &diag, .allocator = allocator }) catch |err| {
var arg_parse_error: anyerror = undefined;
var maybe_res = clap.parse(clap.Help, &params, clap.parsers.default, .{ .diagnostic = &diag, .allocator = allocator }) catch |err| parse_error: {
arg_parse_error = err;
diag.report(stderr, err) catch {};
try stderr.flush();
return err;
break :parse_error null;
};
defer res.deinit();
defer if (maybe_res) |*res| res.deinit();
var config: Config = undefined;
var lang: Lang = undefined;
@@ -128,17 +130,19 @@ pub fn main() !void {
var saved_users = SavedUsers.init();
defer saved_users.deinit(allocator);
if (res.args.help != 0) {
try clap.help(stderr, clap.Help, &params, .{});
if (maybe_res) |*res| {
if (res.args.help != 0) {
try clap.help(stderr, clap.Help, &params, .{});
_ = try stderr.write("Note: if you want to configure Ly, please check the config file, which is located at " ++ build_options.config_directory ++ "/ly/config.ini.\n");
try stderr.flush();
std.process.exit(0);
}
if (res.args.version != 0) {
_ = try stderr.write("Ly version " ++ build_options.version ++ "\n");
try stderr.flush();
std.process.exit(0);
_ = try stderr.write("Note: if you want to configure Ly, please check the config file, which is located at " ++ build_options.config_directory ++ "/ly/config.ini.\n");
try stderr.flush();
std.process.exit(0);
}
if (res.args.version != 0) {
_ = try stderr.write("Ly version " ++ build_options.version ++ "\n");
try stderr.flush();
std.process.exit(0);
}
}
// Load configuration file
@@ -161,7 +165,8 @@ pub fn main() !void {
const comment_characters = "#";
if (res.args.config) |s| {
if (maybe_res != null and maybe_res.?.args.config != null) {
const s = maybe_res.?.args.config.?;
const trailing_slash = if (s[s.len - 1] != '/') "/" else "";
const config_path = try std.fmt.allocPrint(allocator, "{s}{s}config.ini", .{ s, trailing_slash });
@@ -330,6 +335,15 @@ pub fn main() !void {
var info_line = InfoLine.init(allocator, &buffer);
defer info_line.deinit();
if (maybe_res == null) {
var longest = diag.name.longest();
if (longest.kind == .positional)
longest.name = diag.arg;
try info_line.addMessage(lang.err_args, config.error_bg, config.error_fg);
try log_writer.print("unable to parse argument '{s}{s}': {s}\n", .{ longest.kind.prefix(), longest.name, @errorName(arg_parse_error) });
}
if (maybe_config_load_error) |err| {
// We can't localize this since the config failed to load so we'd fallback to the default language anyway
try info_line.addMessage("unable to parse config file", config.error_bg, config.error_fg);