Updated link to sfsnapshotgit

[nagiosplug.git] / contrib / check_rbl.c

diff --git a/contrib/check_rbl.c b/contrib/check_rbl.c
index 5c6611354812c1aa57340480fc7c887d7a284e28..eec84ad876a827717bdad8656cb5516015fac946 100644 (file)
--- a/contrib/check_rbl.c
+++ b/contrib/check_rbl.c
@@ -11,7 +11,7 @@
 * * License: GPL
 * * Copyright (c) 2000
 * * 
-* * $Id$
+* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $
 *
 *****************************************************************************/
 
@@ -21,7 +21,10 @@
 #include "popen.h"
 #include "string.h"
 
-#define PROGNAME "check_rbl"
+const char progname = "check_rbl";
+const char *revision = "$Revision: 970 $";
+//const char *copyright = "2000-2003";
+//const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 int process_arguments(int, char **);
 int call_getopt(int, char **);
@@ -48,7 +51,7 @@ int main(int argc, char **argv){
                usage("Cannot catch SIGALRM\n");
 
        if (process_arguments(argc,argv)!=OK)
-               usage("Could not parse arguments\n");
+               usage   (_("check_rbl: could not parse arguments\n"));
 
        /* reverse the octets in the IP address */
        query_address_rev = reverse_ipaddr(query_address);
@@ -127,7 +130,7 @@ int main(int argc, char **argv){
        if (spclose(child_process)) {
                result=error_set(result,STATE_WARNING);
                if (!strcmp(output,""))
-                       strcpy(output,"nslookup returned error status");
+                       strcpy(output,"nslookup returned an error status");
        }
        
        (void)time(&end_time);
@@ -144,6 +147,8 @@ int main(int argc, char **argv){
        return result;
 }
 
+
+
 /* reverse the ipaddr */
 char *reverse_ipaddr(char *ipaddr)
 {
@@ -160,6 +165,7 @@ char *reverse_ipaddr(char *ipaddr)
 }
 
 
+
 /* process command-line arguments */
 int process_arguments(int argc, char **argv)
 {
@@ -189,9 +195,6 @@ int process_arguments(int argc, char **argv)
 
 
 
-
-
-
 int call_getopt(int argc, char **argv)
 {
   int c,i=0;
@@ -260,13 +263,15 @@ int call_getopt(int argc, char **argv)
                                }
                                break;
       case 'V': /* version */
-                               print_revision(PROGNAME,"$Revision$");
+                               print_revision(progname,"$Revision: 970 $");
                                exit(STATE_OK);
       case 'h': /* help */
                                print_help();
                                exit(STATE_OK);
       case '?': /* help */
-                               usage("Invalid argument\n");
+                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+                       print_usage ();
+                       exit (STATE_UNKNOWN);
                        }
   }
   return i;
@@ -274,8 +279,6 @@ int call_getopt(int argc, char **argv)
 
 
 
-
-
 int validate_arguments(void)
 {
   if (query_address == NULL || rbl_name == NULL)
@@ -286,11 +289,9 @@ int validate_arguments(void)
 
 
 
-
-
 void print_help(void)
 {
-       print_revision(PROGNAME,"$Revision$");
+       print_revision(progname,"$Revision: 970 $");
        printf
                ("Copyright (c) 2000 Karl DeBisschop\n\n"
                 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n");
@@ -317,13 +318,11 @@ void print_help(void)
 
 
 
-
-
 void print_usage(void)
 {
        printf
                ("Usage: %s -H hostip -r rblname [-s server] [-t timeout] [-v]\n"
                 "       %s --help\n"
                 "       %s --version\n",
-                PROGNAME,PROGNAME,PROGNAME);
+                progname, progname, progname);
 }