diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -254,7 +254,6 @@ extern int allmedia; extern int newaddr; extern int exit_code; -extern struct ifconfig_args global_args; extern char *f_inet, *f_inet6, *f_ether, *f_addr; void setifcap(if_ctx *ctx, const char *, int value); diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -103,8 +103,6 @@ static int clearaddr; int newaddr = 1; -struct ifconfig_args global_args; - int exit_code = 0; static char ifname_to_print[IFNAMSIZ]; /* Helper for printifnamemaybe() */ @@ -615,7 +613,8 @@ #ifdef JAIL int jid; #endif - struct ifconfig_args *args = &global_args; + struct ifconfig_args _args = {}; + struct ifconfig_args *args = &_args; f_inet = f_inet6 = f_ether = f_addr = NULL; diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c --- a/sbin/ifconfig/ifmedia.c +++ b/sbin/ifconfig/ifmedia.c @@ -144,7 +144,7 @@ putchar('\n'); } - if (global_args.supmedia) { + if (ctx->args->supmedia) { printf("\tsupported media:\n"); for (int i = 0; i < ifmr->ifm_count; ++i) { printf("\t\t");