[Initng-svn] r3819 - in initng/trunk: plugins/ctrlaltdel src tools

[svn at initng.thinktux.net]

Author: jimmy
Date: Tue Apr 18 12:06:56 2006
New Revision: 3819

Modified:
   initng/trunk/devtool/test_parser.c
   initng/trunk/plugins/ctrlaltdel/initng_ctrlaltdel.c
   initng/trunk/src/initng_global.c
   initng/trunk/src/initng_global.h
   initng/trunk/src/main.c
   initng/trunk/tools/itype.c

Log:
Some cleanups.


Modified: initng/trunk/devtool/test_parser.c
==============================================================================
--- initng/trunk/devtool/test_parser.c	(original)
+++ initng/trunk/devtool/test_parser.c	Tue Apr 18 12:06:56 2006
@@ -90,7 +90,7 @@
 	service_cache_h *current = NULL;
 
 	/* initialise global variables */
-	initng_global_new(argc, argv, env);
+	initng_global_new(argc, argv, env, I_AM_UTILITY);
 
 	if (!initng_load_module_load_all())
 	{

Modified: initng/trunk/plugins/ctrlaltdel/initng_ctrlaltdel.c
==============================================================================
--- initng/trunk/plugins/ctrlaltdel/initng_ctrlaltdel.c	(original)
+++ initng/trunk/plugins/ctrlaltdel/initng_ctrlaltdel.c	Tue Apr 18 12:06:56 2006
@@ -40,6 +40,12 @@
 
 static void ctrlaltdel(int signal)
 {
+	if (signal == SIGWINCH)
+	{
+		W_("I got a keyboard sysrequest\n");
+		return;
+	}
+
 	if (signal != SIGINT)
 		return;
 

Modified: initng/trunk/src/initng_global.c
==============================================================================
--- initng/trunk/src/initng_global.c	(original)
+++ initng/trunk/src/initng_global.c	Tue Apr 18 12:06:56 2006
@@ -35,7 +35,12 @@
 s_global g;
 static void initng_global_parse_argv(char **argv);
 
-void initng_global_new(int argc, char *argv[], char *env[])
+/*
+ * initng_global_new.
+ * This function initziates the global data struct, with some standard values.
+ * This must be set before libinitng can be used in any way
+ */
+void initng_global_new(int argc, char *argv[], char *env[], h_i_am i_am)
 {
 	int i;
 
@@ -44,6 +49,9 @@
 
 	/* zero the complete s_global */
 	memset(&g, 0, sizeof(s_global));
+	
+	/* Set the i_am */
+	g.i_am = i_am;
 
 	/* we want to keep a copy of the arguments passed to us, this will be overwritten by set_title() */
 	g.Argc = argc;

Modified: initng/trunk/src/initng_global.h
==============================================================================
--- initng/trunk/src/initng_global.h	(original)
+++ initng/trunk/src/initng_global.h	Tue Apr 18 12:06:56 2006
@@ -45,9 +45,10 @@
 
 typedef enum
 {
-	I_AM_INIT = 0,
-	I_AM_FAKE_INIT = 1,
-	I_AM_UTILITY = 2,
+	I_AM_UNKNOWN = 0,
+	I_AM_INIT = 1,
+	I_AM_FAKE_INIT = 2,
+	I_AM_UTILITY = 3,
 } h_i_am;
 
 /* The GLOBAL struct */
@@ -139,7 +140,7 @@
 extern s_global g;
 
 /* functions for initialize and free s_global g */
-void initng_global_new(int argc, char *argv[], char *env[]);
+void initng_global_new(int argc, char *argv[], char *env[], h_i_am i_am);
 void initng_global_free(void);
 
 #define initng_global_set_sleep(sec) { D_("Sleep set: %i seconds.\n", sec); if(g.sleep_seconds==0||sec<g.sleep_seconds) g.sleep_seconds=sec; }

Modified: initng/trunk/src/main.c
==============================================================================
--- initng/trunk/src/main.c	(original)
+++ initng/trunk/src/main.c	Tue Apr 18 12:06:56 2006
@@ -445,17 +445,14 @@
 	/* get the time */
 	gettimeofday(&last, NULL);
 
-	/* initialise global variables */
-	initng_global_new(argc, argv, env);
 
 
-	/* set i_am_init if pid == 1 */
+	/* initialise global variables */
 	if (getpid() == 1)
-		g.i_am = I_AM_INIT;
-	else
-	{	
-		g.i_am = I_AM_FAKE_INIT;
-		W_("Initng is running in fake-mode, fake-default runlevel will be started instead.\n");
+	{
+		initng_global_new(argc, argv, env, I_AM_INIT);
+	} else {	
+		initng_global_new(argc, argv, env, I_AM_FAKE_INIT);
 	}
 
 	if (getuid() != 0)
@@ -481,6 +478,7 @@
 	else if (g.i_am == I_AM_FAKE_INIT)
 	{
 		/* when last service stopped, quit initng */
+		W_("Initng is running in fake-mode, fake-default runlevel will be started instead.\n");
 		g.when_out = THEN_QUIT;
 		initng_main_set_runlevel("fake-default");
 	}
@@ -605,21 +603,7 @@
 						/*initng_plugin_callers_alarm(); */
 						initng_handler_run_alarm();
 						break;
-					case SIGHUP:
-						/* Check timers plug-ins */
-						/*initng_plugin_callers_hup(); */
-						break;
-					case SIGPIPE:
-						/*initng_plugin_callers_pipe(); */
-						break;
-					case SIGINT:
-						/* call hook */
-						/* initng_plugin_callers_ctrlaltdel(); */
-						break;
-					case SIGWINCH:
-						D_("I got a keyboard request!\n");
-						if (!initng_handler_start_new_service_named("kbreq"))
-							F_("keyboard requires service \"kbreq\", could not be launched.\n");
+					default:
 						break;
 				}
 				/* reset the signal */

Modified: initng/trunk/tools/itype.c
==============================================================================
--- initng/trunk/tools/itype.c	(original)
+++ initng/trunk/tools/itype.c	Tue Apr 18 12:06:56 2006
@@ -86,7 +86,7 @@
 	printf("PATH: \"%s\"\n", path);
 	
 	/* initialise global variables */
-	initng_global_new(argc, argv, env);
+	initng_global_new(argc, argv, env, I_AM_UTILITY);
 
 	if (!initng_load_module_load_all())
 	{