busybox/networking/libiproute/ip_parse_common_args.c
Denys Vlasenko 0f296a3a56 libiproute: rename invarg(a,b) to invarg_1_to_2(a,b)
invarg(a,b) - "invalid argument", but how a and b enter the message?

invarg_1_to_2(a,b) is somewhat easier to read: "invalid argument 'a' to 'b'"

Audit of usage revealed a number of bad uses, with too long messages.

   text	   data	    bss	    dec	    hex	filename
 938848	    932	  17448	 957228	  e9b2c	busybox_old
 938788	    932	  17448	 957168	  e9af0	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2015-10-14 13:21:01 +02:00

82 lines
1.6 KiB
C

/* vi: set sw=4 ts=4: */
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*
* Changes:
*
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
*/
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "utils.h"
family_t preferred_family = AF_UNSPEC;
smallint oneline;
char _SL_;
char** FAST_FUNC ip_parse_common_args(char **argv)
{
static const char ip_common_commands[] ALIGN1 =
"oneline" "\0"
"family" "\0"
"4" "\0"
"6" "\0"
"0" "\0"
;
enum {
ARG_oneline,
ARG_family,
ARG_IPv4,
ARG_IPv6,
ARG_packet,
};
static const family_t af_numbers[] = { AF_INET, AF_INET6, AF_PACKET };
int arg;
while (*argv) {
char *opt = *argv;
if (opt[0] != '-')
break;
opt++;
if (opt[0] == '-') {
opt++;
if (!opt[0]) { /* "--" */
argv++;
break;
}
}
arg = index_in_substrings(ip_common_commands, opt);
if (arg < 0)
bb_show_usage();
if (arg == ARG_oneline) {
oneline = 1;
argv++;
continue;
}
if (arg == ARG_family) {
static const char families[] ALIGN1 =
"inet" "\0" "inet6" "\0" "link" "\0";
argv++;
if (!*argv)
bb_show_usage();
arg = index_in_strings(families, *argv);
if (arg < 0)
invarg_1_to_2(*argv, "family");
/* now arg == 0, 1 or 2 */
} else {
arg -= ARG_IPv4;
/* now arg == 0, 1 or 2 */
}
preferred_family = af_numbers[arg];
argv++;
}
_SL_ = oneline ? '\\' : '\n';
return argv;
}