From 5a738e685bd002661276cf6938c5b74ef1ec0ccf Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 27 Jun 2021 15:02:13 +0200
Subject: [PATCH] Fix compiler warnings.
---
src/fd_device.c | 2 +-
src/tincctl.c | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/fd_device.c b/src/fd_device.c
index 5cfe75fe..8ac51fa1 100644
--- a/src/fd_device.c
+++ b/src/fd_device.c
@@ -83,7 +83,7 @@ static int read_fd(int socket) {
if(cmsgptr->cmsg_len != CMSG_LEN(sizeof(device_fd))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Wrong CMSG data length: %lu, expected %lu!",
- (unsigned long)cmsgptr->cmsg_len, CMSG_LEN(sizeof(device_fd)));
+ (unsigned long)cmsgptr->cmsg_len, (unsigned long)CMSG_LEN(sizeof(device_fd)));
return -1;
}
diff --git a/src/tincctl.c b/src/tincctl.c
index 87bbfe01..3c7d3683 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -263,19 +263,21 @@ static void disable_old_keys(const char *filename, const char *what) {
bool disabled = false;
bool block = false;
bool error = false;
- FILE *r, *w;
- r = fopen(filename, "r");
+ FILE *r = fopen(filename, "r");
+ FILE *w = NULL;
if(!r) {
return;
}
- snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
+ int result = snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
- struct stat st = {.st_mode = 0600};
- fstat(fileno(r), &st);
- w = fopenmask(tmpfile, "w", st.st_mode);
+ if(result < sizeof(tmpfile)) {
+ struct stat st = {.st_mode = 0600};
+ fstat(fileno(r), &st);
+ w = fopenmask(tmpfile, "w", st.st_mode);
+ }
while(fgets(buf, sizeof(buf), r)) {
if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
--
2.39.5