summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2004-08-12 22:35:57 +0000
committerGuillem Jover <guillem@hadrons.org>2010-06-10 23:21:16 +0200
commitb04b13910e1489c6ee20fa187198dc9838e6e905 (patch)
tree029d6c49873ff61e9640a7c43798e1058de253c0
parentb04fd6ad3d94fcb4c261968d9854ce89bc9e9a4d (diff)
downloadinetutils-b04b13910e1489c6ee20fa187198dc9838e6e905.tar.gz
Sync IPv6 patch with what would be found on CVS
-rw-r--r--debian/patches/30_ipv6.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/30_ipv6.patch b/debian/patches/30_ipv6.patch
index 1b17e4f..1b6b6b1 100644
--- a/debian/patches/30_ipv6.patch
+++ b/debian/patches/30_ipv6.patch
@@ -800,6 +800,33 @@ diff -Naur old/ping/ping.c new/ping/ping.c
printf ("%s comes with ABSOLUTELY NO WARRANTY.\n", PACKAGE_NAME);
printf ("You may redistribute copies of %s\n", PACKAGE_NAME);
printf ("under the terms of the GNU General Public License.\n");
+@@ -169,7 +146,7 @@
+ break;
+
+ case 'c':
+- ping_set_count (ping, ping_cvt_number (optarg, 0));
++ ping_set_count (ping, ping_cvt_number (optarg, 0, 0));
+ break;
+
+ case 'd':
+@@ -182,7 +159,7 @@
+
+ case 'i':
+ options |= OPT_INTERVAL;
+- ping_set_interval (ping, ping_cvt_number (optarg, 0));
++ ping_set_interval (ping, ping_cvt_number (optarg, 0, 0));
+ break;
+
+ case 'p':
+@@ -191,7 +168,7 @@
+ break;
+
+ case 's':
+- data_length = ping_cvt_number (optarg, PING_MAX_DATALEN);
++ data_length = ping_cvt_number (optarg, PING_MAX_DATALEN, 1);
+ break;
+
+ case 'n':
@@ -247,10 +224,20 @@
break;