Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid string gymnastics in an olympic year.

Browse Source
This commit is contained in:
christos 2016-08-05 07:22:17 +00:00
parent a5c3fa9748
commit b31382fbd7
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/systat/ifstat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifstat.c,v 1.3 2016/08/04 12:56:31 jakllsch Exp $ */ /* $NetBSD: ifstat.c,v 1.4 2016/08/05 07:22:17 christos Exp $ */
/* /*
* Copyright (c) 2003, Trent Nelson, <trent@arpa.com>. * Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: ifstat.c,v 1.3 2016/08/04 12:56:31 jakllsch Exp $"); __RCSID("$NetBSD: ifstat.c,v 1.4 2016/08/05 07:22:17 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/types.h> #include <sys/types.h>
@ -350,24 +350,11 @@ fetchifstat(void)
static void static void
right_align_string(struct if_stat *ifp) right_align_string(struct if_stat *ifp)
{ {
int str_len = 0, pad_len = 0;
char *newstr = NULL, *ptr = NULL;
if (ifp == NULL || ifp->if_mib.ifdr_name[0] == '\0') if (ifp == NULL || ifp->if_mib.ifdr_name[0] == '\0')
return; return;
else {
/* string length + '\0' */
str_len = strlen(ifp->if_mib.ifdr_name)+1;
pad_len = IF_NAMESIZE-(str_len);
newstr = ifp->if_name; snprintf(ifp->if_name, IF_NAMESIZE, "%*s", IF_NAMESIZE - 1,
ptr = newstr + pad_len; ifp->if_mib.ifdr_name);
(void)memset((void *)newstr, (int)' ', IF_NAMESIZE);
(void)strncpy(ptr, (const char *)&ifp->if_mib.ifdr_name,
str_len);
}
return;
} }
static int static int