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

detect config file load in config file

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-08-02 09:25:36 -07:00
parent 782ddfe722
commit 84af11e1eb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.zig
View File

@ -48,6 +48,7 @@ pub fn main() !void {
// 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 (config.@"config-file".list.items.len > 0) { if (config.@"config-file".list.items.len > 0) {
const len = config.@"config-file".list.items.len;
const cwd = std.fs.cwd(); const cwd = std.fs.cwd();
for (config.@"config-file".list.items) |path| { for (config.@"config-file".list.items) |path| {
var file = try cwd.openFile(path, .{}); var file = try cwd.openFile(path, .{});
@ -57,6 +58,12 @@ pub fn main() !void {
var iter = cli_args.lineIterator(buf_reader.reader()); var iter = cli_args.lineIterator(buf_reader.reader());
try cli_args.parse(Config, alloc, &config, &iter); try cli_args.parse(Config, alloc, &config, &iter);
// We don't currently support adding more config files to load
// from within a loaded config file. This can be supported
// later.
if (config.@"config-file".list.items.len > len)
return error.ConfigFileInConfigFile;
} }
} }
log.info("config={}", .{config}); log.info("config={}", .{config});