mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix some strncpy warnings when build with gcc8

Browse Source 
Origin commit data
------------------
Commit: 54ccbfc5d1
Author: GetAway <get-away@t-online.de>
Date: 2019-06-18 (Tue, 18 Jun 2019)
This commit is contained in:
GetAway
2019-06-18 22:59:07 +02:00
committed by vanhofen
parent 0310cdaf79
commit bc8a3536cb
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libiw/iwlib.c
View File

@@ -675,7 +675,7 @@ iw_get_basic_config(int skfd,
return(-1);
else
{
strncpy(info->name, wrq.u.name, IFNAMSIZ);
strncpy(info->name, wrq.u.name, IFNAMSIZ-1);
info->name[IFNAMSIZ] = '\0';
}
@@ -755,7 +755,7 @@ iw_set_basic_config(int skfd,
*/
if(info->has_mode)
{
strncpy(wrq.ifr_name, ifname, IFNAMSIZ);
strncpy(wrq.ifr_name, ifname, IFNAMSIZ-1);
wrq.u.mode = info->mode;
if(iw_get_ext(skfd, ifname, SIOCSIWMODE, &wrq) < 0)
@@ -1272,7 +1272,7 @@ iw_get_stats(int skfd,
wrq.u.data.pointer = (caddr_t) stats;
wrq.u.data.length = sizeof(struct iw_statistics);
wrq.u.data.flags = 1; /* Clear updated flag */
strncpy(wrq.ifr_name, ifname, IFNAMSIZ);
strncpy(wrq.ifr_name, ifname, IFNAMSIZ-1);
if(iw_get_ext(skfd, ifname, SIOCGIWSTATS, &wrq) < 0)
return(-1);
@@ -1936,7 +1936,7 @@ iw_check_mac_addr_type(int skfd,
struct ifreq ifr;
/* Get the type of hardware address */
strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
strncpy(ifr.ifr_name, ifname, IFNAMSIZ-1);
if((ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) ||
((ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER)
&& (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211)))
@@ -1970,7 +1970,7 @@ iw_check_if_addr_type(int skfd,
struct ifreq ifr;
/* Get the type of interface address */
strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
strncpy(ifr.ifr_name, ifname, IFNAMSIZ-1);
if((ioctl(skfd, SIOCGIFADDR, &ifr) < 0) ||
(ifr.ifr_addr.sa_family != AF_INET))
{
@@ -2258,7 +2258,7 @@ iw_in_addr(int skfd,
arp_query.arp_flags = 0;
/* The following restrict the search to the interface only */
/* For old kernels which complain, just comment it... */
strncpy(arp_query.arp_dev, ifname, IFNAMSIZ);
strncpy(arp_query.arp_dev, ifname, IFNAMSIZ-1);
if((ioctl(skfd, SIOCGARP, &arp_query) < 0) ||
!(arp_query.arp_flags & ATF_COM))
{

4
lib/libiw/iwlib.h
View File

@@ -507,7 +507,7 @@ iw_set_ext(int skfd, /* Socket to the kernel */
struct iwreq * pwrq) /* Fixed part of the request */
{
/* Set device name */
strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
strncpy(pwrq->ifr_name, ifname, IFNAMSIZ-1);
/* Do the request */
return(ioctl(skfd, request, pwrq));
}
@@ -523,7 +523,7 @@ iw_get_ext(int skfd, /* Socket to the kernel */
struct iwreq * pwrq) /* Fixed part of the request */
{
/* Set device name */
strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
strncpy(pwrq->ifr_name, ifname, IFNAMSIZ-1);
/* Do the request */
return(ioctl(skfd, request, pwrq));
}

2
lib/libiw/iwscan.cpp
View File

@@ -46,7 +46,7 @@ static void device_up(std::string dev)
memset(&ifr, 0, sizeof ifr);
strncpy(ifr.ifr_name, dev.c_str(), IFNAMSIZ);
strncpy(ifr.ifr_name, dev.c_str(), IFNAMSIZ-1);
if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
perror("SIOCGIFFLAGS");