breeze/inetutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/inetutils.git synced 2026-01-12 00:19:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include sys/types.h before sys/socket.h and netinet/in.h before arpa/inet.h. Use program_name instead of __progname.

Browse Source
This commit is contained in:
Sergey Poznyakoff
2006-10-12 09:56:10 +00:00
parent 5c0f4d9604
commit 310e61c535
10 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ifconfig/changeif.c
View File

@@ -32,9 +32,11 @@
# include <strings.h>
#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include "ifconfig.h"
@@ -48,13 +50,13 @@
if (!err) \
{ \
fprintf (stderr, "%s: `%s' is not a valid address\n", \
__progname, addr); \
program_name, addr); \
return -1; \
} \
err = ioctl (sfd, SIOCSIF##type, ifr); \
if (err < 0) \
{ \
fprintf (stderr, "%s: %s failed: %s\n", __progname, \
fprintf (stderr, "%s: %s failed: %s\n", program_name, \
"SIOCSIF" #type, strerror (errno)); \
return -1; \
}
@@ -69,7 +71,7 @@ set_address (int sfd, struct ifreq *ifr, char *address)
{
#ifndef SIOCSIFADDR
fprintf (stderr, "%s: Don't know how to set an interface address on this system.\n",
__progname);
program_name);
return -1;
#else
char *addr;
@@ -77,14 +79,14 @@ set_address (int sfd, struct ifreq *ifr, char *address)
if (! host)
{
fprintf (stderr, "%s: can not resolve `%s': ", __progname,
fprintf (stderr, "%s: can not resolve `%s': ", program_name,
address);
herror (NULL);
return -1;
}
if (host->h_addrtype != AF_INET)
{
fprintf (stderr, "%s: `%s' refers to an unknown address type", __progname,
fprintf (stderr, "%s: `%s' refers to an unknown address type", program_name,
address);
return -1;
}
@@ -106,7 +108,7 @@ set_netmask (int sfd, struct ifreq *ifr, char *netmask)
{
#ifndef SIOCSIFNETMASK
printf ("%s: Don't know how to set an interface netmask on this system.\n",
__progname);
program_name);
return -1;
#else
@@ -123,7 +125,7 @@ set_dstaddr (int sfd, struct ifreq *ifr, char *dstaddr)
{
#ifndef SIOCSIFDSTADDR
printf ("%s: Don't know how to set an interface peer address on this system.\n",
__progname);
program_name);
return -1;
#else
SIOCSIF(DSTADDR, dstaddr)
@@ -139,7 +141,7 @@ set_brdaddr (int sfd, struct ifreq *ifr, char *brdaddr)
{
#ifndef SIOCSIFBRDADDR
printf ("%s: Don't know how to set an interface broadcast address on this system.\n",
__progname);
program_name);
return -1;
#else
SIOCSIF(BRDADDR, brdaddr)
@@ -155,7 +157,7 @@ set_mtu (int sfd, struct ifreq *ifr, int mtu)
{
#ifndef SIOCSIFMTU
printf ("%s: Don't know how to set the interface mtu on this system.\n",
__progname);
program_name);
return -1;
#else
int err = 0;
@@ -165,7 +167,7 @@ set_mtu (int sfd, struct ifreq *ifr, int mtu)
if (err < 0)
{
fprintf (stderr, "%s: SIOCSIFMTU failed: %s\n",
__progname, strerror (errno));
program_name, strerror (errno));
return -1;
}
if (verbose)
@@ -180,7 +182,7 @@ set_metric (int sfd, struct ifreq *ifr, int metric)
{
#ifndef SIOCSIFMETRIC
printf ("%s: Don't know how to set the interface metric on this system.\n",
__progname);
program_name);
return -1;
#else
int err = 0;
@@ -190,7 +192,7 @@ set_metric (int sfd, struct ifreq *ifr, int metric)
if (err < 0)
{
fprintf (stderr, "%s: SIOCSIFMETRIC failed: %s\n",
__progname, strerror (errno));
program_name, strerror (errno));
return -1;
}
if (verbose)

1
ifconfig/flags.c
View File

@@ -32,6 +32,7 @@
# include <strings.h>
#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
#include "ifconfig.h"

2
ifconfig/ifconfig.c
View File

@@ -66,7 +66,7 @@ main(int argc, char *argv[])
if (sfd < 0)
{
fprintf (stderr, "%s: socket error: %s\n",
__progname, strerror (errno));
program_name, strerror (errno));
exit (1);
}

30
ifconfig/options.c
View File

@@ -173,13 +173,13 @@ usage (int err)
{
if (err != EXIT_SUCCESS)
{
fprintf (stderr, "Usage: %s [OPTION]...%s\n", __progname,
fprintf (stderr, "Usage: %s [OPTION]...%s\n", program_name,
system_help ? " [SYSTEM OPTION]..." : "");
fprintf (stderr, "Try `%s --help' for more information.\n", __progname);
fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
}
else
{
fprintf (stdout, "Usage: %s [OPTION]...%s\n", __progname,
fprintf (stdout, "Usage: %s [OPTION]...%s\n", program_name,
system_help ? " [SYSTEM OPTION]..." : "");
puts ("Configure network interfaces.\n\n\
Options are:\n\
@@ -223,7 +223,7 @@ parse_opt_new_ifs (char *name)
if (!ifs)
{
fprintf (stderr, "%s: can't get memory for interface "
"configuration: %s\n", __progname, strerror (errno));
"configuration: %s\n", program_name, strerror (errno));
exit (EXIT_FAILURE);
}
ifp = &ifs[nifs - 1];
@@ -239,14 +239,14 @@ parse_opt_set_##field (struct ifconfig *ifp, char *addr) \
if (!ifp) \
{ \
fprintf (stderr, "%s: no interface specified for " #fname \
" `%s'\n", __progname, addr); \
" `%s'\n", program_name, addr); \
usage (EXIT_FAILURE); \
} \
if (ifp->valid & IF_VALID_##fvalid) \
{ \
fprintf (stderr, "%s: only one " #fname \
" allowed for interface `%s'\n", \
__progname, ifp->name); \
program_name, ifp->name); \
usage (EXIT_FAILURE); \
} \
ifp->field = addr; \
@@ -266,14 +266,14 @@ parse_opt_set_##field (struct ifconfig *ifp, char *arg) \
if (!ifp) \
{ \
fprintf (stderr, "%s: no interface specified for " #fname \
" `%s'\n", __progname, arg); \
" `%s'\n", program_name, arg); \
usage (EXIT_FAILURE); \
} \
if (ifp->valid & IF_VALID_##fvalid) \
{ \
fprintf (stderr, "%s: only one " #fname \
" allowed for interface `%s'\n", \
__progname, ifp->name); \
program_name, ifp->name); \
usage (EXIT_FAILURE); \
} \
ifp->field = strtol (arg, &end, 0); \
@@ -281,7 +281,7 @@ parse_opt_set_##field (struct ifconfig *ifp, char *arg) \
{ \
fprintf (stderr, "%s: mtu value `%s' for interface `%s' " \
"is not a number.\n", \
__progname, optarg, ifp->name); \
program_name, optarg, ifp->name); \
exit (EXIT_FAILURE); \
} \
ifp->valid |= IF_VALID_##fvalid; \
@@ -296,7 +296,7 @@ parse_opt_set_af (struct ifconfig *ifp, char *af)
if (!ifp)
{
fprintf (stderr, "%s: no interface specified for address"
" family `%s'\n", __progname, af);
" family `%s'\n", program_name, af);
usage (EXIT_FAILURE);
}
@@ -305,7 +305,7 @@ parse_opt_set_af (struct ifconfig *ifp, char *af)
else
{
fprintf (stderr, "%s: unknown address family `%s' for interface `%s'"
" is not a number.\n", __progname, optarg, ifp->name);
" is not a number.\n", program_name, optarg, ifp->name);
exit (EXIT_FAILURE);
}
ifp->valid |= IF_VALID_AF;
@@ -348,15 +348,15 @@ parse_opt_finalize (struct ifconfig *ifp)
}
}
char *program_name;
void
parse_opt (int argc, char *argv[])
{
int option;
struct ifconfig *ifp = ifs;
#ifndef HAVE___PROGNAME
__progname = argv[0];
#endif
program_name = argv[0];
parse_opt_set_default_format (NULL);
@@ -446,7 +446,7 @@ parse_opt (int argc, char *argv[])
if (!ifs)
{
fprintf (stderr, "%s: can't get memory for interface "
"configuration: %s\n", __progname, strerror (errno));
"configuration: %s\n", program_name, strerror (errno));
exit (EXIT_FAILURE);
}
ifp = &ifs[nifs - 1];

