korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-16 22:45:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace BSD MAXPATHLEN by POSIX PATH_MAX

Browse Source 
Prefer using the POSIX constant PATH_MAX instead of the legacy BSD
derived MAXPATHLEN. The necessary includes for MAXPATHLEN and PATH_MAX
are <sys/param.h> and <limits.h>, respectively.

Signed-off-by: Felix Janda <felix.janda@posteo.de>
Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
This commit is contained in:
Felix Janda 2015-07-26 21:25:32 +02:00 committed by Stephen Hemminger
parent 6b4867e621
commit ea343669fa
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ip/ipnetns.c
View File

@ -4,7 +4,6 @@
#include <sys/wait.h>
#include <sys/inotify.h>
#include <sys/mount.h>
#include <sys/param.h>
#include <sys/syscall.h>
#include <stdio.h>
#include <string.h>
@ -437,7 +436,7 @@ static int is_pid(const char *str)
static int netns_pids(int argc, char **argv)
{
const char *name;
char net_path[MAXPATHLEN];
char net_path[PATH_MAX];
int netns;
struct stat netst;
DIR *dir;
@ -472,7 +471,7 @@ static int netns_pids(int argc, char **argv)
return -1;
}
while((entry = readdir(dir))) {
char pid_net_path[MAXPATHLEN];
char pid_net_path[PATH_MAX];
struct stat st;
if (!is_pid(entry->d_name))
continue;
@ -493,7 +492,7 @@ static int netns_pids(int argc, char **argv)
static int netns_identify(int argc, char **argv)
{
const char *pidstr;
char net_path[MAXPATHLEN];
char net_path[PATH_MAX];
int netns;
struct stat netst;
DIR *dir;
@ -537,7 +536,7 @@ static int netns_identify(int argc, char **argv)
}
while((entry = readdir(dir))) {
char name_path[MAXPATHLEN];
char name_path[PATH_MAX];
struct stat st;
if (strcmp(entry->d_name, ".") == 0)
@ -563,7 +562,7 @@ static int netns_identify(int argc, char **argv)
static int on_netns_del(char *nsname, void *arg)
{
char netns_path[MAXPATHLEN];
char netns_path[PATH_MAX];
snprintf(netns_path, sizeof(netns_path), "%s/%s", NETNS_RUN_DIR, nsname);
umount2(netns_path, MNT_DETACH);
@ -612,7 +611,7 @@ static int netns_add(int argc, char **argv)
* userspace tweaks like remounting /sys, or bind mounting
* a new /etc/resolv.conf can be shared between uers.
*/
char netns_path[MAXPATHLEN];
char netns_path[PATH_MAX];
const char *name;
int fd;
int made_netns_run_dir_mount = 0;
@ -707,7 +706,7 @@ static int set_netnsid_from_name(const char *name, int nsid)
static int netns_set(int argc, char **argv)
{
char netns_path[MAXPATHLEN];
char netns_path[PATH_MAX];
const char *name;
int netns, nsid;

11
lib/namespace.c
View File

@ -9,15 +9,16 @@
#include <fcntl.h>
#include <dirent.h>
#include <limits.h>
#include "utils.h"
#include "namespace.h"
static void bind_etc(const char *name)
{
char etc_netns_path[MAXPATHLEN];
char netns_name[MAXPATHLEN];
char etc_name[MAXPATHLEN];
char etc_netns_path[PATH_MAX];
char netns_name[PATH_MAX];
char etc_name[PATH_MAX];
struct dirent *entry;
DIR *dir;
@ -43,7 +44,7 @@ static void bind_etc(const char *name)
int netns_switch(char *name)
{
char net_path[MAXPATHLEN];
char net_path[PATH_MAX];
int netns;
snprintf(net_path, sizeof(net_path), "%s/%s", NETNS_RUN_DIR, name);
@ -87,7 +88,7 @@ int netns_switch(char *name)
int netns_get_fd(const char *name)
{
char pathbuf[MAXPATHLEN];
char pathbuf[PATH_MAX];
const char *path, *ptr;
path = name;