A patch from Jaspreet Singh <jsingh@somanetworks.com>

fixing both a segfault and cosmetic bug in route

diff --git a/networking/route.c b/networking/route.c
index d571fc5a3a770065792777d3662c9b547dd535a1..8e12a3f2e9faff0cdda52267744b37b850f3277b 100644 (file)
--- a/networking/route.c
+++ b/networking/route.c
@@ -15,7 +15,7 @@
  * Foundation;  either  version 2 of the License, or  (at
  * your option) any later version.
  *
- * $Id: route.c,v 1.10 2001/03/21 07:34:26 andersen Exp $
+ * $Id: route.c,v 1.11 2001/08/23 22:05:33 andersen Exp $
  *
  * displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru>
  * adjustments by Larry Doolittle  <LRDoolittle@lbl.gov>
@@ -108,6 +108,8 @@ INET_setroute(int action, int options, char **args)
 
        xflag = 0;
 
+       if (*args == NULL)
+           show_usage();
        if (strcmp(*args, "-net")==0) {
                xflag = 1;
                args++;
@@ -115,9 +117,6 @@ INET_setroute(int action, int options, char **args)
                xflag = 2;
                args++;
        }
-       if (*args == NULL)
-               show_usage();
-
        safe_strncpy(target, *args++, (sizeof target));
 
        /* Clean out the RTREQ structure. */
@@ -375,9 +374,11 @@ static void displayroutes(void)
                        if(nl==1) {
                 printf("Kernel IP routing table\n"
 "Destination     Gateway         Genmask         Flags Metric Ref    Use Iface\n");
+                       } else {
+                           nl++;
+                           continue;
                        }
 
-
                        ifl = 0;        /* parse flags */
                        if(flgs&1)
                                flags[ifl++]='U';

diff --git a/route.c b/route.c
index d571fc5a3a770065792777d3662c9b547dd535a1..8e12a3f2e9faff0cdda52267744b37b850f3277b 100644 (file)
--- a/route.c
+++ b/route.c
@@ -15,7 +15,7 @@
  * Foundation;  either  version 2 of the License, or  (at
  * your option) any later version.
  *
- * $Id: route.c,v 1.10 2001/03/21 07:34:26 andersen Exp $
+ * $Id: route.c,v 1.11 2001/08/23 22:05:33 andersen Exp $
  *
  * displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru>
  * adjustments by Larry Doolittle  <LRDoolittle@lbl.gov>
@@ -108,6 +108,8 @@ INET_setroute(int action, int options, char **args)
 
        xflag = 0;
 
+       if (*args == NULL)
+           show_usage();
        if (strcmp(*args, "-net")==0) {
                xflag = 1;
                args++;
@@ -115,9 +117,6 @@ INET_setroute(int action, int options, char **args)
                xflag = 2;
                args++;
        }
-       if (*args == NULL)
-               show_usage();
-
        safe_strncpy(target, *args++, (sizeof target));
 
        /* Clean out the RTREQ structure. */
@@ -375,9 +374,11 @@ static void displayroutes(void)
                        if(nl==1) {
                 printf("Kernel IP routing table\n"
 "Destination     Gateway         Genmask         Flags Metric Ref    Use Iface\n");
+                       } else {
+                           nl++;
+                           continue;
                        }
 
-
                        ifl = 0;        /* parse flags */
                        if(flgs&1)
                                flags[ifl++]='U';