Skip to content

Implement XDG base directory compliance #136

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
mikejzx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement XDG base directory compliance #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab3dbb6
XDG base directory: read fdm.conf from XDG_CONFIG_HOME
mikejzx Dec 1, 2023
677e191
XDG base directory: lock file in XDG_RUNTIME_DIR
mikejzx Dec 1, 2023
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
30 changes: 24 additions & 6 deletions fdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,21 @@ main(int argc, char **argv)

/* Find the config file. */
if (conf.conf_file == NULL) {
/* If no file specified, try ~ then /etc. */
xasprintf(&conf.conf_file, "%s/%s", conf.user_home, CONFFILE);
if (access(conf.conf_file, R_OK) != 0) {
xfree(conf.conf_file);
conf.conf_file = xstrdup(SYSCONFFILE);
/* If no file specified, try $XDG_CONFIG_HOME, then ~ then /etc. */
s = getenv("XDG_CONFIG_HOME");
if (s != NULL && *s != '\0') {
xasprintf(&conf.conf_file, "%s/%s", s, CONFFILE);
if (access(conf.conf_file, R_OK) != 0) {
xfree(conf.conf_file);
conf.conf_file = NULL;
}
}
if (conf.conf_file == NULL) {
xasprintf(&conf.conf_file, "%s/%s", conf.user_home, CONFFILE_HOME);
if (access(conf.conf_file, R_OK) != 0) {
xfree(conf.conf_file);
conf.conf_file = xstrdup(SYSCONFFILE);
}
}
}
log_debug2("loading configuration from %s", conf.conf_file);
Expand Down Expand Up @@ -702,7 +712,15 @@ main(int argc, char **argv)
if (geteuid() == 0)
lock = xstrdup(SYSLOCKFILE);
else
xasprintf(&lock, "%s/%s", conf.user_home, LOCKFILE);
{
/* Lockfile is stored in XDG_RUNTIME_DIR if provided.
* If not, we store it in the user's home directory. */
s = getenv("XDG_RUNTIME_DIR");
if (s != NULL && *s != '\0')
xasprintf(&lock, "%s/%s", s, LOCKFILE);
else
xasprintf(&lock, "%s/%s", conf.user_home, LOCKFILE_HOME);
}
}
retry:
if (*lock != '\0' && !conf.allow_many) {
Expand Down
8 changes: 5 additions & 3 deletions fdm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@
#include <openssl/ssl.h>
#include <openssl/err.h>

#define CHILDUSER "_fdm"
#define CONFFILE ".fdm.conf"
#define LOCKFILE ".fdm.lock"
#define CHILDUSER "_fdm"
#define CONFFILE "fdm.conf"
#define LOCKFILE "fdm.lock"
#define CONFFILE_HOME "." CONFFILE
#define LOCKFILE_HOME "." LOCKFILE
#define DEFLOCKTIMEOUT 10
#define MAXQUEUEVALUE 50
#define DEFMAILQUEUE 2
Expand Down