mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of empty XDG environment variables

Browse Source 
Closes #21132

According to the XDG Base Directory specification
(https://specifications.freedesktop.org/basedir-spec/latest/#variables),
empty values for these environment variables should be treated the same
as if they are unset. Specifically, for the instances changed in this
commit,

> $XDG_DATA_HOME defines the base directory relative to which
> user-specific data files should be stored. If $XDG_DATA_HOME is either
> not set **or empty**, a default equal to $HOME/.local/share should be
> used.

and

> $XDG_CACHE_HOME defines the base directory relative to which
> user-specific non-essential data files should be stored. If
> $XDG_CACHE_HOME is either not set **or empty**, a default equal to
> $HOME/.cache should be used.

(emphasis mine)

In addition to the case mentioned in the linked issue, all other uses of
XDG environment variables were corrected.
This commit is contained in:
Ian Johnson 2024-08-19 23:11:32 -04:00 committed by Andrew Kelley
parent dffc8c44f9
commit 0a70455095
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/debug/Dwarf.zig
View File

@ -2275,10 +2275,12 @@ pub const ElfModule = struct {
break :dir std.fs.openDirAbsolute(path, .{}) catch break :blk; break :dir std.fs.openDirAbsolute(path, .{}) catch break :blk;
} }
if (std.posix.getenv("XDG_CACHE_HOME")) |cache_path| { if (std.posix.getenv("XDG_CACHE_HOME")) |cache_path| {
if (cache_path.len > 0) {
const path = std.fs.path.join(gpa, &[_][]const u8{ cache_path, "debuginfod_client" }) catch break :blk; const path = std.fs.path.join(gpa, &[_][]const u8{ cache_path, "debuginfod_client" }) catch break :blk;
defer gpa.free(path); defer gpa.free(path);
break :dir std.fs.openDirAbsolute(path, .{}) catch break :blk; break :dir std.fs.openDirAbsolute(path, .{}) catch break :blk;
} }
}
if (std.posix.getenv("HOME")) |home_path| { if (std.posix.getenv("HOME")) |home_path| {
const path = std.fs.path.join(gpa, &[_][]const u8{ home_path, ".cache", "debuginfod_client" }) catch break :blk; const path = std.fs.path.join(gpa, &[_][]const u8{ home_path, ".cache", "debuginfod_client" }) catch break :blk;
defer gpa.free(path); defer gpa.free(path);

2
lib/std/fs/get_app_data_dir.zig
View File

@ -32,8 +32,10 @@ pub fn getAppDataDir(allocator: mem.Allocator, appname: []const u8) GetAppDataDi
}, },
.linux, .freebsd, .netbsd, .dragonfly, .openbsd, .solaris, .illumos => { .linux, .freebsd, .netbsd, .dragonfly, .openbsd, .solaris, .illumos => {
if (posix.getenv("XDG_DATA_HOME")) |xdg| { if (posix.getenv("XDG_DATA_HOME")) |xdg| {
if (xdg.len > 0) {
return fs.path.join(allocator, &[_][]const u8{ xdg, appname }); return fs.path.join(allocator, &[_][]const u8{ xdg, appname });
} }
}
const home_dir = posix.getenv("HOME") orelse { const home_dir = posix.getenv("HOME") orelse {
// TODO look in /etc/passwd // TODO look in /etc/passwd

5
src/introspect.zig
View File

@ -90,8 +90,11 @@ pub fn resolveGlobalCacheDir(allocator: mem.Allocator) ![]u8 {
if (builtin.os.tag != .windows) { if (builtin.os.tag != .windows) {
if (std.zig.EnvVar.XDG_CACHE_HOME.getPosix()) |cache_root| { if (std.zig.EnvVar.XDG_CACHE_HOME.getPosix()) |cache_root| {
if (cache_root.len > 0) {
return fs.path.join(allocator, &[_][]const u8{ cache_root, appname }); return fs.path.join(allocator, &[_][]const u8{ cache_root, appname });
} else if (std.zig.EnvVar.HOME.getPosix()) |home| { }
}
if (std.zig.EnvVar.HOME.getPosix()) |home| {
return fs.path.join(allocator, &[_][]const u8{ home, ".cache", appname }); return fs.path.join(allocator, &[_][]const u8{ home, ".cache", appname });
} }
} }