Update to 0.10.0-dev.3394+1a1b7a3af

This commit is contained in:
Felix "xq" Queißner 2022-08-02 09:25:44 +02:00
parent e0e80f07a6
commit 24845b0103

View File

@ -138,7 +138,7 @@ fn getPathXdg(allocator: std.mem.Allocator, arena: *std.heap.ArenaAllocator, fol
var env_opt = std.os.getenv(folder_spec.env.name);
if (@hasDecl(root, "known_folders_config") and root.known_folders_config.xdg_force_default) {
if(folder_spec.default) |default| {
if (folder_spec.default) |default| {
if (default[0] == '~') {
const home = std.os.getenv("HOME") orelse return null;
return try std.mem.concat(allocator, u8, &[_][]const u8{ home, default[1..] });
@ -186,8 +186,8 @@ fn getPathXdg(allocator: std.mem.Allocator, arena: *std.heap.ArenaAllocator, fol
if (folder_spec.env.suffix) |suffix| {
return try std.mem.concat(allocator, u8, &[_][]const u8{ env, suffix });
} else {
if(std.mem.eql(u8,folder_spec.env.name, "XDG_CONFIG_DIRS")) {
var iter = std.mem.split(u8,env, ":");
if (std.mem.eql(u8, folder_spec.env.name, "XDG_CONFIG_DIRS")) {
var iter = std.mem.split(u8, env, ":");
return try allocator.dupe(u8, iter.next() orelse "");
} else {
return try allocator.dupe(u8, env);
@ -346,7 +346,7 @@ test "query each known folders" {
test "open each known folders" {
inline for (std.meta.fields(KnownFolder)) |fld| {
var dir_or_null = open(std.testing.allocator, @field(KnownFolder, fld.name), .{ .iterate = false, .access_sub_paths = true }) catch |e| switch (e) {
var dir_or_null = open(std.testing.allocator, @field(KnownFolder, fld.name), .{ .access_sub_paths = true }) catch |e| switch (e) {
error.FileNotFound => return,
else => return e,
};