diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
| commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
| tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /networking/nameif.c | |
| parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) | |
| download | busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz | |
Major coreutils update.
Diffstat (limited to 'networking/nameif.c')
| -rw-r--r-- | networking/nameif.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/networking/nameif.c b/networking/nameif.c index f3b927158..e74a04213 100644 --- a/networking/nameif.c +++ b/networking/nameif.c @@ -63,11 +63,11 @@ static void serror(const char *s, ...) va_start(ap, s); if (use_syslog) { - openlog(applet_name, 0, LOG_LOCAL0); + openlog(bb_applet_name, 0, LOG_LOCAL0); vsyslog(LOG_ERR, s, ap); closelog(); } else { - verror_msg(s, ap); + bb_verror_msg(s, ap); putc('\n', stderr); } @@ -111,12 +111,12 @@ int nameif_main(int argc, char **argv) use_syslog = 1; break; default: - show_usage(); + bb_show_usage(); } } if ((argc - optind) & 1) - show_usage(); + bb_show_usage(); if (optind < argc) { char **a = argv + optind; @@ -126,7 +126,7 @@ int nameif_main(int argc, char **argv) if (strlen(*a) > IF_NAMESIZE) serror("interface name `%s' too long", *a); ch = xcalloc(1, sizeof(mactable_t)); - ch->ifname = xstrdup(*a++); + ch->ifname = bb_xstrdup(*a++); ch->mac = cc_macaddr(*a++); if (clist) clist->prev = ch; @@ -134,9 +134,9 @@ int nameif_main(int argc, char **argv) clist = ch; } } else { - ifh = xfopen(fname, "r"); + ifh = bb_xfopen(fname, "r"); - while ((line = get_line_from_file(ifh)) != NULL) { + while ((line = bb_get_line_from_file(ifh)) != NULL) { char *line_ptr; size_t name_length; @@ -145,7 +145,7 @@ int nameif_main(int argc, char **argv) continue; name_length = strcspn(line_ptr, " \t"); ch = xcalloc(1, sizeof(mactable_t)); - ch->ifname = xstrndup(line_ptr, name_length); + ch->ifname = bb_xstrndup(line_ptr, name_length); if (name_length > IF_NAMESIZE) serror("interface name `%s' too long", ch->ifname); line_ptr += name_length; |