bx
/
catgirl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out XDG base directory code 

And add warnings to configOpen, since that's the only way to be accurate
if a weird error occurs.
weechat-hashes
C. McEnroe 2020-02-10 19:57:10 -05:00
parent e6c18403e2
commit 99480a42e5
6 changed files with 140 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -15,6 +15,7 @@ OBJS += handle.o
OBJS += irc.o OBJS += irc.o
OBJS += ui.o OBJS += ui.o
OBJS += url.o OBJS += url.o
OBJS += xdg.o
dev: tags all dev: tags all

4
chat.c
View File

@ -154,11 +154,11 @@ int main(int argc, char *argv[]) {
FILE *privFile = NULL; FILE *privFile = NULL;
if (cert) { if (cert) {
certFile = configOpen(cert, "r"); certFile = configOpen(cert, "r");
if (!certFile) err(EX_NOINPUT, "%s", cert); if (!certFile) return EX_NOINPUT;
} }
if (priv) { if (priv) {
privFile = configOpen(priv, "r"); privFile = configOpen(priv, "r");
if (!privFile) err(EX_NOINPUT, "%s", priv); if (!privFile) return EX_NOINPUT;
} }
ircConfig(insecure, certFile, privFile); ircConfig(insecure, certFile, privFile);
if (certFile) fclose(certFile); if (certFile) fclose(certFile);

2
chat.h
View File

@ -189,6 +189,8 @@ void urlOpenMatch(size_t id, const char *str);
void urlCopyMatch(size_t id, const char *str); void urlCopyMatch(size_t id, const char *str);
FILE *configOpen(const char *path, const char *mode); FILE *configOpen(const char *path, const char *mode);
FILE *dataOpen(const char *path, const char *mode);
int getopt_config( int getopt_config(
int argc, char *const *argv, int argc, char *const *argv,
const char *optstring, const struct option *longopts, int *longindex const char *optstring, const struct option *longopts, int *longindex

41
config.c
View File

@ -24,42 +24,6 @@
#include "chat.h" #include "chat.h"
FILE *configOpen(const char *path, const char *mode) {
if (path[0] == '/' || path[0] == '.') goto local;
const char *home = getenv("HOME");
const char *configHome = getenv("XDG_CONFIG_HOME");
const char *configDirs = getenv("XDG_CONFIG_DIRS");
char buf[PATH_MAX];
if (configHome) {
snprintf(buf, sizeof(buf), "%s/" XDG_SUBDIR "/%s", configHome, path);
} else {
if (!home) goto local;
snprintf(buf, sizeof(buf), "%s/.config/" XDG_SUBDIR "/%s", home, path);
}
FILE *file = fopen(buf, mode);
if (file) return file;
if (errno != ENOENT) return NULL;
if (!configDirs) configDirs = "/etc/xdg";
while (*configDirs) {
size_t len = strcspn(configDirs, ":");
snprintf(
buf, sizeof(buf), "%.*s/" XDG_SUBDIR "/%s",
(int)len, configDirs, path
);
file = fopen(buf, mode);
if (file) return file;
if (errno != ENOENT) return NULL;
configDirs += len;
if (*configDirs) configDirs++;
}
local:
return fopen(path, mode);
}
#define WS "\t " #define WS "\t "
static const char *path; static const char *path;
@ -92,10 +56,7 @@ int getopt_config(
num = 0; num = 0;
path = argv[optind++]; path = argv[optind++];
file = configOpen(path, "r"); file = configOpen(path, "r");
if (!file) { if (!file) return clean('?');
warn("%s", path);
return clean('?');
}
} else { } else {
return clean(-1); return clean(-1);
} }

67
ui.c
View File

@ -21,13 +21,11 @@
#include <curses.h> #include <curses.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include <sysexits.h> #include <sysexits.h>
#include <term.h> #include <term.h>
#include <termios.h> #include <termios.h>
@ -858,71 +856,6 @@ void uiRead(void) {
inputUpdate(); inputUpdate();
} }
static FILE *dataOpen(const char *path, const char *mode) {
if (path[0] == '/' || path[0] == '.') goto local;
const char *home = getenv("HOME");
const char *dataHome = getenv("XDG_DATA_HOME");
const char *dataDirs = getenv("XDG_DATA_DIRS");
char homePath[PATH_MAX];
if (dataHome) {
snprintf(
homePath, sizeof(homePath),
"%s/" XDG_SUBDIR "/%s", dataHome, path
);
} else {
if (!home) goto local;
snprintf(
homePath, sizeof(homePath),
"%s/.local/share/" XDG_SUBDIR "/%s", home, path
);
}
FILE *file = fopen(homePath, mode);
if (file) return file;
if (errno != ENOENT) {
warn("%s", homePath);
return NULL;
}
char buf[PATH_MAX];
if (!dataDirs) dataDirs = "/usr/local/share:/usr/share";
while (*dataDirs) {
size_t len = strcspn(dataDirs, ":");
snprintf(
buf, sizeof(buf), "%.*s/" XDG_SUBDIR "/%s",
(int)len, dataDirs, path
);
file = fopen(buf, mode);
if (file) return file;
if (errno != ENOENT) {
warn("%s", buf);
return NULL;
}
dataDirs += len;
if (*dataDirs) dataDirs++;
}
if (mode[0] != 'r') {
char *base = strrchr(homePath, '/');
*base = '\0';
int error = mkdir(homePath, S_IRWXU);
if (error && errno != EEXIST) {
warn("%s", homePath);
return NULL;
}
*base = '/';
file = fopen(homePath, mode);
if (!file) warn("%s", homePath);
return file;
}
local:
file = fopen(path, mode);
if (!file) warn("%s", path);
return file;
}
static const size_t Signatures[] = { static const size_t Signatures[] = {
0x6C72696774616301, 0x6C72696774616301,
}; };

134
xdg.c 100644
View File

@ -0,0 +1,134 @@
/* Copyright (C) 2019, 2020 C. McEnroe <june@causal.agency>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <err.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include "chat.h"
FILE *configOpen(const char *path, const char *mode) {
if (path[0] == '/' || path[0] == '.') goto local;
const char *home = getenv("HOME");
const char *configHome = getenv("XDG_CONFIG_HOME");
const char *configDirs = getenv("XDG_CONFIG_DIRS");
char buf[PATH_MAX];
if (configHome) {
snprintf(buf, sizeof(buf), "%s/" XDG_SUBDIR "/%s", configHome, path);
} else {
if (!home) goto local;
snprintf(buf, sizeof(buf), "%s/.config/" XDG_SUBDIR "/%s", home, path);
}
FILE *file = fopen(buf, mode);
if (file) return file;
if (errno != ENOENT) {
warn("%s", buf);
return NULL;
}
if (!configDirs) configDirs = "/etc/xdg";
while (*configDirs) {
size_t len = strcspn(configDirs, ":");
snprintf(
buf, sizeof(buf), "%.*s/" XDG_SUBDIR "/%s",
(int)len, configDirs, path
);
file = fopen(buf, mode);
if (file) return file;
if (errno != ENOENT) {
warn("%s", buf);
return NULL;
}
configDirs += len;
if (*configDirs) configDirs++;
}
local:
file = fopen(path, mode);
if (!file) warn("%s", path);
return file;
}
FILE *dataOpen(const char *path, const char *mode) {
if (path[0] == '/' || path[0] == '.') goto local;
const char *home = getenv("HOME");
const char *dataHome = getenv("XDG_DATA_HOME");
const char *dataDirs = getenv("XDG_DATA_DIRS");
char homePath[PATH_MAX];
if (dataHome) {
snprintf(
homePath, sizeof(homePath),
"%s/" XDG_SUBDIR "/%s", dataHome, path
);
} else {
if (!home) goto local;
snprintf(
homePath, sizeof(homePath),
"%s/.local/share/" XDG_SUBDIR "/%s", home, path
);
}
FILE *file = fopen(homePath, mode);
if (file) return file;
if (errno != ENOENT) {
warn("%s", homePath);
return NULL;
}
char buf[PATH_MAX];
if (!dataDirs) dataDirs = "/usr/local/share:/usr/share";
while (*dataDirs) {
size_t len = strcspn(dataDirs, ":");
snprintf(
buf, sizeof(buf), "%.*s/" XDG_SUBDIR "/%s",
(int)len, dataDirs, path
);
file = fopen(buf, mode);
if (file) return file;
if (errno != ENOENT) {
warn("%s", buf);
return NULL;
}
dataDirs += len;
if (*dataDirs) dataDirs++;
}
if (mode[0] != 'r') {
char *base = strrchr(homePath, '/');
*base = '\0';
int error = mkdir(homePath, S_IRWXU);
if (error && errno != EEXIST) {
warn("%s", homePath);
return NULL;
}
*base = '/';
file = fopen(homePath, mode);
if (!file) warn("%s", homePath);
return file;
}
local:
file = fopen(path, mode);
if (!file) warn("%s", path);
return file;
}