mii-tool: don't rely on eth0 being default network device name.

With this patch mii-tool requires interface name
to be specified as argument.

diff --git a/man/en_US/mii-tool.8 b/man/en_US/mii-tool.8
index a26ce6e..66bad1b 100644 (file)
--- a/man/en_US/mii-tool.8
+++ b/man/en_US/mii-tool.8
@@ -16,7 +16,7 @@ mii\-tool \- view, manipulate media-independent interface status
 [\fB\-l\fR, \fB\-\-log\fR]
 [\fB\-A\fR, \fB\-\-advertise=\fImedia,...\fR]
 [\fB\-F\fR, \fB\-\-force=\fImedia\fR]
-.RI [ "interface\ ..." ]
+.RI "interface\ ..."
 
 .SH DESCRIPTION
 This utility checks or sets the status of a network interface's Media
@@ -36,9 +36,7 @@ one mode, instead of autonegotiating.  The \fB\-A\fR and \fB\-F\fR
 options are mutually exclusive.
 .PP
 The default short output reports the negotiated link speed and link
-status for each interface.  If an interface or interfaces are not
-specified on the command line, then \fBmii\-tool\fR will check any
-available interfaces from \fBeth0\fR through \fBeth7\fR.
+status for each interface.
 .SH OPTIONS
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR

diff --git a/mii-tool.c b/mii-tool.c
index 13e6cc3..3d7a034 100644 (file)
--- a/mii-tool.c
+++ b/mii-tool.c
@@ -440,7 +440,7 @@ static void watch_one_xcvr(int skfd, char *ifname, int index)
 /*--------------------------------------------------------------------*/
 
 const char *usage =
-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
+"usage: %s [-VvRrwl] [-A media,... | -F media] <interface ...>\n"
 "       -V, --version               display version information\n"
 "       -v, --verbose               more verbose output\n"
 "       -R, --reset                 reset MII to poweron state\n"
@@ -507,13 +507,10 @@ int main(int argc, char **argv)
 
     /* No remaining args means show all interfaces. */
     if (optind == argc) {
-       ret = 1;
-       for (i = 0; i < MAX_ETH; i++) {
-           sprintf(s, "eth%d", i);
-           ret &= do_one_xcvr(skfd, s, 1);
-       }
-       if (ret)
-           fprintf(stderr, "no MII interfaces found\n");
+       fprintf(stderr, "No interface specified\n");
+       fprintf(stderr, usage, argv[0]);
+       close(skfd);
+       return 2;
     } else {
        ret = 0;
        for (i = optind; i < argc; i++) {
@@ -524,15 +521,8 @@ int main(int argc, char **argv)
     if (opt_watch && (ret == 0)) {
        while (1) {
            sleep(1);
-           if (optind == argc) {
-               for (i = 0; i < MAX_ETH; i++) {
-                   sprintf(s, "eth%d", i);
-                   watch_one_xcvr(skfd, s, i);
-               }
-           } else {
-               for (i = optind; i < argc; i++)
+           for (i = optind; i < argc; i++)
                    watch_one_xcvr(skfd, argv[i], i-optind);
-           }
        }
     }