Move mkdirp into libi3
This commit is contained in:
parent
7c2842eae4
commit
fbcb227537
@ -50,12 +50,6 @@ typedef void (*handler_t)(int, uint8_t *, int, uint32_t, uint32_t);
|
||||
int size, uint32_t message_size, \
|
||||
uint32_t message_type)
|
||||
|
||||
/**
|
||||
* Emulates mkdir -p (creates any missing folders)
|
||||
*
|
||||
*/
|
||||
bool mkdirp(const char *path);
|
||||
|
||||
/**
|
||||
* Handler for activity on the listening socket, meaning that a new client
|
||||
* has just connected and we should accept() him. Sets up the event handler
|
||||
|
@ -434,3 +434,9 @@ char *get_exe_path(const char *argv0);
|
||||
*
|
||||
*/
|
||||
int logical_px(const int logical);
|
||||
|
||||
/**
|
||||
* Emulates mkdir -p (creates any missing folders)
|
||||
*
|
||||
*/
|
||||
bool mkdirp(const char *path);
|
||||
|
38
libi3/mkdirp.c
Normal file
38
libi3/mkdirp.c
Normal file
@ -0,0 +1,38 @@
|
||||
#include "libi3.h"
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
/*
|
||||
* Emulates mkdir -p (creates any missing folders)
|
||||
*
|
||||
*/
|
||||
bool mkdirp(const char *path) {
|
||||
if (mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0)
|
||||
return true;
|
||||
if (errno != ENOENT) {
|
||||
ELOG("mkdir(%s) failed: %s\n", path, strerror(errno));
|
||||
return false;
|
||||
}
|
||||
char *copy = sstrdup(path);
|
||||
/* strip trailing slashes, if any */
|
||||
while (copy[strlen(copy) - 1] == '/')
|
||||
copy[strlen(copy) - 1] = '\0';
|
||||
|
||||
char *sep = strrchr(copy, '/');
|
||||
if (sep == NULL) {
|
||||
if (copy != NULL) {
|
||||
free(copy);
|
||||
copy = NULL;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
*sep = '\0';
|
||||
bool result = false;
|
||||
if (mkdirp(copy))
|
||||
result = mkdirp(path);
|
||||
free(copy);
|
||||
|
||||
return result;
|
||||
}
|
30
src/ipc.c
30
src/ipc.c
@ -37,36 +37,6 @@ static void set_nonblock(int sockfd) {
|
||||
err(-1, "Could not set O_NONBLOCK");
|
||||
}
|
||||
|
||||
/*
|
||||
* Emulates mkdir -p (creates any missing folders)
|
||||
*
|
||||
*/
|
||||
bool mkdirp(const char *path) {
|
||||
if (mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0)
|
||||
return true;
|
||||
if (errno != ENOENT) {
|
||||
ELOG("mkdir(%s) failed: %s\n", path, strerror(errno));
|
||||
return false;
|
||||
}
|
||||
char *copy = sstrdup(path);
|
||||
/* strip trailing slashes, if any */
|
||||
while (copy[strlen(copy) - 1] == '/')
|
||||
copy[strlen(copy) - 1] = '\0';
|
||||
|
||||
char *sep = strrchr(copy, '/');
|
||||
if (sep == NULL) {
|
||||
FREE(copy);
|
||||
return false;
|
||||
}
|
||||
*sep = '\0';
|
||||
bool result = false;
|
||||
if (mkdirp(copy))
|
||||
result = mkdirp(path);
|
||||
free(copy);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
* Sends the specified event to all IPC clients which are currently connected
|
||||
* and subscribed to this kind of event.
|
||||
|
Loading…
Reference in New Issue
Block a user