rename bb_default_error_retval -> xfunc_error_retval

[oweals/busybox.git] / networking / ip.c

diff --git a/networking/ip.c b/networking/ip.c
index cfdbf8b9690a45bd561dde6aa081507d06cf5aeb..fe5714f166bbaba3c84a74244c7049315f448954 100644 (file)
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -1,10 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ip.c                "ip" utility frontend.
  *
- *             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.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
@@ -23,63 +21,11 @@
 #include <netinet/in.h>
 #include <string.h>
 
-#include "./libiproute/utils.h"
-#include "./libiproute/ip_common.h"
+#include "libiproute/utils.h"
+#include "libiproute/ip_common.h"
 
 #include "busybox.h"
 
-#if 0
-int preferred_family = AF_UNSPEC;
-int oneline = 0;
-char * _SL_ = NULL;
-
-void ip_parse_common_args(int *argcp, char ***argvp)
-{
-       int argc = *argcp;
-       char **argv = *argvp;
-
-       while (argc > 1) {
-               char *opt = argv[1];
-
-               if (strcmp(opt,"--") == 0) {
-                       argc--; argv++;
-                       break;
-               }
-
-               if (opt[0] != '-')
-                       break;
-
-               if (opt[1] == '-')
-                       opt++;
-
-               if (matches(opt, "-family") == 0) {
-                       argc--;
-                       argv++;
-                       if (strcmp(argv[1], "inet") == 0)
-                               preferred_family = AF_INET;
-                       else if (strcmp(argv[1], "inet6") == 0)
-                               preferred_family = AF_INET6;
-                       else if (strcmp(argv[1], "link") == 0)
-                               preferred_family = AF_PACKET;
-                       else
-                               invarg(argv[1], "invalid protocol family");
-               } else if (strcmp(opt, "-4") == 0) {
-                       preferred_family = AF_INET;
-               } else if (strcmp(opt, "-6") == 0) {
-                       preferred_family = AF_INET6;
-               } else if (strcmp(opt, "-0") == 0) {
-                       preferred_family = AF_PACKET;
-               } else if (matches(opt, "-oneline") == 0) {
-                       ++oneline;
-               } else {
-                       bb_show_usage();
-               }
-               argc--; argv++;
-       }
-       _SL_ = oneline ? "\\" : "\n" ;
-}
-#endif
-
 int ip_main(int argc, char **argv)
 {
        int ret = EXIT_FAILURE;