From d0881ea1c01e0e782a24a73e23762626c1baf2f7 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 26 Jul 2021 21:59:59 +0200 Subject: axconfig.c: Fix devilishly suggestive false indentation. Signed-off-by: Ralf Baechle --- axconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'axconfig.c') diff --git a/axconfig.c b/axconfig.c index 84199c1..9486f5b 100644 --- a/axconfig.c +++ b/axconfig.c @@ -308,7 +308,7 @@ int ax25_config_load_ports(void) break; s = strchr(buffer, ':'); if (s) *s = 0; - s = buffer; + s = buffer; while (isspace(*s & 0xff)) ++s; memset(&ifr, 0, sizeof(ifr)); -- cgit v1.2.3 From 415b2d46a39302b21b51758e83f81e5439ab487c Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 29 Jul 2021 09:13:19 +0200 Subject: axconfig.c, nrconfig.c, roseconfig.c: Fix GCC 11 warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 11's overyealously throws below warnings. Fixed by giving GCC a hint that the string actually is short enough to fit. libtool: compile: gcc -DHAVE_CONFIG_H -I. -DAX25_SYSCONFDIR=\"/usr/local/etc/ax25/\" -DAX25_LOCALSTATEDIR=\"/usr/local/var/ax25/\" -g -O2 -Wall -MT axconfig.lo -MD -MP -MF .deps/axconfig.Tpo -c axconfig.c -fPIC -DPIC -o .libs/axconfig.o axconfig.c: In function ‘ax25_config_load_ports’: axconfig.c:315:25: warning: ‘strncpy’ output may be truncated copying 15 bytes from a string of length 255 [-Wstringop-truncation] 315 | strncpy(ifr.ifr_name, s, IFNAMSIZ-1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [...] libtool: compile: gcc -DHAVE_CONFIG_H -I. -DAX25_SYSCONFDIR=\"/usr/local/etc/ax25/\" -DAX25_LOCALSTATEDIR=\"/usr/local/var/ax25/\" -g -O2 -Wall -MT nrconfig.lo -MD -MP -MF .deps/nrconfig.Tpo -c nrconfig.c -fPIC -DPIC -o .libs/nrconfig.o nrconfig.c: In function ‘nr_config_load_ports’: nrconfig.c:294:25: warning: ‘strncpy’ output may be truncated copying 15 bytes from a string of length 255 [-Wstringop-truncation] 294 | strncpy(ifr.ifr_name, s, IFNAMSIZ-1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [...] libtool: compile: gcc -DHAVE_CONFIG_H -I. -DAX25_SYSCONFDIR=\"/usr/local/etc/ax25/\" -DAX25_LOCALSTATEDIR=\"/usr/local/var/ax25/\" -g -O2 -Wall -MT rsconfig.lo -MD -MP -MF .deps/rsconfig.Tpo -c rsconfig.c -fPIC -DPIC -o .libs/rsconfig.o rsconfig.c: In function ‘rs_config_load_ports’: rsconfig.c:240:25: warning: ‘strncpy’ output may be truncated copying 15 bytes from a string of length 255 [-Wstringop-truncation] 240 | strncpy(ifr.ifr_name, s, IFNAMSIZ-1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Ralf Baechle --- axconfig.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'axconfig.c') diff --git a/axconfig.c b/axconfig.c index 9486f5b..c6a2cb0 100644 --- a/axconfig.c +++ b/axconfig.c @@ -15,7 +15,9 @@ #include #include #include + #include "pathnames.h" +#include "util.h" typedef struct _axport { @@ -312,6 +314,8 @@ int ax25_config_load_ports(void) while (isspace(*s & 0xff)) ++s; memset(&ifr, 0, sizeof(ifr)); + if (strlen(s) >= IFNAMSIZ) + unreachable(); strncpy(ifr.ifr_name, s, IFNAMSIZ-1); ifr.ifr_name[IFNAMSIZ-1] = 0; -- cgit v1.2.3