projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compile error, last_patch81 by Vladimir N. Oleynik
[oweals/busybox.git]
/
networking
/
nameif.c
diff --git
a/networking/nameif.c
b/networking/nameif.c
index 886ff49a8703a4f6f142b939f9502662d1691786..f3b9271584373b2ed1bdfa2e363d36d1528a171f 100644
(file)
--- a/
networking/nameif.c
+++ b/
networking/nameif.c
@@
-1,4
+1,4
@@
-/*
+/*
* nameif.c - Naming Interfaces based on MAC address for busybox.
*
* Writen 2000 by Andi Kleen.
* nameif.c - Naming Interfaces based on MAC address for busybox.
*
* Writen 2000 by Andi Kleen.
@@
-36,9
+36,9
@@
#include "busybox.h"
/* take from linux/sockios.h */
#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>
*/
+/* Octets in one ethernet addr, from <linux/if_ether.h> */
#define ETH_ALEN 6
#ifndef ifr_newname
#define ETH_ALEN 6
#ifndef ifr_newname
@@
-52,18
+52,22
@@
typedef struct mactable_s {
struct ether_addr *mac;
} mactable_t;
struct ether_addr *mac;
} mactable_t;
-static void serror(const char use_syslog, const char *s, ...)
+static unsigned char use_syslog;
+
+static void serror(const char *s, ...) __attribute__ ((noreturn));
+
+static void serror(const char *s, ...)
{
va_list ap;
va_start(ap, s);
if (use_syslog) {
{
va_list ap;
va_start(ap, s);
if (use_syslog) {
- openlog(
"nameif"
, 0, LOG_LOCAL0);
- syslog(LOG_ERR, s, ap);
+ openlog(
applet_name
, 0, LOG_LOCAL0);
+
v
syslog(LOG_ERR, s, ap);
closelog();
} else {
closelog();
} else {
- v
fprintf(stderr,
s, ap);
+ v
error_msg(
s, ap);
putc('\n', stderr);
}
putc('\n', stderr);
}
@@
-73,14
+77,14
@@
static void serror(const char use_syslog, const char *s, ...)
}
/* Check ascii str_macaddr, convert and copy to *mac */
}
/* Check ascii str_macaddr, convert and copy to *mac */
-struct ether_addr *cc_macaddr(char *str_macaddr
, unsigned char use_syslog
)
+struct ether_addr *cc_macaddr(char *str_macaddr)
{
struct ether_addr *lmac, *mac;
lmac = ether_aton(str_macaddr);
if (lmac == NULL)
{
struct ether_addr *lmac, *mac;
lmac = ether_aton(str_macaddr);
if (lmac == NULL)
- serror(
use_syslog,
"cannot parse MAC %s", str_macaddr);
- mac = x
calloc(1,
ETH_ALEN);
+ serror("cannot parse MAC %s", str_macaddr);
+ mac = x
malloc(
ETH_ALEN);
memcpy(mac, lmac, ETH_ALEN);
return mac;
memcpy(mac, lmac, ETH_ALEN);
return mac;
@@
-90,21
+94,15
@@
int nameif_main(int argc, char **argv)
{
mactable_t *clist = NULL;
FILE *ifh;
{
mactable_t *clist = NULL;
FILE *ifh;
- char *fname = "/etc/mactab";
+ c
onst c
har *fname = "/etc/mactab";
char *line;
char *line;
- unsigned char use_syslog = 0;
- int ctl_sk = -1;
+ int ctl_sk;
int opt;
int if_index = 1;
int opt;
int if_index = 1;
- mactable_t *ch
= NULL
;
+ 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;
switch (opt) {
case 'c':
fname = optarg;
@@
-121,23
+119,18
@@
int nameif_main(int argc, char **argv)
show_usage();
if (optind < argc) {
show_usage();
if (optind < argc) {
- while (optind < argc) {
+ char **a = argv + optind;
- if (strlen(argv[optind]) > IF_NAMESIZE)
- serror(use_syslog, "interface name `%s' too long",
- argv[optind]);
- optind++;
+ while (*a) {
+ if (strlen(*a) > IF_NAMESIZE)
+ serror("interface name `%s' too long", *a);
ch = xcalloc(1, sizeof(mactable_t));
ch = xcalloc(1, sizeof(mactable_t));
- ch->next = NULL;
- ch->prev = NULL;
- ch->ifname = strdup(argv[optind - 1]);
- ch->mac = cc_macaddr(argv[optind], use_syslog);
- optind++;
+ ch->ifname = xstrdup(*a++);
+ ch->mac = cc_macaddr(*a++);
if (clist)
if (clist)
- clist->prev = ch
->next
;
+ clist->prev = ch;
ch->next = clist;
ch->next = clist;
- ch->prev = clist;
clist = ch;
}
} else {
clist = ch;
}
} else {
@@
-145,24
+138,21
@@
int nameif_main(int argc, char **argv)
while ((line = get_line_from_file(ifh)) != NULL) {
char *line_ptr;
while ((line = get_line_from_file(ifh)) != NULL) {
char *line_ptr;
-
unsigned shor
t name_length;
+
size_
t name_length;
line_ptr = line + strspn(line, " \t");
if ((line_ptr[0] == '#') || (line_ptr[0] == '\n'))
continue;
name_length = strcspn(line_ptr, " \t");
line_ptr = line + strspn(line, " \t");
if ((line_ptr[0] == '#') || (line_ptr[0] == '\n'))
continue;
name_length = strcspn(line_ptr, " \t");
- if (name_length > IF_NAMESIZE)
- serror(use_syslog, "interface name `%s' too long",
- argv[optind]);
ch = xcalloc(1, sizeof(mactable_t));
ch = xcalloc(1, sizeof(mactable_t));
- ch->
next = NULL
;
- ch->prev = NULL;
-
ch->ifname = strndup(line_ptr, name_length
);
+ ch->
ifname = xstrndup(line_ptr, name_length)
;
+ if (name_length > IF_NAMESIZE)
+
serror("interface name `%s' too long", ch->ifname
);
line_ptr += name_length;
line_ptr += strspn(line_ptr, " \t");
name_length = strspn(line_ptr, "0123456789ABCDEFabcdef:");
line_ptr[name_length] = '\0';
line_ptr += name_length;
line_ptr += strspn(line_ptr, " \t");
name_length = strspn(line_ptr, "0123456789ABCDEFabcdef:");
line_ptr[name_length] = '\0';
- ch->mac = cc_macaddr(line_ptr
, use_syslog
);
+ ch->mac = cc_macaddr(line_ptr);
if (clist)
clist->prev = ch;
ch->next = clist;
if (clist)
clist->prev = ch;
ch->next = clist;
@@
-173,7
+163,7
@@
int nameif_main(int argc, char **argv)
}
if ((ctl_sk = socket(PF_INET, SOCK_DGRAM, 0)) == -1)
}
if ((ctl_sk = socket(PF_INET, SOCK_DGRAM, 0)) == -1)
- serror(
use_syslog, "socket: %s", strerror(errno)
);
+ serror(
"socket: %m"
);
while (clist) {
struct ifreq ifr;
while (clist) {
struct ifreq ifr;
@@
-201,8
+191,8
@@
int nameif_main(int argc, char **argv)
strcpy(ifr.ifr_newname, ch->ifname);
if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0)
strcpy(ifr.ifr_newname, ch->ifname);
if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0)
- serror(
use_syslog, "cannot change ifname %s to %s: %s
",
- ifr.ifr_name, ch->ifname
, strerror(errno)
);
+ serror(
"cannot change ifname %s to %s: %m
",
+ ifr.ifr_name, ch->ifname);
/* Remove list entry of renamed interface */
if (ch->prev != NULL) {
/* Remove list entry of renamed interface */
if (ch->prev != NULL) {
@@
-212,13
+202,11
@@
int nameif_main(int argc, char **argv)
}
if (ch->next != NULL)
(ch->next)->prev = ch->prev;
}
if (ch->next != NULL)
(ch->next)->prev = ch->prev;
+#ifdef CONFIG_FEATURE_CLEAN_UP
+ free(ch->ifname);
+ free(ch->mac);
free(ch);
free(ch);
- }
-
- while (clist) {
- ch = clist;
- clist = clist->next;
- free(ch);
+#endif
}
return 0;
}
return 0;