check_disk working with mountlist.c

[nagiosplug.git] / plugins / check_nwstat.c

diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index f8fca736d179207fecc57dacd614773674232ac2..100be12f9aa9f41e78e3e5d7e8422e472b272499 100644 (file)
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 
-#define PROGNAME "check_nwstat"
+const char *progname = "check_nwstat";
 #define REVISION "$Revision$"
 #define COPYRIGHT "Copyright (c) 1999-2001 Ethan Galstad"
 
@@ -128,8 +128,6 @@ int check_netware_version=FALSE;
 unsigned long vars_to_check=CHECK_NONE;
 int sap_number=-1;
 
-#define PROGNAME "check_nwstat"
-
 int process_arguments(int, char **);
 void print_usage(void);
 void print_help(void);
@@ -296,7 +294,7 @@ int main(int argc, char **argv){
                        result=STATE_CRITICAL;
                else if(check_warning_value==TRUE && lru_time <= warning_value)
                        result=STATE_WARNING;
-               sprintf(&output_message,"LRU sitting time = %lu minutes",lru_time);
+               asprintf(&output_message,"LRU sitting time = %lu minutes",lru_time);
 
 
        /* check KB free space on volume */
@@ -590,7 +588,7 @@ int main(int argc, char **argv){
  
                max_service_processes=atoi(recv_buffer);
  
-               sprintf(&send_buffer,"S21\r\n");
+               asprintf(&send_buffer,"S21\r\n");
                result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
                if(result!=STATE_OK)
                        return result;
@@ -624,7 +622,6 @@ int main(int argc, char **argv){
 int process_arguments(int argc, char **argv){
        int c;
 
-#ifdef HAVE_GETOPT_H
        int option_index = 0;
        static struct option long_options[] =
        { 
@@ -639,7 +636,6 @@ int process_arguments(int argc, char **argv){
                {"help",     no_argument,      0,'h'},
                {0,0,0,0}
        };
-#endif
 
        /* no options were supplied */
        if(argc<2) return ERROR;
@@ -662,11 +658,7 @@ int process_arguments(int argc, char **argv){
        }
 
        while (1){
-#ifdef HAVE_GETOPT_H
                c = getopt_long(argc,argv,"+hoVH:t:c:w:p:v:",long_options,&option_index);
-#else
-               c = getopt(argc,argv,"+hoVH:t:c:w:p:v:");
-#endif
 
                if (c==-1||c==EOF||c==1)
                        break;
@@ -674,14 +666,14 @@ int process_arguments(int argc, char **argv){
                switch (c)
                        {
                        case '?': /* print short usage statement if args not parsable */
-                               printf("%s: Unknown argument: %s\n\n",my_basename(argv[0]),optarg);
+                               printf ("%s: Unknown argument: %s\n\n", progname, optarg);
                                print_usage();
                                exit(STATE_UNKNOWN);
                        case 'h': /* help */
                                print_help();
                                exit(STATE_OK);
                        case 'V': /* version */
-                               print_revision(my_basename(argv[0]),"$Revision$");
+                               print_revision(progname,"$Revision$");
                                exit(STATE_OK);
                        case 'H': /* hostname */
                                server_address=optarg;
@@ -693,7 +685,7 @@ int process_arguments(int argc, char **argv){
                                if (is_intnonneg(optarg))
                                        server_port=atoi(optarg);
                                else
-                                       terminate(STATE_UNKNOWN,"Server port an integer (seconds)\nType '%s -h' for additional help\n",PROGNAME);
+                                       terminate(STATE_UNKNOWN,"Server port an integer (seconds)\nType '%s -h' for additional help\n",progname);
                                break;
                        case 'v':
                                if(strlen(optarg)<3)
@@ -799,19 +791,14 @@ void print_usage(void)
        printf
                ("Usage:\n"
                 " %s %s\n"
-#ifdef HAVE_GETOPT_H
                 " %s (-h | --help) for detailed help\n"
                 " %s (-V | --version) for version information\n",
-#else
-                " %s -h for detailed help\n"
-                " %s -V for version information\n",
-#endif
-                PROGNAME, OPTIONS, PROGNAME, PROGNAME);
+                progname, OPTIONS, progname, progname);
 }
 
 void print_help(void)
 {
-       print_revision (PROGNAME, REVISION);
+       print_revision (progname, REVISION);
        printf ("%s\n\n%s\n", COPYRIGHT, SUMMARY);
        print_usage();
        printf