[Initng-svn] r3821 - in initng/trunk/plugins: cpout ngc4

[svn at initng.thinktux.net]

Author: jimmy
Date: Tue Apr 18 12:19:41 2006
New Revision: 3821

Modified:
   initng/trunk/plugins/cpout/initng_colorprint_out.c
   initng/trunk/plugins/ngc4/initng_ngc4.c
   initng/trunk/plugins/nge/initng_nge.c

Log:
Some more cleanups.


Modified: initng/trunk/plugins/cpout/initng_colorprint_out.c
==============================================================================
--- initng/trunk/plugins/cpout/initng_colorprint_out.c	(original)
+++ initng/trunk/plugins/cpout/initng_colorprint_out.c	Tue Apr 18 12:19:41 2006
@@ -404,6 +404,12 @@
 		F_("This module is compiled for api_version %i version and initng is compiled on %i version, won't load this module!\n", API_VERSION, api_version);
 		return (FALSE);
 	}
+	
+	/* only add this module if this is a real init */
+	if(g.i_am == I_AM_INIT || g.i_am == I_AM_FAKE_INIT)
+		return(TRUE);
+	
+	
 	for (i = 0; g.Argv[i]; i++)
 	{
 		if (strstr(g.Argv[i], "quiet_when_up"))
@@ -428,6 +434,10 @@
 void module_unload(void)
 {
 	D_("color_out: module_unload();\n");
+	if(g.i_am == I_AM_INIT || g.i_am == I_AM_FAKE_INIT)
+		return;
+
+
 	initng_plugin_hook_del(&g.IS_CHANGE, &print_output);
 	initng_plugin_hook_del(&g.SWATCHERS, &print_system_state);
 	initng_plugin_hook_del(&g.PIPEWATCHERS, &print_program_output);

Modified: initng/trunk/plugins/ngc4/initng_ngc4.c
==============================================================================
--- initng/trunk/plugins/ngc4/initng_ngc4.c	(original)
+++ initng/trunk/plugins/ngc4/initng_ngc4.c	Tue Apr 18 12:19:41 2006
@@ -1203,7 +1203,9 @@
 		socket_filename = SOCKET_4_FILENAME_REAL;
 	else if (g.i_am == I_AM_FAKE_INIT)
 		socket_filename = SOCKET_4_FILENAME_TEST;
-
+	else
+		return(TRUE);
+		
 	D_("Socket is: %s\n", socket_filename);
 
 	D_("adding hook, that will reopen socket, for every started service.\n");
@@ -1229,11 +1231,12 @@
 void module_unload(void)
 {
 	D_("module_unload(ngc2);\n");
+	if (g.i_am != I_AM_INIT && g.i_am != I_AM_FAKE_INIT)
+		return;
 
 	/* close open sockets */
 	closesock();
 
-
 	/* remove hooks */
 	initng_plugin_hook_del(&g.FDWATCHERS, &fdh);
 	initng_plugin_hook_del(&g.SIGNAL, &check_socket);

Modified: initng/trunk/plugins/nge/initng_nge.c
==============================================================================
--- initng/trunk/plugins/nge/initng_nge.c	(original)
+++ initng/trunk/plugins/nge/initng_nge.c	Tue Apr 18 12:19:41 2006
@@ -533,14 +533,16 @@
 	 * Decide witch path to socket to use.
 	 * set socket_filename to right path
 	 */
-	{
+	
 		/* decide which socket to use */
 		if (g.i_am == I_AM_INIT)
 			socket_filename = NGE_REAL;
 		else if (g.i_am == I_AM_FAKE_INIT)
 			socket_filename = NGE_TEST;
+		else
+			return(FALSE);
 		D_("Socket is: %s\n", socket_filename);
-	}
+	
 
 	/*
 	 * Giving initng a SIGHUP, will make initng check that all sockets are open,