[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-33-g2a7913b

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  2a7913b37551105ab311464a11eb6edd31919610 (commit)
      from  e5e91cdb14b3dbb0dfd02c7f2f60b2b0abc4ff1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=2a7913b37551105ab311464a11eb6edd31919610


commit 2a7913b37551105ab311464a11eb6edd31919610
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Aug 1 14:15:44 2014 +0200

    ping, ping6: Repair pattern production.

diff --git a/ChangeLog b/ChangeLog
index fe50b73..4651155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2014-08-01  Mats Erik Andersson  <address@hidden>
 
+       ping, ping6: Repair pattern production.
+       A pattern stated on the command line was never made
+       productive, instead only nulls were inserted to the
+       correct length.
+
+       * ping/ping.c, ping/ping6.c (pattern_len): Set to MAXPATTERN.
+       (parse_opt): Size of PATTERN is now MAXPATTERN.
+
+       * ping/ping_common.h (MAXPATTERN): New macro.
+       * ping/ping_common.c (init_data_buffer): Increment I before
+       checking for end of pattern.  This avoids an insertion of
+       the closing null character.
+       (decode_pattern): Remove _GL_UNUSED_PARAMETER on `pattern_data'.
+       Insert scanned data C into pattern buffer.
+
+2014-08-01  Mats Erik Andersson  <address@hidden>
+
        * ftp/ftp.c (ptransfer): Change BS to be of type float.
        Improve readability by having speed estimates printed
        as `Mbytes/s', `kbytes/s', or `bytes/s' as suitable.
diff --git a/ping/ping.c b/ping/ping.c
index 843beeb..c2279ec 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -62,7 +62,7 @@ PING *ping;
 bool is_root = false;
 unsigned char *data_buffer;
 unsigned char *patptr;
-int pattern_len = 16;
+int pattern_len = MAXPATTERN;
 int socket_type;
 size_t count = DEFAULT_PING_COUNT;
 size_t interval;
@@ -149,7 +149,7 @@ static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
   char *endptr;
-  static unsigned char pattern[16];
+  static unsigned char pattern[MAXPATTERN];
   double v;
 
   switch (key)
diff --git a/ping/ping6.c b/ping/ping6.c
index a998d2b..383e679 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -59,7 +59,7 @@ bool is_root = false;
 unsigned char *data_buffer;
 unsigned char *patptr;
 int one = 1;
-int pattern_len = 16;
+int pattern_len = MAXPATTERN;
 size_t data_length = PING_DATALEN;
 size_t count = DEFAULT_PING_COUNT;
 size_t interval;
@@ -130,7 +130,7 @@ static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
   char *endptr;
-  static unsigned char pattern[16];
+  static unsigned char pattern[MAXPATTERN];
 
   switch (key)
     {
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 42cf9eb..de6933a 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -75,7 +75,7 @@ init_data_buffer (unsigned char * pat, size_t len)
       for (p = data_buffer; p < data_buffer + data_length; p++)
        {
          *p = pat[i];
-         if (i++ >= len)
+         if (++i >= len)
            i = 0;
        }
     }
@@ -88,7 +88,7 @@ init_data_buffer (unsigned char * pat, size_t len)
 
 void
 decode_pattern (const char *text, int *pattern_len,
-               unsigned char *pattern_data _GL_UNUSED_PARAMETER)
+               unsigned char *pattern_data)
 {
   int i, c, off;
 
@@ -98,6 +98,7 @@ decode_pattern (const char *text, int *pattern_len,
         error (EXIT_FAILURE, 0, "error in pattern near %s", text);
 
       text += off;
+      pattern_data[i] = c;
     }
   *pattern_len = i;
 }
diff --git a/ping/ping_common.h b/ping/ping_common.h
index ca47f2d..1f692e4 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -27,7 +27,8 @@
 
 #include <stdbool.h>
 
-#define MAXWAIT         10      /* max seconds to wait for response */
+#define MAXWAIT         10     /* Max seconds to wait for response.  */
+#define MAXPATTERN      16     /* Maximal length of pattern.  */
 
 #define OPT_FLOOD       0x001
 #define OPT_INTERVAL    0x002

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   17 +++++++++++++++++
 ping/ping.c        |    4 ++--
 ping/ping6.c       |    4 ++--
 ping/ping_common.c |    5 +++--
 ping/ping_common.h |    3 ++-
 5 files changed, 26 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils