define and use usage3 where second part of message is a an int/char

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@178 f882894a-f735-0410-b71e-b25c423dba1c

plugins/check_pgsql.c

@@ -266,17 +266,17 @@ process_arguments (int argc, char **argv)
 
 	while (1) {
 #ifdef HAVE_GETOPT_H
-		c = getopt_long (argc, argv, "+?hVt:c:w:H:P:d:l:p:a:",
+		c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:",
 		                 long_options, &option_index);
 #else
-		c = getopt (argc, argv, "+?hVt:c:w:H:P:d:l:p:a:");
+		c = getopt (argc, argv, "hVt:c:w:H:P:d:l:p:a:");
 #endif
 		if (c == EOF)
 			break;
 
 		switch (c) {
 		case '?':     /* usage */
-			usage2 ("Unknown argument", optarg);
+			usage3 ("Unknown argument", optopt);
 		case 'h':     /* help */
 			print_help ();
 			exit (STATE_OK);

plugins/check_ping.c

@@ -187,7 +187,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':	/* usage */
-			usage2 ("Unknown argument", optarg);
+			usage3 ("Unknown argument", optopt);
 		case 'h':	/* help */
 			print_help ();
 			exit (STATE_OK);

plugins/check_snmp.c

@@ -418,10 +418,10 @@ process_arguments (int argc, char **argv)
 	while (1) {
 #ifdef HAVE_GETOPT_H
 		c =
-			getopt_long (argc, argv, "+?hVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:",
+			getopt_long (argc, argv, "hVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:",
 									 long_options, &option_index);
 #else
-		c = getopt (argc, argv, "+?hVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:");
+		c = getopt (argc, argv, "hVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:");
 #endif
 
 		if (c == -1 || c == EOF)
@@ -429,7 +429,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':	/* usage */
-			usage2 ("Unknown argument", optarg);
+			usage3 ("Unknown argument", optopt);
 		case 'h':	/* help */
 			print_help ();
 			exit (STATE_OK);

plugins/negate.c

@@ -234,17 +234,17 @@ process_arguments (int argc, char **argv)
 
 	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:");
+		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);

plugins/utils.h.in

@@ -86,6 +86,12 @@ int max_state(int, int);
  exit(STATE_UNKNOWN);\
 }
 
+#define usage3(msg,arg) {\
+ printf("%s: %s - %c\n",PROGNAME,msg,arg);\
+ print_usage();\
+ exit(STATE_UNKNOWN);\
+}
+
 #define state_text(a) \
 (a)==0?"OK":\
 (a)==1?"WARNING":\