emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont use getopt_long, minor usage changes, patch by Nick Fedchik

Browse Source
This commit is contained in:
Glenn L McGrath 2003-01-19 13:34:21 +00:00
parent e6ae6e3d39
commit a9adef0394
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/usage.h
View File

@ -1505,11 +1505,11 @@
"$ mv /tmp/foo /bin/bar\n"
#define nameif_trivial_usage \
"[OPTIONS] [{IFNAME MACADDR}]"
"[-s] [-c FILE] [{IFNAME MACADDR}]"
#define nameif_full_usage \
"Nameif renaming network interface while it in the down state.\n\n" \
"Options:\n" \
"\t-c FILE\t\tUse another configuration file (default is /etc/mactab)\n" \
"\t-c FILE\t\tUse configuration file (default is /etc/mactab)\n" \
"\t-s\t\tUse syslog (LOCAL0 facility).\n" \
"\tIFNAME MACADDR\tnew_interface_name interface_mac_address\n"
#define nameif_example_usage \

12
networking/nameif.c
View File

@ -36,7 +36,7 @@
#include "busybox.h"
/* take from linux/sockios.h */
#define SIOCSIFNAME 0x8923 /* set interface name */
#define SIOCSIFNAME 0x8923 /* set interface name */
/* Octets in one ethernet addr, from <linux/if_ether.h> */
#define ETH_ALEN 6
@ -101,13 +101,8 @@ int nameif_main(int argc, char **argv)
int if_index = 1;
mactable_t *ch;
static struct option opts[] = {
{"syslog", 0, NULL, 's'},
{"configfile", 1, NULL, 'c'},
{NULL},
};
while ((opt = getopt_long(argc, argv, "c:s", opts, NULL)) != -1) {
while ((opt = getopt(argc, argv, "c:s")) != -1) {
switch (opt) {
case 'c':
fname = optarg;
@ -152,8 +147,7 @@ int nameif_main(int argc, char **argv)
ch = xcalloc(1, sizeof(mactable_t));
ch->ifname = xstrndup(line_ptr, name_length);
if (name_length > IF_NAMESIZE)
serror("interface name `%s' too long",
ch->ifname);
serror("interface name `%s' too long", ch->ifname);
line_ptr += name_length;
line_ptr += strspn(line_ptr, " \t");
name_length = strspn(line_ptr, "0123456789ABCDEFabcdef:");