initialize variables, use strlcpy return value

This commit is contained in:
prx 2022-08-22 14:55:25 +02:00
parent f9d12c9ef5
commit 2b226c9a02
1 changed files with 3 additions and 4 deletions

7
main.c
View File

@ -13,11 +13,11 @@
#define TABLE_LEN 32 /* see PF_TABLE_NAME_SIZE in net/pfvar.h */ #define TABLE_LEN 32 /* see PF_TABLE_NAME_SIZE in net/pfvar.h */
int main(int argc, char *argv[]){ int main(int argc, char *argv[]){
struct sockaddr_storage sock; struct sockaddr_storage sock = {0};
socklen_t slen = sizeof(sock); socklen_t slen = sizeof(sock);
char ip[INET6_ADDRSTRLEN] = {'\0'}; /* INET6_ADDRSTRLEN > INET_ADDRSTRLEN */ char ip[INET6_ADDRSTRLEN] = {'\0'}; /* INET6_ADDRSTRLEN > INET_ADDRSTRLEN */
char table[TABLE_LEN] = DEFAULT_TABLE; char table[TABLE_LEN] = DEFAULT_TABLE;
int status; int status = 0;
if (unveil("/usr/bin/doas", "rx") != 0) if (unveil("/usr/bin/doas", "rx") != 0)
err(1, "unveil"); err(1, "unveil");
@ -26,9 +26,8 @@ int main(int argc, char *argv[]){
/* configuration */ /* configuration */
if (argc == 2) { if (argc == 2) {
if (strlen(argv[1]) > sizeof(table)) if (strlcpy(table, argv[1], TABLE_LEN) >= sizeof(table))
errx(1, "table name is too long"); errx(1, "table name is too long");
strlcpy(table, argv[1], TABLE_LEN);
} }
/* get socket structure */ /* get socket structure */