[sdig-devel] sdig/src query.c,1.4,1.5

[Russell J. <ra...@us...>]

Update of /cvsroot/sdig/sdig/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26282

Modified Files:
	query.c 
Log Message:
Use config.h properly
Clean up after semaphore allocation


Index: query.c
===================================================================
RCS file: /cvsroot/sdig/sdig/src/query.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** query.c	18 May 2006 18:31:57 -0000	1.4
--- query.c	22 May 2006 01:41:32 -0000	1.5
***************
*** 3,6 ****
--- 3,10 ----
   */
  
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ 
  #include <ctype.h>
  #include <errno.h>
***************
*** 20,25 ****
  #include "snmpget.h"
  
- #include "../include/config.h"
- 
  char
  *findmac(const char *ip, rtype *rtr)
--- 24,27 ----
***************
*** 325,329 ****
  
  		switch (ret) {
! 			case 0:
  				fork_wrapper(macaddr, sw);
  				_exit(EX_OK);
--- 327,331 ----
  
  		switch (ret) {
! 			case 0: /* child process */
  				fork_wrapper(macaddr, sw);
  				_exit(EX_OK);
***************
*** 332,338 ****
  			case -1:
  				perror("fork");
  				break;
  
! 			default:
  				debug(3, "child %d started\n", ret);
  				break;
--- 334,341 ----
  			case -1:
  				perror("fork");
+ 				exit(EX_SOFTWARE);
  				break;
  
! 			default: /* parent process */
  				debug(3, "child %d started\n", ret);
  				break;
***************
*** 345,349 ****
  		debug(3, "child %d exited\n", ret);
  
! 	exit(0);
  }
  
--- 348,354 ----
  		debug(3, "child %d exited\n", ret);
  
! 	output_sem_cleanup();
! 
! 	exit(EX_OK);
  }
  
***************
*** 518,521 ****
  	return mac;
  }
- 
- 
--- 523,524 ----