src/oping.c: Improved and unified error messages when parsing CL options.

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 0f39dc5b4d884005dd12bb4658f2bbc0d9ef2c81..06fb80143f7c7176fffeb7a35555835b209d4676 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -63,7 +63,7 @@ typedef struct ping_context
 
        int req_sent;
        int req_rcvd;
-       
+
        double latency_min;
        double latency_max;
        double latency_total;
@@ -73,6 +73,7 @@ typedef struct ping_context
 static double  opt_interval   = 1.0;
 static int     opt_addrfamily = PING_DEF_AF;
 static char   *opt_srcaddr    = NULL;
+static char   *opt_filename   = NULL;
 static int     opt_count      = -1;
 static int     opt_send_ttl   = 64;
 
@@ -114,7 +115,7 @@ static void usage_exit (const char *name)
 
        fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval]\n"
                        "%*s[-t ttl] [-I srcaddr]\n"
-                       "%*shost [host [host ...]]\n",
+                       "%*s-f filename | host [host [host ...]]\n",
                        name,
                        8 + name_length, "",
                        8 + name_length, "");
@@ -127,7 +128,7 @@ static int read_options (int argc, char **argv)
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:t:");
+               optchar = getopt (argc, argv, "46c:hi:I:t:f:");
 
                if (optchar == -1)
                        break;
@@ -145,6 +146,17 @@ static int read_options (int argc, char **argv)
                                        new_count = atoi (optarg);
                                        if (new_count > 0)
                                                opt_count = new_count;
+                                       else
+                                               fprintf(stderr, "Ignoring invalid count: %s\n",
+                                                               optarg);
+                               }
+                               break;
+
+                       case 'f':
+                               {
+                                       if (opt_filename != NULL)
+                                               free (opt_filename);
+                                       opt_filename = strdup (optarg);
                                }
                                break;
 
@@ -153,8 +165,8 @@ static int read_options (int argc, char **argv)
                                        double new_interval;
                                        new_interval = atof (optarg);
                                        if (new_interval < 0.001)
-                                               fprintf (stderr, "Ignoring invalid interval %g.\n",
-                                                               new_interval);
+                                               fprintf (stderr, "Ignoring invalid interval: %s\n",
+                                                               optarg);
                                        else
                                                opt_interval = new_interval;
                                }
@@ -174,7 +186,7 @@ static int read_options (int argc, char **argv)
                                if ((new_send_ttl > 0) && (new_send_ttl < 256))
                                        opt_send_ttl = new_send_ttl;
                                else
-                                       fprintf (stderr, "Invalid TTL argument: %s\n",
+                                       fprintf (stderr, "Ignoring invalid TTL argument: %s\n",
                                                        optarg);
                                break;
                        }
@@ -196,7 +208,7 @@ static void print_host (pingobj_iter_t *iter)
        size_t          buffer_len;
        size_t          data_len;
        ping_context_t *context;
-       
+
        latency = -1.0;
        buffer_len = sizeof (latency);
        ping_iterator_get_info (iter, PING_INFO_LATENCY,
@@ -307,8 +319,9 @@ int main (int argc, char **argv)
 
        optind = read_options (argc, argv);
 
-       if (optind >= argc)
+       if ((optind >= argc) && (opt_filename == NULL)) {
                usage_exit (argv[0]);
+       }
 
        if (geteuid () != 0)
        {
@@ -351,6 +364,48 @@ int main (int argc, char **argv)
                }
        }
 
+       if (opt_filename != NULL)
+       {
+               FILE *infile;
+               char line[256];
+               char host[256];
+
+               if (strcmp (opt_filename, "-") == 0)
+                       /* Open STDIN */
+                       infile = fdopen(0, "r");
+               else
+                       infile = fopen(opt_filename, "r");
+
+               if (infile == NULL)
+               {
+                       fprintf (stderr, "Opening %s failed: %s\n",
+                                       (strcmp (opt_filename, "-") == 0)
+                                       ? "STDIN" : opt_filename,
+                                       strerror(errno));
+                       return (1);
+               }
+
+               while (fgets(line, sizeof(line), infile))
+               {
+                       /* Strip whitespace */
+                       if (sscanf(line, "%s", host) != 1)
+                               continue;
+
+                       if ((host[0] == 0) || (host[0] == '#'))
+                               continue;
+
+                       if (ping_host_add(ping, host) < 0)
+                       {
+                               const char *errmsg = ping_get_error (ping);
+
+                               fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg);
+                               continue;
+                       }
+               }
+
+               fclose(infile);
+       }
+
        for (i = optind; i < argc; i++)
        {
                if (ping_host_add (ping, argv[i]) < 0)