Skip to content

Always try home directory if current directory fails #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −15
Open

Always try home directory if current directory fails #599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Always try home directory if current directory fails 
The home directory was only being checked for the config file if
the fopen() failed, but not if a different error occurred. Move
the home directory check outside the condition for the current
directory.

Fixes #598
  • Loading branch information
@mfncooper
mfncooper committed Sep 11, 2025
commit 55129c0b84078ce8ef09e616d2cb3bddbb8a6e2c
31 changes: 16 additions & 15 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,26 +975,27 @@ void config_init (char *fname, struct audio_s *p_audio_config,
if (realpath (fname, absfilepath) != NULL) {
#endif
fp = fopen (absfilepath, "r");
if (fp == NULL) { // Failed. Next, try home dir
strlcpy (absfilepath, "", sizeof(absfilepath));
}

if (fp == NULL) { // Failed. Next, try home dir
strlcpy (absfilepath, "", sizeof(absfilepath));
#ifdef __WIN32__
char *h = getenv("USERPROFILE");
if (h != NULL && fname[0] != '\\' && fname[1] != ':') {
strlcat (absfilepath, h, sizeof(absfilepath));
strlcat (absfilepath, "\\", sizeof(absfilepath));
}
char *h = getenv("USERPROFILE");
if (h != NULL && fname[0] != '\\' && fname[1] != ':') {
strlcat (absfilepath, h, sizeof(absfilepath));
strlcat (absfilepath, "\\", sizeof(absfilepath));
}
#else
// Don't prepend home dir if absolute path given.
char *h = getenv("HOME");
if (h != NULL && fname[0] != '/') {
strlcat (absfilepath, h, sizeof(absfilepath));
strlcat (absfilepath, "/", sizeof(absfilepath));
}
// Don't prepend home dir if absolute path given.
char *h = getenv("HOME");
if (h != NULL && fname[0] != '/') {
strlcat (absfilepath, h, sizeof(absfilepath));
strlcat (absfilepath, "/", sizeof(absfilepath));
}
#endif
strlcat (absfilepath, fname, sizeof(absfilepath));

fp = fopen (absfilepath, "r");
}
fp = fopen (absfilepath, "r");
}

if (fp == NULL) {
Expand Down
Loading