diff options
| author | Maciej Żenczykowski <maze@google.com> | 2019-01-12 17:46:31 -0800 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2019-01-25 16:13:25 -0800 |
| commit | 65ec68d11846edb15ba60acb053a8a7285e5b18d (patch) | |
| tree | a25e4e8c654ce597407cd3ffed174d25d6c935d4 /tc/tc.c | |
| parent | c534d18b9e1cab158625e69c45de9c0201f9c54f (diff) | |
| download | platform_external_iproute2-65ec68d11846edb15ba60acb053a8a7285e5b18d.tar.gz platform_external_iproute2-65ec68d11846edb15ba60acb053a8a7285e5b18d.tar.bz2 platform_external_iproute2-65ec68d11846edb15ba60acb053a8a7285e5b18d.zip | |
iproute2: re-enable batching
(probably not useful without rest of patch series)
Bug: 65674744
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I58752686f3e1583960e842aa7e3ae66b2446f97b
Diffstat (limited to 'tc/tc.c')
| -rw-r--r-- | tc/tc.c | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -214,11 +214,7 @@ noexist: static void usage(void) { fprintf(stderr, "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n" -#ifdef ANDROID - " tc [-force]\n" -#else " tc [-force] -batch filename\n" -#endif "where OBJECT := { qdisc | class | filter | action | monitor | exec }\n" " OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -p[retty] | -b[atch] [filename] | -n[etns] name |\n" " -nm | -nam[es] | { -cf | -conf } path }\n"); @@ -248,7 +244,6 @@ static int do_cmd(int argc, char **argv) return -1; } -#ifndef ANDROID static int batch(const char *name) { char *line = NULL; @@ -293,15 +288,12 @@ static int batch(const char *name) rtnl_close(&rth); return ret; } -#endif int main(int argc, char **argv) { int ret; -#ifndef ANDROID char *batch_file = NULL; -#endif while (argc > 1) { if (argv[1][0] != '-') @@ -327,13 +319,11 @@ int main(int argc, char **argv) return 0; } else if (matches(argv[1], "-force") == 0) { ++force; -#ifndef ANDROID } else if (matches(argv[1], "-batch") == 0) { argc--; argv++; if (argc <= 1) usage(); batch_file = argv[1]; -#endif } else if (matches(argv[1], "-netns") == 0) { NEXT_ARG(); if (netns_switch(argv[1])) @@ -357,10 +347,8 @@ int main(int argc, char **argv) argc--; argv++; } -#ifndef ANDROID if (batch_file) return batch(batch_file); -#endif if (argc <= 1) { usage(); |