Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 08:46:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: turn invalid config-file values into errors in the list

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-09-11 09:46:27 -07:00
parent f0ee2fb454
commit 22f3fea98f
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/config/Config.zig
View File

@ -764,16 +764,25 @@ pub fn loadCliArgs(self: *Config, alloc_gpa: Allocator) !void {
/// Load and parse the config files that were added in the "config-file" key. /// Load and parse the config files that were added in the "config-file" key.
pub fn loadRecursiveFiles(self: *Config, alloc: Allocator) !void { pub fn loadRecursiveFiles(self: *Config, alloc: Allocator) !void {
// TODO(mitchellh): we should parse the files form the homedir first
// TODO(mitchellh): support nesting (config-file in a config file) // TODO(mitchellh): support nesting (config-file in a config file)
// TODO(mitchellh): detect cycles when nesting // TODO(mitchellh): detect cycles when nesting
if (self.@"config-file".list.items.len == 0) return; if (self.@"config-file".list.items.len == 0) return;
const arena_alloc = self._arena.?.allocator();
const cwd = std.fs.cwd(); const cwd = std.fs.cwd();
const len = self.@"config-file".list.items.len; const len = self.@"config-file".list.items.len;
for (self.@"config-file".list.items) |path| { for (self.@"config-file".list.items) |path| {
var file = try cwd.openFile(path, .{}); var file = cwd.openFile(path, .{}) catch |err| {
try self._errors.add(arena_alloc, .{
.message = try std.fmt.allocPrintZ(
arena_alloc,
"error opening config-file {s}: {}",
.{ path, err },
),
});
continue;
};
defer file.close(); defer file.close();
var buf_reader = std.io.bufferedReader(file.reader()); var buf_reader = std.io.bufferedReader(file.reader());
@ -783,8 +792,15 @@ pub fn loadRecursiveFiles(self: *Config, alloc: Allocator) !void {
// We don't currently support adding more config files to load // We don't currently support adding more config files to load
// from within a loaded config file. This can be supported // from within a loaded config file. This can be supported
// later. // later.
if (self.@"config-file".list.items.len > len) if (self.@"config-file".list.items.len > len) {
return error.ConfigFileInConfigFile; try self._errors.add(arena_alloc, .{
.message = try std.fmt.allocPrintZ(
arena_alloc,
"config-file cannot be used in a config-file. Found in {s}",
.{path},
),
});
}
} }
} }