commit a3c8481a3323a5e4aa3be92bb6dc60adb30d673e
author Eric Andersen <andersen@codepoet.org> Thu Aug 23 22:05:33 2001 +0000
committer Eric Andersen <andersen@codepoet.org> Thu Aug 23 22:05:33 2001 +0000
tree 44fae17c8076dda7f98c4ae736dab46d79875adf
parent b76cb68979e072a020a0c203bcd4ed2d2ec7afa8

A patch from Jaspreet Singh <jsingh@somanetworks.com>
fixing both a segfault and cosmetic bug in route

networking/route.c

diff --git a/networking/route.c b/networking/route.c
index d571fc5..8e12a3f 100644
--- 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 @@
 
 	xflag = 0;
 
+	if (*args == NULL)
+	    show_usage();
 	if (strcmp(*args, "-net")==0) {
 		xflag = 1;
 		args++;
@@ -115,9 +117,6 @@
 		xflag = 2;
 		args++;
 	}
-	if (*args == NULL)
-		show_usage();
-
 	safe_strncpy(target, *args++, (sizeof target));
 
 	/* Clean out the RTREQ structure. */
@@ -375,9 +374,11 @@
 			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';

route.c

diff --git a/route.c b/route.c
index d571fc5..8e12a3f 100644
--- 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 @@
 
 	xflag = 0;
 
+	if (*args == NULL)
+	    show_usage();
 	if (strcmp(*args, "-net")==0) {
 		xflag = 1;
 		args++;
@@ -115,9 +117,6 @@
 		xflag = 2;
 		args++;
 	}
-	if (*args == NULL)
-		show_usage();
-
 	safe_strncpy(target, *args++, (sizeof target));
 
 	/* Clean out the RTREQ structure. */
@@ -375,9 +374,11 @@
 			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';