diff options
| author | 2021-12-21 07:06:13 +0200 | |
|---|---|---|
| committer | 2021-12-21 07:07:58 +0200 | |
| commit | fecea5d7a74f97d41c50734349c80062ce2e9cb6 (patch) | |
| tree | 8c84ca5c9f27dd95038658c97f996e04a4862e00 /src/Config.zig | |
| parent | bugfix (diff) | |
| download | es-fecea5d7a74f97d41c50734349c80062ce2e9cb6.tar.gz es-fecea5d7a74f97d41c50734349c80062ce2e9cb6.tar.xz es-fecea5d7a74f97d41c50734349c80062ce2e9cb6.zip | |
zig fmt
Diffstat (limited to 'src/Config.zig')
| -rw-r--r-- | src/Config.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Config.zig b/src/Config.zig index b8b45a5..1f11b65 100644 --- a/src/Config.zig +++ b/src/Config.zig | |||
| @@ -13,7 +13,7 @@ page_overlap: usize = 2, | |||
| 13 | tab_stop: usize = 8, | 13 | tab_stop: usize = 8, |
| 14 | 14 | ||
| 15 | pub fn readConfig(allocator: Allocator) !Config { | 15 | pub fn readConfig(allocator: Allocator) !Config { |
| 16 | var config = Config {}; | 16 | var config = Config{}; |
| 17 | 17 | ||
| 18 | var env_map = try std.process.getEnvMap(allocator); | 18 | var env_map = try std.process.getEnvMap(allocator); |
| 19 | defer env_map.deinit(); | 19 | defer env_map.deinit(); |
| @@ -32,7 +32,7 @@ pub fn readConfig(allocator: Allocator) !Config { | |||
| 32 | } else { | 32 | } else { |
| 33 | // TODO: Maybe return an error instead of .? | 33 | // TODO: Maybe return an error instead of .? |
| 34 | const home = env_map.get("HOME").?; | 34 | const home = env_map.get("HOME").?; |
| 35 | const home_config = try std.fs.path.join(allocator, &.{home, ".config"}); | 35 | const home_config = try std.fs.path.join(allocator, &.{ home, ".config" }); |
| 36 | defer allocator.free(home_config); | 36 | defer allocator.free(home_config); |
| 37 | 37 | ||
| 38 | try readConfigInBaseDir(allocator, &config, home_config); | 38 | try readConfigInBaseDir(allocator, &config, home_config); |
| @@ -42,7 +42,7 @@ pub fn readConfig(allocator: Allocator) !Config { | |||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | fn readConfigInBaseDir(allocator: Allocator, config: *Config, base_dir: []const u8) !void { | 44 | fn readConfigInBaseDir(allocator: Allocator, config: *Config, base_dir: []const u8) !void { |
| 45 | const filename = try std.fs.path.join(allocator, &.{base_dir, config_path}); | 45 | const filename = try std.fs.path.join(allocator, &.{ base_dir, config_path }); |
| 46 | defer allocator.free(filename); | 46 | defer allocator.free(filename); |
| 47 | 47 | ||
| 48 | const file = std.fs.openFileAbsolute(filename, .{ .read = true }) catch |err| switch (err) { | 48 | const file = std.fs.openFileAbsolute(filename, .{ .read = true }) catch |err| switch (err) { |