summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2003-01-29 04:11:49 +0000
committerTon Voon <tonvoon@users.sourceforge.net>2003-01-29 04:11:49 +0000
commit4ad2c31c4e157d6392e9846debdfaf38e1cdda30 (patch)
tree81500f69e8fa97aba0e91999e5b49ecdd900d75d
parent489f4501f8d6bc1f53b4c808ecade65e7b0175cd (diff)
downloadmonitoring-plugins-4ad2c31c4e157d6392e9846debdfaf38e1cdda30.tar.gz
Fixed NULL status in Solaris (644783 - Fabian Pehla)
Fixed -p options (652082 - Ton Voon) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@261 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/check_procs.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 3849c776..4187a079 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -72,10 +72,10 @@ int options = 0; /* bitmask of filter criteria to test against */
72int verbose = FALSE; 72int verbose = FALSE;
73int uid; 73int uid;
74int ppid; 74int ppid;
75char *statopts = NULL; 75char *statopts = "";
76char *prog = NULL; 76char *prog = "";
77char *args = NULL; 77char *args = "";
78char *fmt = NULL; 78char *fmt = "";
79char tmp[MAX_INPUT_BUFFER]; 79char tmp[MAX_INPUT_BUFFER];
80 80
81int 81int
@@ -275,8 +275,6 @@ process_arguments (int argc, char **argv)
275 }; 275 };
276#endif 276#endif
277 277
278 asprintf (&fmt, "");
279
280 for (c = 1; c < argc; c++) 278 for (c = 1; c < argc; c++)
281 if (strcmp ("-to", argv[c]) == 0) 279 if (strcmp ("-to", argv[c]) == 0)
282 strcpy (argv[c], "-t"); 280 strcpy (argv[c], "-t");
@@ -351,7 +349,7 @@ process_arguments (int argc, char **argv)
351 } 349 }
352 case 'p': /* process id */ 350 case 'p': /* process id */
353 if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) { 351 if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) {
354 asprintf (&fmt, "%s%sPPID = %d", (options ? ", " : ""), ppid); 352 asprintf (&fmt, "%s%sPPID = %d", fmt, (options ? ", " : ""), ppid);
355 options |= PPID; 353 options |= PPID;
356 break; 354 break;
357 } 355 }
@@ -387,7 +385,7 @@ process_arguments (int argc, char **argv)
387 uid = pw->pw_uid; 385 uid = pw->pw_uid;
388 } 386 }
389 user = pw->pw_name; 387 user = pw->pw_name;
390 asprintf (&fmt, "%s%sUID = %d (%s)", (options ? ", " : ""), fmt, 388 asprintf (&fmt, "%s%sUID = %d (%s)", fmt, (options ? ", " : ""),
391 uid, user); 389 uid, user);
392 options |= USER; 390 options |= USER;
393 break; 391 break;