diff --git a/plugins/negate.c b/plugins/negate.c
index a11558d58a80a96f0c27d8b844d50fe9ca99c6ca..c1c0bc57fd07ae71fb16cf11b26102dc7afd22df 100644 (file)
--- a/plugins/negate.c
+++ b/plugins/negate.c
*
*****************************************************************************/
-#define PROGNAME "negate"
+const char *progname = "negate";
#define REVISION "$Revision$"
#define COPYRIGHT "2002"
#define AUTHOR "Karl DeBisschop"
#define SUMMARY "Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n"
#define OPTIONS "\
-\[-t timeout] <definition of wrapped plugin>"
+[-t timeout] <definition of wrapped plugin>"
#define LONGOPTIONS "\
-t, --timeout=INTEGER\n\
char *command_line;
-static int process_arguments (int, char **);
-static int validate_arguments (void);
-static void print_usage (void);
-static void print_help (void);
+int process_arguments (int, char **);
+int validate_arguments (void);
+void print_usage (void);
+void print_help (void);
\f
/******************************************************************************
<manvolnum>5<manvolnum>
</refmeta>
<refnamdiv>
-<refname>&PROGNAME;</refname>
+<refname>&progname;</refname>
<refpurpose>&SUMMARY;</refpurpose>
</refnamdiv>
</refentry>
char input_buffer[MAX_INPUT_BUFFER];
if (process_arguments (argc, argv) == ERROR)
- usage ("Could not parse arguments");
+ usage ("Could not parse arguments\n");
/* Set signal handling and alarm */
if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR)
void
print_help (void)
{
- print_revision (PROGNAME, REVISION);
+ print_revision (progname, REVISION);
printf
("Copyright (c) %s %s <%s>\n\n%s\n",
COPYRIGHT, AUTHOR, EMAIL, SUMMARY);
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);
}
\f
{
int c;
-#ifdef HAVE_GETOPT_H
int option_index = 0;
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"timeout", required_argument, 0, 't'},
{0, 0, 0, 0}
};
-#endif
while (1) {
-#ifdef HAVE_GETOPT_H
- c = getopt_long (argc, argv, "+?hVt:",
+ c = getopt_long (argc, argv, "+hVt:",
long_options, &option_index);
-#else
- c = getopt (argc, argv, "+?hVt:");
-#endif
+
if (c == -1 || c == EOF)
break;
switch (c) {
case '?': /* help */
- usage2 ("Unknown argument", optarg);
+ usage3 ("Unknown argument", optopt);
case 'h': /* help */
print_help ();
exit (EXIT_SUCCESS);
case 'V': /* version */
- print_revision (PROGNAME, REVISION);
+ print_revision (progname, REVISION);
exit (EXIT_SUCCESS);
case 't': /* timeout period */
if (!is_integer (optarg))
}
}
- command_line = strscpy (command_line, argv[optind]);
- for (c = optind+1; c <= argc; c++) {
+ asprintf (&command_line, "%s", argv[optind]);
+ for (c = optind+1; c < argc; c++) {
asprintf (&command_line, "%s %s", command_line, argv[c]);
}
int
validate_arguments ()
{
+ if (command_line == NULL)
+ return ERROR;
return STATE_OK;
}
\f