[Nagiosplug-checkins] CVS: nagiosplug/plugins check_nagios.c,1.11,1.12

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17064

Modified Files:
	check_nagios.c 
Log Message:
Incorporate check_proc changes into check_nagios. ps handling probably should
be moved into utils.c in future


Index: check_nagios.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nagios.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** check_nagios.c	22 Aug 2003 06:22:38 -0000	1.11
--- check_nagios.c	11 Mar 2004 15:17:08 -0000	1.12
***************
*** 56,59 ****
--- 56,62 ----
  	char *procargs;
  	int pos, cols;
+ 	int expected_cols = PS_COLS - 1;
+ 	const char *zombie = "Z";
+ 	char *temp_string;
  
  	setlocale (LC_ALL, "");
***************
*** 90,93 ****
--- 93,99 ----
  	fclose (fp);
  
+ 	if (verbose >= 2)
+ 		printf("command: %s\n", PS_COMMAND);
+ 
  	/* run the command to check for the Nagios process.. */
  	child_process = spopen (PS_COMMAND);
***************
*** 107,118 ****
  	while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
  		cols = sscanf (input_buffer, PS_FORMAT, PS_VARLIST);
! 		if ( cols >= 6 ) {
  			asprintf (&procargs, "%s", input_buffer + pos);
  			strip (procargs);
  			
! 			if (!strstr(procargs, argv[0]) && strstr(procargs, process_string)) {
  				proc_entries++;
! 				if (verbose)
! 					printf (_("Found process: %s\n"), procargs);
  			}
  		}
--- 113,141 ----
  	while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
  		cols = sscanf (input_buffer, PS_FORMAT, PS_VARLIST);
!                 /* Zombie processes do not give a procprog command */
!                 if ( cols == (expected_cols - 1) && strstr(procstat, zombie) ) {
!                         cols = expected_cols;
!                         /* Set some value for procargs for the strip command further below
!                         Seen to be a problem on some Solaris 7 and 8 systems */
!                         input_buffer[pos] = '\n';
!                         input_buffer[pos+1] = 0x0;
!                 }
! 		if ( cols >= expected_cols ) {
  			asprintf (&procargs, "%s", input_buffer + pos);
  			strip (procargs);
  			
! 			/* Some ps return full pathname for command. This removes path */
!                         temp_string = strtok ((char *)procprog, "/");
!                         while (temp_string) {
!                                 strcpy(procprog, temp_string);
!                                 temp_string = strtok (NULL, "/");
!                         }
! 
! 			/* May get empty procargs */
! 			if (!strstr(procargs, argv[0]) && strstr(procprog, process_string) && strcmp(procargs,"")) {
  				proc_entries++;
! 				if (verbose >= 2) {
! 					printf (_("Found process: %s %s\n"), procprog, procargs);
! 				}
  			}
  		}