Просмотр исходного кода

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

Ton Voon 23 лет назад
Родитель
Сommit
4ad2c31c4e
1 измененных файлов с 6 добавлено и 8 удалено
  1. 6 8
      plugins/check_procs.c

+ 6 - 8
plugins/check_procs.c

@@ -72,10 +72,10 @@ int options = 0; /* bitmask of filter criteria to test against */
 int verbose = FALSE;
 int verbose = FALSE;
 int uid;
 int uid;
 int ppid;
 int ppid;
-char *statopts = NULL;
-char *prog = NULL;
-char *args = NULL;
-char *fmt = NULL;
+char *statopts = "";
+char *prog = "";
+char *args = "";
+char *fmt = "";
 char tmp[MAX_INPUT_BUFFER];
 char tmp[MAX_INPUT_BUFFER];
 
 
 int
 int
@@ -275,8 +275,6 @@ process_arguments (int argc, char **argv)
 	};
 	};
 #endif
 #endif
 
 
-	asprintf (&fmt, "");
-
 	for (c = 1; c < argc; c++)
 	for (c = 1; c < argc; c++)
 		if (strcmp ("-to", argv[c]) == 0)
 		if (strcmp ("-to", argv[c]) == 0)
 			strcpy (argv[c], "-t");
 			strcpy (argv[c], "-t");
@@ -351,7 +349,7 @@ process_arguments (int argc, char **argv)
 			}
 			}
 		case 'p':									/* process id */
 		case 'p':									/* process id */
 			if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) {
 			if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) {
-				asprintf (&fmt, "%s%sPPID = %d", (options ? ", " : ""), ppid);
+				asprintf (&fmt, "%s%sPPID = %d", fmt, (options ? ", " : ""), ppid);
 				options |= PPID;
 				options |= PPID;
 				break;
 				break;
 			}
 			}
@@ -387,7 +385,7 @@ process_arguments (int argc, char **argv)
 				uid = pw->pw_uid;
 				uid = pw->pw_uid;
 			}
 			}
 			user = pw->pw_name;
 			user = pw->pw_name;
-			asprintf (&fmt, "%s%sUID = %d (%s)", (options ? ", " : ""), fmt,
+			asprintf (&fmt, "%s%sUID = %d (%s)", fmt, (options ? ", " : ""),
 			          uid, user);
 			          uid, user);
 			options |= USER;
 			options |= USER;
 			break;
 			break;