diff options
| author | June McEnroe <june@causal.agency> | 2021-06-10 15:40:45 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2021-06-10 15:40:45 -0400 |
| commit | 275d657b8b3bccd7d7d6055cbe09de4e85be7659 (patch) | |
| tree | 7fcf0f60c9b81933c49cf0d848518521c28f663f | |
| parent | Only explicitly load the default CA file on OpenBSD (diff) | |
| download | catgirl-275d657b8b3bccd7d7d6055cbe09de4e85be7659.tar.gz catgirl-275d657b8b3bccd7d7d6055cbe09de4e85be7659.zip | |
Move unveilAll back into main
It doesn't do as much anymore, so move it back inline.
Diffstat (limited to '')
| -rw-r--r-- | chat.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/chat.c b/chat.c index 9a276d5..4f3c233 100644 --- a/chat.c +++ b/chat.c @@ -127,7 +127,6 @@ static void parseHash(char *str) { } #ifdef __OpenBSD__ - static void unveilData(const char *name) { const char *dirs = NULL; for (const char *path; NULL != (path = dataPath(&dirs, name));) { @@ -135,16 +134,7 @@ static void unveilData(const char *name) { if (error && errno != ENOENT) err(EX_CANTCREAT, "%s", path); } } - -static void unveilAll(void) { - if (save || logEnable) { - dataMkdir(""); - unveilData(""); - } - if (save) unveilData(save); -} - -#endif /* __OpenBSD__ */ +#endif static volatile sig_atomic_t signals[NSIG]; static void signalHandler(int signal) { @@ -288,7 +278,13 @@ int main(int argc, char *argv[]) { uiInitEarly(); #ifdef __OpenBSD__ - if (self.restricted) unveilAll(); + if (self.restricted) { + if (save || logEnable) { + dataMkdir(""); + unveilData(""); + } + if (save) unveilData(save); + } char promises[64] = "stdio tty"; char *ptr = &promises[strlen(promises)], *end = &promises[sizeof(promises)]; |