3
ifconfig/options.h
View File

@@ -22,6 +22,7 @@
#ifndef IFCONFIG_OPTIONS_H
#define IFCONFIG_OPTIONS_H
#include <sys/types.h>
#include <sys/socket.h>
struct ifconfig *parse_opt_new_ifs (char *name);
@@ -60,7 +61,7 @@ struct format
extern struct format formats[];
/* The name of the program, as invoked on the command line. */
extern char *__progname;
extern char *program_name;
/* Array of interfaces mentioned on the command line. */
extern struct ifconfig *ifs;

20
ifconfig/printif.c
View File

@@ -46,9 +46,11 @@
#endif
#include <ctype.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "ifconfig.h"
@@ -416,7 +418,7 @@ fh_error (format_data_t form, int argc, char *argv[])
void
fh_progname (format_data_t form, int argc, char *argv[])
{
put_string (form, __progname);
put_string (form, program_name);
}
void
@@ -451,7 +453,7 @@ fh_index (format_data_t form, int argc, char *argv[])
if (indx == 0)
{
fprintf (stderr, "%s: No index number found for interface `%s': %s\n",
__progname, form->name, strerror (errno));
program_name, form->name, strerror (errno));
exit (EXIT_FAILURE);
}
*column += printf ("%i", indx);
@@ -476,7 +478,7 @@ fh_addr (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFADDR, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFADDR failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -505,7 +507,7 @@ fh_netmask (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFNETMASK, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFNETMASK failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -545,7 +547,7 @@ fh_brdaddr (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFBRDADDR, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFBRDADDR failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -585,7 +587,7 @@ fh_dstaddr (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFDSTADDR, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFDSTADDR failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -614,7 +616,7 @@ fh_mtu (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFMTU, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFMTU failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -643,7 +645,7 @@ fh_metric (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFMETRIC, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFMETRIC failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -672,7 +674,7 @@ fh_flags (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFFLAGS failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else

6
ifconfig/system/hpux.c
View File

@@ -145,17 +145,17 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
{
case EXPECT_BROADCAST:
fprintf (stderr, "%s: option `broadcast' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NETMASK:
fprintf (stderr, "%s: option `netmask' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_METRIC:
fprintf (stderr, "%s: option `metric' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NAME:

30
ifconfig/system/linux.c
View File

@@ -306,7 +306,7 @@ system_fh_hwaddr (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFHWADDR failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -343,7 +343,7 @@ system_fh_hwtype (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFHWADDR failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -380,7 +380,7 @@ system_fh_txqlen (format_data_t form, int argc, char *argv[])
if (ioctl (form->sfd, SIOCGIFTXQLEN, form->ifr) < 0)
{
fprintf (stderr, "%s: SIOCGIFTXQLEN failed for interface `%s': %s\n",
__progname, form->ifr->ifr_name, strerror (errno));
program_name, form->ifr->ifr_name, strerror (errno));
exit (EXIT_FAILURE);
}
else
@@ -410,7 +410,7 @@ system_parse_opt_set_txqlen(struct ifconfig *ifp, char *arg)
if (!ifp)
{
fprintf (stderr, "%s: no interface specified for txqlen"
" `%s'\n", __progname, arg);
" `%s'\n", program_name, arg);
usage (EXIT_FAILURE);
}
@@ -420,7 +420,7 @@ system_parse_opt_set_txqlen(struct ifconfig *ifp, char *arg)
if (! ifp->system)
{
fprintf (stderr, "%s: can't get memory for system interface "
"configuration: %s\n", __progname, strerror (errno));
"configuration: %s\n", program_name, strerror (errno));
exit (EXIT_FAILURE);
}
ifp->system->valid = 0;
@@ -429,7 +429,7 @@ system_parse_opt_set_txqlen(struct ifconfig *ifp, char *arg)
if (ifp->system->valid & IF_VALID_TXQLEN)
{
fprintf (stderr, "%s: only one txqlen allowed for interface `%s'\n",
__progname, ifp->name);
program_name, ifp->name);
usage (EXIT_FAILURE);
}
ifp->system->txqlen = strtol (arg, &end, 0);
@@ -437,7 +437,7 @@ system_parse_opt_set_txqlen(struct ifconfig *ifp, char *arg)
{
fprintf (stderr, "%s: txqlen value `%s' for interface `%s' "
"is not a number.\n",
__progname, arg, ifp->name);
program_name, arg, ifp->name);
exit (EXIT_FAILURE);
}
ifp->system->valid |= IF_VALID_TXQLEN;
@@ -531,32 +531,32 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
{
case EXPECT_BROADCAST:
fprintf (stderr, "%s: option `broadcast' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_DSTADDR:
fprintf (stderr, "%s: option `pointopoint' (`dstaddr') requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NETMASK:
fprintf (stderr, "%s: option `netmask' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_METRIC:
fprintf (stderr, "%s: option `metric' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_MTU:
fprintf (stderr, "%s: option `mtu' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_TXQLEN:
fprintf (stderr, "%s: option `txqueuelen' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NOTHING:
@@ -576,7 +576,7 @@ system_configure (int sfd, struct ifreq *ifr, struct system_ifconfig *ifs)
{
#ifndef SIOCSIFTXQLEN
printf ("%s: Don't know how to set the txqlen on this system.\n",
__progname);
program_name);
return -1;
#else
int err = 0;
@@ -586,7 +586,7 @@ system_configure (int sfd, struct ifreq *ifr, struct system_ifconfig *ifs)
if (err < 0)
{
fprintf (stderr, "%s: SIOCSIFTXQLEN failed: %s\n",
__progname, strerror (errno));
program_name, strerror (errno));
return -1;
}
if (verbose)

6
ifconfig/system/osf.c
View File

@@ -145,17 +145,17 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
{
case EXPECT_BROADCAST:
fprintf (stderr, "%s: option `broadcast' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NETMASK:
fprintf (stderr, "%s: option `netmask' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_METRIC:
fprintf (stderr, "%s: option `metric' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NAME:

12
ifconfig/system/solaris.c
View File

@@ -142,22 +142,22 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
{
case EXPECT_BROADCAST:
fprintf (stderr, "%s: option `broadcast' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NETMASK:
fprintf (stderr, "%s: option `netmask' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_METRIC:
fprintf (stderr, "%s: option `metric' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_MTU:
fprintf (stderr, "%s: option `mtu' requires an argument\n",
__progname);
program_name);
break;
case EXPECT_NOTHING:
@@ -177,7 +177,7 @@ system_configure (int sfd, struct ifreq *ifr, struct system_ifconfig *ifs)
{
#ifndef SIOCSIFTXQLEN
printf ("%s: Don't know how to set the txqlen on this system.\n",
__progname);
program_name);
return -1;
#else
int err = 0;
@@ -187,7 +187,7 @@ system_configure (int sfd, struct ifreq *ifr, struct system_ifconfig *ifs)
if (err < 0)
{
fprintf (stderr, "%s: SIOCSIFTXQLEN failed: %s\n",
__progname, strerror (errno));
program_name, strerror (errno));
return -1;
}
if (verbose)