src/liboping.c: Do not reset recv_ttl in ping_receive_one().

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 06fb801..a1dbade 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -107,19 +107,28 @@ static void context_destroy (ping_context_t *context)
        free (context);
 }
 
-static void usage_exit (const char *name)
+static void usage_exit (const char *name, int status)
 {
        int name_length;
 
        name_length = (int) strlen (name);
 
-       fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval]\n"
-                       "%*s[-t ttl] [-I srcaddr]\n"
-                       "%*s-f filename | host [host [host ...]]\n",
-                       name,
-                       8 + name_length, "",
-                       8 + name_length, "");
-       exit (1);
+       fprintf (stderr, "Usage: %s [OPTIONS] "
+                               "-f filename | host [host [host ...]]\n"
+
+                       "\nAvailable options:\n"
+                       "  -4|-6        force the use of IPv4 or IPv6\n"
+                       "  -c count     number of ICMP packets to send\n"
+                       "  -i interval  interval with which to send ICMP packets\n"
+                       "  -t ttl       time to live for each ICMP packet\n"
+                       "  -I srcaddr   source address\n"
+                       "  -f filename  filename to read hosts from\n"
+
+                       "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n"
+                       "by Florian octo Forster <octo@verplant.org>\n"
+                       "for contributions see `AUTHORS'\n",
+                       name);
+       exit (status);
 }
 
 static int read_options (int argc, char **argv)
@@ -192,8 +201,10 @@ static int read_options (int argc, char **argv)
                        }
 
                        case 'h':
+                               usage_exit (argv[0], 0);
+                               break;
                        default:
-                               usage_exit (argv[0]);
+                               usage_exit (argv[0], 1);
                }
        }
 
@@ -320,7 +331,7 @@ int main (int argc, char **argv)
        optind = read_options (argc, argv);
 
        if ((optind >= argc) && (opt_filename == NULL)) {
-               usage_exit (argv[0]);
+               usage_exit (argv[0], 1);
        }
 
        if (geteuid () != 0)