miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Just enjoy snprintf()

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-06-14 18:42:29 +00:00
parent db718d5942
commit 5976434285
5 changed files with 23 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ctl.c
View File

@@ -2,6 +2,7 @@
#include "ctl.h"
#include "str.h"
#include <stdio.h>
#include <unistd.h>
#include <dirent.h>
#include <sys/socket.h>
@@ -41,17 +42,15 @@ ctl_setsun(struct sockaddr_un *dst, const char *dir, const char *file)
.sun_family = AF_UNIX,
};
const char *path[] = {dir, "/", file};
const size_t len = sizeof(sun.sun_path) - 1;
int ret = snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%s", dir, file);
if (str_cat(sun.sun_path, len, path, COUNT(path)) == len) {
if (str_cat(NULL, len + 1, path, COUNT(path)) > len) {
errno = EINVAL;
return -1;
}
if (ret <= 0 || (size_t)ret >= sizeof(sun.sun_path)) {
errno = EINVAL;
return -1;
}
*dst = sun;
if (dst)
*dst = sun;
return 0;
}