iputils/patches/iputils-s20071127-warnings.patch

   1 diff -up iputils-s20071127/ping_common.c.warnings iputils-s20071127/ping_common.c
   2 --- iputils-s20071127/ping_common.c.warnings    2008-06-02 13:29:27.000000000 +0200
   3 +++ iputils-s20071127/ping_common.c     2008-06-02 13:29:27.000000000 +0200
   4 @@ -338,7 +338,7 @@ resend:
   5                          * high preload or pipe size is very confusing. */
   6                         if ((preload < screen_width && pipesize < screen_width) ||
   7                             in_flight() < screen_width)
   8 -                               write(STDOUT_FILENO, ".", 1);
   9 +                               printf(".");
  10                 }
  11                 return interval - tokens;
  12         }
  13 @@ -391,7 +391,7 @@ resend:
  14
  15         if (i == 0 && !(options & F_QUIET)) {
  16                 if (options & F_FLOOD)
  17 -                       write(STDOUT_FILENO, "E", 1);
  18 +                       printf("E");
  19                 else
  20                         perror("ping: sendmsg");
  21         }
  22 @@ -717,9 +717,9 @@ restamp:
  23
  24         if (options & F_FLOOD) {
  25                 if (!csfailed)
  26 -                       write(STDOUT_FILENO, "\b \b", 3);
  27 +                       printf("\b \b");
  28                 else
  29 -                       write(STDOUT_FILENO, "\bC", 1);
  30 +                       printf("\bC");
  31         } else {
  32                 int i;
  33                 __u8 *cp, *dp;
  34 diff -up iputils-s20071127/clockdiff.c.warnings iputils-s20071127/clockdiff.c
  35 --- iputils-s20071127/clockdiff.c.warnings      2007-11-27 01:57:27.000000000 +0100
  36 +++ iputils-s20071127/clockdiff.c       2008-06-02 13:29:27.000000000 +0200
  37 @@ -628,8 +628,6 @@ main(int argc, char *argv[])
  38                 }
  39         }
  40
  41 -       nice(-16);
  42 -
  43         if ((measure_status = (ip_opt_len ? measure_opt : measure)(&server)) < 0) {
  44                 if (errno)
  45                         perror("measure");
  46 diff -up iputils-s20071127/ping6.c.warnings iputils-s20071127/ping6.c
  47 --- iputils-s20071127/ping6.c.warnings  2008-06-02 13:30:06.000000000 +0200
  48 +++ iputils-s20071127/ping6.c   2008-06-02 13:31:14.000000000 +0200
  49 @@ -667,7 +667,7 @@ int receive_error_msg()
  50                 if (options & F_QUIET)
  51                         goto out;
  52                 if (options & F_FLOOD)
  53 -                       write(STDOUT_FILENO, "E", 1);
  54 +                       printf("E");
  55                 else if (e->ee_errno != EMSGSIZE)
  56                         fprintf(stderr, "ping: local error: %s\n", strerror(e->ee_errno));
  57                 else
  58 @@ -690,7 +690,7 @@ int receive_error_msg()
  59                 if (options & F_QUIET)
  60                         goto out;
  61                 if (options & F_FLOOD) {
  62 -                       write(STDOUT_FILENO, "\bE", 2);
  63 +                       printf("\bE");
  64                 } else {
  65                         printf("From %s icmp_seq=%u ", pr_addr(&sin6->sin6_addr), ntohs(icmph.icmp6_seq));
  66                         pr_icmph(e->ee_type, e->ee_code, e->ee_info);
  67 @@ -838,7 +838,7 @@ parse_reply(struct msghdr *msg, int cc,
  68                                 return 0;
  69                         nerrors++;
  70                         if (options & F_FLOOD) {
  71 -                               write(STDOUT_FILENO, "\bE", 2);
  72 +                               printf("\bE");
  73                                 return 0;
  74                         }
  75                         printf("From %s: icmp_seq=%u ", pr_addr(&from->sin6_addr), ntohs(icmph1->icmp6_seq));
  76 diff -up iputils-s20071127/ping.c.warnings iputils-s20071127/ping.c
  77 --- iputils-s20071127/ping.c.warnings   2008-06-02 13:29:27.000000000 +0200
  78 +++ iputils-s20071127/ping.c    2008-06-02 13:29:27.000000000 +0200
  79 @@ -367,7 +367,7 @@ main(int argc, char **argv)
  80                 }
  81                 source.sin_port = 0;
  82                 close(probe_fd);
  83 -       } while (0);
  84 +       }
  85
  86         if (whereto.sin_addr.s_addr == 0)
  87                 whereto.sin_addr.s_addr = source.sin_addr.s_addr;
  88 @@ -594,7 +594,7 @@ int receive_error_msg()
  89                 if (options & F_QUIET)
  90                         goto out;
  91                 if (options & F_FLOOD)
  92 -                       write(STDOUT_FILENO, "E", 1);
  93 +                       printf("E");
  94                 else if (e->ee_errno != EMSGSIZE)
  95                         fprintf(stderr, "ping: local error: %s\n", strerror(e->ee_errno));
  96                 else
  97 @@ -630,7 +630,7 @@ int receive_error_msg()
  98                 if (options & F_QUIET)
  99                         goto out;
 100                 if (options & F_FLOOD) {
 101 -                       write(STDOUT_FILENO, "\bE", 2);
 102 +                       printf("\bE");
 103                 } else {
 104                         printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
 105                         pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
 106 @@ -795,7 +795,7 @@ parse_reply(struct msghdr *msg, int cc,
 107                                         return !error_pkt;
 108                                 if (options & F_FLOOD) {
 109                                         if (error_pkt)
 110 -                                               write(STDOUT_FILENO, "\bE", 2);
 111 +                                               printf("\bE");
 112                                         return !error_pkt;
 113                                 }
 114                                 printf("From %s: icmp_seq=%u ",
 115 @@ -812,9 +812,9 @@ parse_reply(struct msghdr *msg, int cc,
 116                 }
 117                 if ((options & F_FLOOD) && !(options & (F_VERBOSE|F_QUIET))) {
 118                         if (!csfailed)
 119 -                               write(STDOUT_FILENO, "!E", 2);
 120 +                               printf("!E");
 121                         else
 122 -                               write(STDOUT_FILENO, "!EC", 3);
 123 +                               printf("!EC");
 124                         return 0;
 125                 }
 126                 if (!(options & F_VERBOSE) || uid)