[Initng-svn] r2390 - in initng: plugins/also plugins/bash_launcher
plugins/chdir plugins/chroot plugins/cpout plugins/critical
plugins/cron plugins/depend plugins/dllaunch plugins/dparser
plugins/envparser plugins/find plugins/fstat plugins/history
plugins/idleprobe plugins/inetd plugins/initctl
plugins/interactive plugins/iparser plugins/justbeforeX
plugins/last plugins/limit plugins/logfile plugins/netprobe
plugins/ngc2 plugins/pause plugins/pidfile
plugins/pidfile/test plugins/provide plugins/reload
plugins/renice plugins/respawn plugins/rlparser
plugins/simple_launcher plugins/splash plugins/stcmd
plugins/stdout plugins/suid plugins/syncron plugins/syslog
plugins/unneeded plugins/usplash src test tools
svn at initng.thinktux.net
svn at initng.thinktux.net
Mon Dec 12 18:34:53 CET 2005
Author: caglar
Date: Mon Dec 12 18:34:49 2005
New Revision: 2390
Modified:
initng/plugins/also/initng_also.c
initng/plugins/bash_launcher/initng_bash_launcher.c
initng/plugins/chdir/initng_chdir.c
initng/plugins/chroot/initng_chroot.c
initng/plugins/cpout/initng_colorprint_out.c
initng/plugins/critical/initng_critical.c
initng/plugins/cron/initng_cron.c
initng/plugins/depend/initng_depend.c
initng/plugins/dllaunch/initng_dllaunch.c
initng/plugins/dparser/initng_d_parser.c
initng/plugins/envparser/initng_envparser.c
initng/plugins/find/initng_find.c
initng/plugins/fstat/initng_fstat.c
initng/plugins/history/initng_history.c
initng/plugins/idleprobe/initng_idleprobe.c
initng/plugins/inetd/initng_inetd.c
initng/plugins/initctl/initng_initctl.c
initng/plugins/interactive/initng_interactive.c
initng/plugins/iparser/initng_i_parser.c
initng/plugins/justbeforeX/initng_jbx.c
initng/plugins/last/initng_last.c
initng/plugins/limit/initng_limit.c
initng/plugins/logfile/initng_logfile.c
initng/plugins/netprobe/initng_netprobe.c
initng/plugins/ngc2/initng_ngc2.c
initng/plugins/ngc2/ngc2.c
initng/plugins/pause/initng_pause.c
initng/plugins/pidfile/initng_pidfile.c
initng/plugins/pidfile/test/test_pidfile.c
initng/plugins/provide/initng_provide.c
initng/plugins/reload/initng_reload.c
initng/plugins/renice/initng_renice.c
initng/plugins/respawn/initng_respawn.c
initng/plugins/rlparser/initng_rl_parser.c
initng/plugins/simple_launcher/initng_simple_launcher.c
initng/plugins/splash/initng_splash.c
initng/plugins/stcmd/initng_stcmd.c
initng/plugins/stdout/initng_stdout.c
initng/plugins/suid/initng_suid.c
initng/plugins/syncron/initng_syncron.c
initng/plugins/syslog/initng_syslog.c
initng/plugins/unneeded/initng_unneeded.c
initng/plugins/usplash/initng_usplash.c
initng/src/initng_active_db.c
initng/src/initng_active_db.h
initng/src/initng_active_state.c
initng/src/initng_common.c
initng/src/initng_control_command.c
initng/src/initng_env_variable.c
initng/src/initng_execute.c
initng/src/initng_fd.c
initng/src/initng_fork.c
initng/src/initng_handler.c
initng/src/initng_kill_handler.c
initng/src/initng_main.c
initng/src/initng_process_db.h
initng/src/initng_service_cache.c
initng/src/initng_service_data_types.c
initng/src/initng_static_data_id.c
initng/src/initng_static_states.c
initng/src/initng_struct_data.c
initng/src/main.c
initng/test/test_initng_load_module.c
initng/tools/install_service.c
Log:
fix #340 by meebee <initng at teco.edu>
Modified: initng/plugins/also/initng_also.c
==============================================================================
--- initng/plugins/also/initng_also.c (original)
+++ initng/plugins/also/initng_also.c Mon Dec 12 18:34:49 2005
@@ -102,7 +102,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/bash_launcher/initng_bash_launcher.c
==============================================================================
--- initng/plugins/bash_launcher/initng_bash_launcher.c (original)
+++ initng/plugins/bash_launcher/initng_bash_launcher.c Mon Dec 12 18:34:49 2005
@@ -57,7 +57,7 @@
"A shell script, inserted into a multiline variable."
};
s_entry SCRIPT_OPT = { "script_opt", VARIABLE_STRING, 10, NULL,
- "The options bash shuld get."
+ "The options bash should get."
};
static void bash_this(const char *bash_code, active_h * s, const char *args);
@@ -151,7 +151,7 @@
D_("initng_simple_plugin: module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/chdir/initng_chdir.c
==============================================================================
--- initng/plugins/chdir/initng_chdir.c (original)
+++ initng/plugins/chdir/initng_chdir.c Mon Dec 12 18:34:49 2005
@@ -64,7 +64,7 @@
D_("module_init(CHDIR);\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
initng_sdt_add(&CHDIR);
Modified: initng/plugins/chroot/initng_chroot.c
==============================================================================
--- initng/plugins/chroot/initng_chroot.c (original)
+++ initng/plugins/chroot/initng_chroot.c Mon Dec 12 18:34:49 2005
@@ -74,7 +74,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/cpout/initng_colorprint_out.c
==============================================================================
--- initng/plugins/cpout/initng_colorprint_out.c (original)
+++ initng/plugins/cpout/initng_colorprint_out.c Mon Dec 12 18:34:49 2005
@@ -338,7 +338,7 @@
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/critical/initng_critical.c
==============================================================================
--- initng/plugins/critical/initng_critical.c (original)
+++ initng/plugins/critical/initng_critical.c Mon Dec 12 18:34:49 2005
@@ -37,7 +37,7 @@
#include "initng_critical.h"
s_entry CRITICAL = { "critical", SET, 8, NULL,
- "If this option is set, and service dont suceeds, initng will quit and offer a sulogin."
+ "If this option is set, and service doesn't suceed, initng will quit and offer a sulogin."
};
/* returns TRUE if all use deps are started */
@@ -83,7 +83,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/cron/initng_cron.c
==============================================================================
--- initng/plugins/cron/initng_cron.c (original)
+++ initng/plugins/cron/initng_cron.c Mon Dec 12 18:34:49 2005
@@ -218,7 +218,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/depend/initng_depend.c
==============================================================================
--- initng/plugins/depend/initng_depend.c (original)
+++ initng/plugins/depend/initng_depend.c Mon Dec 12 18:34:49 2005
@@ -79,7 +79,7 @@
/* look if it exits allredy */
if (active_db_find_by_name(tmp))
{
- D_("No need to LOAD %s, it is allredy loaded!\n", tmp);
+ D_("No need to LOAD %s, it is already loaded!\n", tmp);
continue;
}
@@ -99,7 +99,7 @@
/* look if it exits allredy */
if (active_db_find_by_name(tmp))
{
- D_("No need to LOAD %s, it is allredy loaded!\n", tmp);
+ D_("No need to LOAD %s, it is already loaded!\n", tmp);
continue;
}
@@ -122,7 +122,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/dllaunch/initng_dllaunch.c
==============================================================================
--- initng/plugins/dllaunch/initng_dllaunch.c (original)
+++ initng/plugins/dllaunch/initng_dllaunch.c Mon Dec 12 18:34:49 2005
@@ -52,7 +52,7 @@
"Load a shared library and execute start() when service is started."
};
s_entry DL_STOP = { "dl_stop", STRING, 7 SERVICE_OPT,
- "Load a shared library and execute stop() when service is stoped."
+ "Load a shared library and execute stop() when service is stopped."
};
static int initng_d_start(active_h * service, process_h * process)
@@ -104,7 +104,7 @@
if (stat(name, &st) != 0 || !S_ISREG(st.st_mode))
{
- F_("Culd not find file %s\n", name);
+ F_("Could not find file %s\n", name);
_exit(1);
}
@@ -148,7 +148,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/dparser/initng_d_parser.c
==============================================================================
--- initng/plugins/dparser/initng_d_parser.c (original)
+++ initng/plugins/dparser/initng_d_parser.c Mon Dec 12 18:34:49 2005
@@ -211,7 +211,7 @@
serv = service_db_new(s_name, &TYPE_SERVICE);
if (!serv)
{
- D_("Cant allocate service\n");
+ D_("Can't allocate service\n");
free(content);
return (NULL);
}
@@ -275,7 +275,7 @@
D_("d_parser: module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/envparser/initng_envparser.c
==============================================================================
--- initng/plugins/envparser/initng_envparser.c (original)
+++ initng/plugins/envparser/initng_envparser.c Mon Dec 12 18:34:49 2005
@@ -36,10 +36,10 @@
#include "initng_envparser.h"
s_entry ENV_FILE = { "env_file", STRINGS, 8, NULL,
- "Parse this file for environmetal variables."
+ "Parse this file for environmental variables."
};
s_entry ENV_FILE_REQUIRED = { "env_file_required", STRINGS, 17, NULL,
- "Same as env_file, but service will file if the file dont exits."
+ "Same as env_file, but service will fail if the file doesn't exist."
};
static int parse_file(const char *file, service_h * s);
@@ -116,7 +116,7 @@
j++;
/*
- * a line like OPT="fist second third" shud not be added with
+ * a line like OPT="fist second third" should not be added with
* the fisrst and last '"'
* change the line from:
* OPT="first second third\0"
@@ -153,7 +153,7 @@
{
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
D_("module_init();\n");
Modified: initng/plugins/find/initng_find.c
==============================================================================
--- initng/plugins/find/initng_find.c (original)
+++ initng/plugins/find/initng_find.c Mon Dec 12 18:34:49 2005
@@ -66,7 +66,7 @@
strncpy(t, dir, 40);
strcpy(t, "/");
strncat(t, from, 40);
- W_("Service shud be %s/%s\n", dir, from);
+ W_("Service should be %s/%s\n", dir, from);
if ((tmp = parse_service(t)))
{
closedir(path);
@@ -197,7 +197,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/fstat/initng_fstat.c
==============================================================================
--- initng/plugins/fstat/initng_fstat.c (original)
+++ initng/plugins/fstat/initng_fstat.c Mon Dec 12 18:34:49 2005
@@ -105,7 +105,7 @@
S_;
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/history/initng_history.c
==============================================================================
--- initng/plugins/history/initng_history.c (original)
+++ initng/plugins/history/initng_history.c Mon Dec 12 18:34:49 2005
@@ -331,7 +331,7 @@
{
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/idleprobe/initng_idleprobe.c
==============================================================================
--- initng/plugins/idleprobe/initng_idleprobe.c (original)
+++ initng/plugins/idleprobe/initng_idleprobe.c Mon Dec 12 18:34:49 2005
@@ -60,7 +60,7 @@
/* system have to be idle for 10 seconds */
s_entry WAIT_FOR_CPU_IDLE = { "wait_for_cpu_idle", SET, 17, NULL,
- "If this is set, initng will wait until cpu has been ideling for 10 seconds before starting."
+ "If this is set, initng will wait until cpu has been idleing for 10 seconds before starting."
};
/* set the seconds system have to be idle */
@@ -215,7 +215,7 @@
S_;
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/inetd/initng_inetd.c
==============================================================================
--- initng/plugins/inetd/initng_inetd.c (original)
+++ initng/plugins/inetd/initng_inetd.c Mon Dec 12 18:34:49 2005
@@ -145,7 +145,7 @@
{
D_("module_init(ngc2);\n"); if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n",
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n",
INITNG_VERSION, version); return (FALSE);}
Modified: initng/plugins/initctl/initng_initctl.c
==============================================================================
--- initng/plugins/initctl/initng_initctl.c (original)
+++ initng/plugins/initctl/initng_initctl.c Mon Dec 12 18:34:49 2005
@@ -264,7 +264,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/interactive/initng_interactive.c
==============================================================================
--- initng/plugins/interactive/initng_interactive.c (original)
+++ initng/plugins/interactive/initng_interactive.c Mon Dec 12 18:34:49 2005
@@ -35,7 +35,7 @@
static int active;
-/* Ask for every service if it shud start */
+/* Ask for every service if it should start */
int check_interactive(active_h * service, a_state_h * status)
{
char asw[10];
@@ -95,7 +95,7 @@
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
D_("module_init();\n");
Modified: initng/plugins/iparser/initng_i_parser.c
==============================================================================
--- initng/plugins/iparser/initng_i_parser.c (original)
+++ initng/plugins/iparser/initng_i_parser.c Mon Dec 12 18:34:49 2005
@@ -155,7 +155,7 @@
/*
* now set up path and service.
* if service_to_find is system/initial/udevd
- * path shud be "system/initial"
+ * path should be "system/initial"
* and service "udevd"
*/
@@ -450,7 +450,7 @@
if (!is_valid(father_name))
{
err_print_line(*to_parse,
- "Fater name contains invalid characters.");
+ "Father name contains invalid characters.");
return (FALSE);
}
@@ -827,7 +827,7 @@
break;
default:
err_print_line(*where,
- "Unknowun, or undefined type to parse!");
+ "Unknown, or undefined type to parse!");
result = FALSE;
break;
}
@@ -1075,7 +1075,7 @@
/* make sure value is not to big */
if (len >= 10)
{
- err_print_line(*value, "Lenght is bigger then 10.");
+ err_print_line(*value, "Length is bigger than 10.");
return (FALSE);
}
@@ -1166,7 +1166,7 @@
D_("i_parser: module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/justbeforeX/initng_jbx.c
==============================================================================
--- initng/plugins/justbeforeX/initng_jbx.c (original)
+++ initng/plugins/justbeforeX/initng_jbx.c Mon Dec 12 18:34:49 2005
@@ -190,7 +190,7 @@
S_;
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/last/initng_last.c
==============================================================================
--- initng/plugins/last/initng_last.c (original)
+++ initng/plugins/last/initng_last.c Mon Dec 12 18:34:49 2005
@@ -58,7 +58,7 @@
return (TRUE);
/* ok check with all service */
- D_("LAST: walking tru service db\n");
+ D_("LAST: walking through service db\n");
while_active_db(current)
{
/* dont check ourself */
@@ -70,12 +70,12 @@
if (current->type == &TYPE_RUNLEVEL)
continue;
- /* if this service also shud be started last, continue */
+ /* if this service also should be started last, continue */
if (active_db_is(&LAST, current))
continue;
/* TODO, use dep_on_deep */
- /* if current need service that shud be last */
+ /* if current need service that should be last */
if (active_db_dep_on_deep(current, service) == TRUE)
{
/* dont wait, becouse this wait is circular */
@@ -85,7 +85,7 @@
if (IS_STARTING(current))
{
- D_("Service %s is also starting, and %s shud be started last\n",
+ D_("Service %s is also starting, and %s should be started last\n",
current->name, service->name);
return (FALSE);
}
@@ -101,7 +101,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/limit/initng_limit.c
==============================================================================
--- initng/plugins/limit/initng_limit.c (original)
+++ initng/plugins/limit/initng_limit.c Mon Dec 12 18:34:49 2005
@@ -110,7 +110,7 @@
switch (errno)
{
case EFAULT:
- return ("Rlim pints outside the accessible adress space.\n");
+ return ("Rlim prints outside the accessible adress space.\n");
case EINVAL:
return ("Resource is not valid.\n");
case EPERM:
@@ -121,7 +121,7 @@
return (NULL);
}
-/* this function set rlimit if it shud, w-o overwriting old values. */
+/* this function set rlimit if it should, w-o overwriting old values. */
static int set_limit(s_entry * soft, s_entry * hard, active_h * service,
int ltype, int times)
{
@@ -247,7 +247,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/logfile/initng_logfile.c
==============================================================================
--- initng/plugins/logfile/initng_logfile.c (original)
+++ initng/plugins/logfile/initng_logfile.c Mon Dec 12 18:34:49 2005
@@ -159,7 +159,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/netprobe/initng_netprobe.c
==============================================================================
--- initng/plugins/netprobe/initng_netprobe.c (original)
+++ initng/plugins/netprobe/initng_netprobe.c Mon Dec 12 18:34:49 2005
@@ -131,7 +131,7 @@
{
active_h *current = NULL;
- /* The network provider shud always be stoppable */
+ /* The network provider should always be stoppable */
if (active_db_is(&NETWORK_PROVIDER, service))
return (TRUE);
@@ -201,7 +201,7 @@
S_;
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/ngc2/initng_ngc2.c
==============================================================================
--- initng/plugins/ngc2/initng_ngc2.c (original)
+++ initng/plugins/ngc2/initng_ngc2.c Mon Dec 12 18:34:49 2005
@@ -223,7 +223,7 @@
/* check if command is not using and option, and option is set */
if (tmp_cmd->opt_type == NO_OPT && header_opt_len > 0)
{
- F_("Command %c - %s, dont want an option!\n", header.c, header.l);
+ F_("Command %c - %s, don't want an option!\n", header.c, header.l);
result.c = header.c;
result.t = 0;
result.s = S_NOT_REQUIRES_OPT;
@@ -338,7 +338,7 @@
F_("failed to send all data\n");
/* TODO: really continue?? */
- F_("Invalid command type '%c', ling '%s', option : \"%s\"\n",
+ F_("Invalid command type '%c', line '%s', option : \"%s\"\n",
header.c, header.l, header.o);
return;
}
@@ -483,7 +483,7 @@
{
if (errno != EROFS)
F_("Could not create " SOCKET_ROOTPATH
- " : %s, maby / fs not mounted read-write yet?, will retry until i succeed.\n",
+ " : %s, maby / fs not mounted read-write yet?, will retry until I succeed.\n",
strerror(errno));
return (FALSE);
}
@@ -874,7 +874,7 @@
D_("module_init(ngc2);\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/ngc2/ngc2.c
==============================================================================
--- initng/plugins/ngc2/ngc2.c (original)
+++ initng/plugins/ngc2/ngc2.c Mon Dec 12 18:34:49 2005
@@ -220,7 +220,7 @@
{
printf("Version of initng and version of ngc differs!\n");
printf
- ("this might be a bad thing, that Can in worst case cause problems!\n");
+ ("this might be a bad thing, that can in worst case cause problems!\n");
}
/*printf("got an read: command %c, status %i, type %i\n", result->c,
@@ -486,7 +486,7 @@
exit(1);
}
- printf("Error, shud not got here!\n");
+ printf("Error, should not got here!\n");
exit(22);
}
@@ -514,7 +514,7 @@
if (debug == FALSE && getuid() != 0)
{
- printf("You need root access, to communicate with initng.\n");
+ printf("You need root access to communicate with initng.\n");
exit(2);
}
Modified: initng/plugins/pause/initng_pause.c
==============================================================================
--- initng/plugins/pause/initng_pause.c (original)
+++ initng/plugins/pause/initng_pause.c Mon Dec 12 18:34:49 2005
@@ -33,16 +33,16 @@
#include "initng_pause.h"
s_entry U_U_DELAY = { "start_u_pause", INT, 13, NULL,
- "Pause this mutch microseconds before service is launched."
+ "Pause this much microseconds before service is launched."
};
s_entry U_DELAY = { "start_pause", INT, 11, NULL,
- "Pause this mutch seconds before service is launched."
+ "Pause this much seconds before service is launched."
};
s_entry D_U_DELAY = { "stop_u_pause", INT, 12, NULL,
- "Pause this mutch microseconds before service is acually stopping."
+ "Pause this much microseconds before service is acually stopping."
};
s_entry D_DELAY = { "stop_pause", INT, 10, NULL,
- "Pause this mutch seconds before service is acually stopping."
+ "Pause this much seconds before service is acually stopping."
};
int do_pause(active_h * s, process_h * p)
@@ -89,7 +89,7 @@
/* delay execution a bit */
if ((t = active_db_get_int(&U_U_DELAY, s)) > 0)
{
- D_("Sleeping for %i miliseconds.\n", t);
+ D_("Sleeping for %i milliseconds.\n", t);
usleep(t);
}
else if ((t = active_db_get_int(&U_DELAY, s)) > 0)
@@ -100,7 +100,7 @@
return (TRUE);
}
- F_("Dont know hot to sleep this process type (%s)!\n", s->name);
+ F_("Don't know how to sleep this process type (%s)!\n", s->name);
return (FALSE);
}
@@ -109,7 +109,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
initng_sdt_add(&U_U_DELAY);
Modified: initng/plugins/pidfile/initng_pidfile.c
==============================================================================
--- initng/plugins/pidfile/initng_pidfile.c (original)
+++ initng/plugins/pidfile/initng_pidfile.c Mon Dec 12 18:34:49 2005
@@ -41,7 +41,7 @@
#include "initng_pidfile.h"
-/* The name of the process, initng shud probe */
+/* The name of the process, initng should probe */
s_entry PIDOF = { "pid_of", STRING, 6, &TYPE_DAEMON,
"When daemon exits, initng will look for a process with this name, and set daemon pid no to that pid."
};
@@ -186,7 +186,7 @@
close(fd);
if (len < 1)
{
- F_("Read 0 chars from %s, Its empty.\n", name);
+ F_("Read 0 chars from %s, It's empty.\n", name);
return (-1);
}
@@ -305,7 +305,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/pidfile/test/test_pidfile.c
==============================================================================
--- initng/plugins/pidfile/test/test_pidfile.c (original)
+++ initng/plugins/pidfile/test/test_pidfile.c Mon Dec 12 18:34:49 2005
@@ -23,7 +23,7 @@
(void) argc;
(void) argv;
printf
- ("This is a testing daemon pid %i, that will fork, and leave pid in "
+ ("This is a testing daemon pid %i, that will fork and leave pid in "
PIDFILE ". \n", getpid());
Modified: initng/plugins/provide/initng_provide.c
==============================================================================
--- initng/plugins/provide/initng_provide.c (original)
+++ initng/plugins/provide/initng_provide.c Mon Dec 12 18:34:49 2005
@@ -38,7 +38,7 @@
s_entry PROVIDE = { "provide", STRINGS, 7, STD_OPT,
- "A name of a virtual service, that is created when this service is up."
+ "A name of a virtual service that is created when this service is up."
};
s_command SET_VIRTUAL_UP =
{ 'V', "set_virtual_up", TRUE_OR_FALSE_COMMAND, REQUIRES_OPT,
@@ -146,7 +146,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/reload/initng_reload.c
==============================================================================
--- initng/plugins/reload/initng_reload.c (original)
+++ initng/plugins/reload/initng_reload.c Mon Dec 12 18:34:49 2005
@@ -92,7 +92,7 @@
new_entry->a_state = initng_find_state(entry.state);
if (!new_entry->a_state)
{
- F_("Cound not find a properiate state to set.\n");
+ F_("Could not find a proper state to set.\n");
continue;
}
{
@@ -373,7 +373,7 @@
D_("module_init(reload);\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/renice/initng_renice.c
==============================================================================
--- initng/plugins/renice/initng_renice.c (original)
+++ initng/plugins/renice/initng_renice.c Mon Dec 12 18:34:49 2005
@@ -59,7 +59,7 @@
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
D_("module_init();\n");
Modified: initng/plugins/respawn/initng_respawn.c
==============================================================================
--- initng/plugins/respawn/initng_respawn.c (original)
+++ initng/plugins/respawn/initng_respawn.c Mon Dec 12 18:34:49 2005
@@ -56,7 +56,7 @@
{ "WAIT_FOR_RESPAWN_TIMEOUT", IS_DOWN, &resp_try, NULL };
s_entry RESPAWN_PAUSE = { "respawn_pause", INT, 13, &TYPE_DAEMON,
- "Whait this number of seconds, before respawning."
+ "Wait this number of seconds before respawning."
};
s_entry LAST_RESPAWN = { NULL, INT, 0, NULL, NULL };
@@ -74,21 +74,21 @@
/* check that current status is RUNNING, so it realy died, and not is manually stopped */
if (!IS_MARK(service, &RUNNING))
{
- D_("service %s is gonna be marked STOPPED,\nbut not from status RUNNING, \nits from %s\n\n", service->name, service->a_state->state_name);
+ D_("service %s is going to be marked STOPPED,\nbut not from status RUNNING, \nit's from %s\n\n", service->name, service->a_state->state_name);
return (TRUE);
}
/* make sure the initng is not exiting */
if (g.sys_state == STATE_STOPPING)
{
- D_("System state is stopping, wont respawn anything now.\n");
+ D_("System state is stopping, won't respawn anything now.\n");
return (TRUE);
}
/* check if the service have respawn enabled */
if (!active_db_is(&RESPAWN, service))
{
- D_("Servcice %s dont have RESPAWN flag set, wont respawn!\n");
+ D_("Service %s doesn't have RESPAWN flag set, won't respawn!\n");
return (TRUE);
}
@@ -102,7 +102,7 @@
{
if (g.now - last < MAX_RESPAWN_RATE)
{
- W_("Wont respawn service %s, it was respawned %i seconds ago.\n",
+ W_("Won't respawn service %s, it was respawned %i seconds ago.\n",
service->name, g.now - last);
return (TRUE);
}
@@ -148,7 +148,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/rlparser/initng_rl_parser.c
==============================================================================
--- initng/plugins/rlparser/initng_rl_parser.c (original)
+++ initng/plugins/rlparser/initng_rl_parser.c Mon Dec 12 18:34:49 2005
@@ -72,7 +72,7 @@
/* copy file filename into allocated file_buf */
if (!open_read_close(filetoparse, &w_depends))
{
- D_("parse_file(%s): Cant open config file!\n", filetoparse);
+ D_("parse_file(%s): Can't open config file!\n", filetoparse);
if (n_service->name)
free(n_service->name);
@@ -126,7 +126,7 @@
D_("initng_rl_parser: module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/simple_launcher/initng_simple_launcher.c
==============================================================================
--- initng/plugins/simple_launcher/initng_simple_launcher.c (original)
+++ initng/plugins/simple_launcher/initng_simple_launcher.c Mon Dec 12 18:34:49 2005
@@ -108,7 +108,7 @@
/* get the env-path variable */
PATH = i_strdup(getenv("PATH"));
- D_("initng_s_launch: %s is not absolute path, searching $PATH\n", exec);
+ D_("initng_s_launch: %s is not an absolute path, searching $PATH\n", exec);
/* Make sure we got a path */
if (!PATH)
@@ -155,7 +155,7 @@
/* make sure we got a filename to use */
if (!filename)
- F_("No executeable found\n");
+ F_("No executable found\n");
/* return the filename */
return filename;
@@ -315,7 +315,7 @@
/* Will never get here if execve succeeded */
F_("EEEEEEEEEEEEEEEEEEERRRRRRRRRRRRRRRRRRRRRRRRRRROOOOOOOOOOOOOOOOOOOOOOOOOORRRRRRRRRRRRRRR!!!!!!!!!\n");
- F_("Cant execute source %s!\n", argv[0]);
+ F_("Can't execute source %s!\n", argv[0]);
_exit(1);
}
@@ -341,7 +341,7 @@
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/splash/initng_splash.c
==============================================================================
--- initng/plugins/splash/initng_splash.c (original)
+++ initng/plugins/splash/initng_splash.c Mon Dec 12 18:34:49 2005
@@ -301,7 +301,7 @@
if (state == STATE_UP)
{
if (!start_new_service_named("system/splash/stop"))
- F_("Splash stoppr \"system/splash/stop\" could not be executed!\n");
+ F_("Splash stopper \"system/splash/stop\" could not be executed!\n");
}
else if (state == STATE_STOPPING && !shutting_down)
{
@@ -380,7 +380,7 @@
D_("splash: module_load();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
initng_add_hook(ASTATUS_CHANGE, 80, &print_progress);
Modified: initng/plugins/stcmd/initng_stcmd.c
==============================================================================
--- initng/plugins/stcmd/initng_stcmd.c (original)
+++ initng/plugins/stcmd/initng_stcmd.c Mon Dec 12 18:34:49 2005
@@ -186,7 +186,7 @@
s_command NEW_INIT = { 'e', "new_init", TRUE_OR_FALSE_COMMAND, REQUIRES_OPT,
{(void *) &cmd_new_init},
- "Stops all services, and when its done, launcing a new init."
+ "Stops all services, and when its done, launching a new init."
};
#ifdef DEBUG
@@ -553,7 +553,7 @@
}
- fprintf(fd, "The the services that depends on \"%s\":\n", on->name);
+ fprintf(fd, "The services that depends on \"%s\":\n", on->name);
while_active_db(current)
{
@@ -665,7 +665,7 @@
D_("module_init(stcmd);\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/stdout/initng_stdout.c
==============================================================================
--- initng/plugins/stdout/initng_stdout.c (original)
+++ initng/plugins/stdout/initng_stdout.c Mon Dec 12 18:34:49 2005
@@ -80,7 +80,7 @@
if (!(s_stdout || s_stderr || s_stdall || s_stdin))
{
- D_("This plugin wont do anything, becouse no opt set!\n");
+ D_("This plugin won't do anything, because no opt set!\n");
return (TRUE);
}
@@ -165,7 +165,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/suid/initng_suid.c
==============================================================================
--- initng/plugins/suid/initng_suid.c (original)
+++ initng/plugins/suid/initng_suid.c Mon Dec 12 18:34:49 2005
@@ -80,7 +80,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/syncron/initng_syncron.c
==============================================================================
--- initng/plugins/syncron/initng_syncron.c (original)
+++ initng/plugins/syncron/initng_syncron.c Mon Dec 12 18:34:49 2005
@@ -34,7 +34,7 @@
#include "initng_syncron.h"
s_entry SYNCRON = { "syncron", STRING, 7, NULL,
- "All services with this same syncron string, cant be started asyncronicly."
+ "All services with this same syncron string, can't be started asyncronous."
};
static int check;
@@ -112,7 +112,7 @@
D_("module_init();\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
initng_sdt_add(&SYNCRON);
Modified: initng/plugins/syslog/initng_syslog.c
==============================================================================
--- initng/plugins/syslog/initng_syslog.c (original)
+++ initng/plugins/syslog/initng_syslog.c Mon Dec 12 18:34:49 2005
@@ -299,14 +299,14 @@
{
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
/* Dont clutter syslog in fake mode */
if (getpid() != 1 || !g.i_am_init)
{
- W_("Pid is not 1, (%i), or g.i_am_init not set and the syslog plugin wont load when running in fake mode, to prevent clutter up the log-files.\n", getpid());
+ W_("Pid is not 1, (%i), or g.i_am_init not set and the syslog plugin won't load when running in fake mode, to prevent cluttering up the log-files.\n", getpid());
return (TRUE);
}
D_("Initziating syslog plugin\n");
@@ -331,7 +331,7 @@
/* Dont clutter syslog in fake mode */
if (!g.i_am_init)
{
- D_("The syslog plugin wont load when running in fake mode, to prevent clutter up the log-files.\n");
+ D_("The syslog plugin won't load when running in fake mode, to prevent cluttering up the log-files.\n");
return;
}
Modified: initng/plugins/unneeded/initng_unneeded.c
==============================================================================
--- initng/plugins/unneeded/initng_unneeded.c (original)
+++ initng/plugins/unneeded/initng_unneeded.c Mon Dec 12 18:34:49 2005
@@ -111,7 +111,7 @@
D_("module_init(unneeded);\n");
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
Modified: initng/plugins/usplash/initng_usplash.c
==============================================================================
--- initng/plugins/usplash/initng_usplash.c (original)
+++ initng/plugins/usplash/initng_usplash.c Mon Dec 12 18:34:49 2005
@@ -107,7 +107,7 @@
last_percent = 0;
if (strcmp(version, INITNG_VERSION) != 0)
{
- F_("This module, is compiled for \"%s\" version, and initng is compiled on \"%s\" version, wont load this module!\n", INITNG_VERSION, version);
+ F_("This module is compiled for \"%s\" version and initng is compiled on \"%s\" version, won't load this module!\n", INITNG_VERSION, version);
return (FALSE);
}
initng_add_hook(ASTATUS_CHANGE, 80, &print_output);
Modified: initng/src/initng_active_db.c
==============================================================================
--- initng/src/initng_active_db.c (original)
+++ initng/src/initng_active_db.c Mon Dec 12 18:34:49 2005
@@ -205,7 +205,7 @@
/* Look for duplicate */
if ((current = active_db_find_by_name(add_this->name)))
{
- /* TODO, shud add_this bee freed? */
+ /* TODO, should add_this bee freed? */
W_("active_db_add(%s): duplicate here\n", add_this->name);
return (FALSE);
}
@@ -246,7 +246,7 @@
new_active->time_got_status = time(0);
new_active->uptime = new_active->time_got_status;
- new_active->a_state = NULL; /* a_state shud be NULL to mark an emtpy service */
+ new_active->a_state = NULL; /* a_state should be NULL to mark an emtpy service */
new_active->from_service = NULL;
@@ -343,7 +343,7 @@
* A deeper deepfind.
* Logic, we wanna make sure that depend check in a deeper level.
* if daemon/smbd -> daemon/samba -> system/checkroot -> system/initial.
- * So shud active_db_dep_on_deep(daemon/smbd, system/initial) == TRUE
+ * So should active_db_dep_on_deep(daemon/smbd, system/initial) == TRUE
*
* Sumary, does service depends on check?
*/
Modified: initng/src/initng_active_db.h
==============================================================================
--- initng/src/initng_active_db.h (original)
+++ initng/src/initng_active_db.h Mon Dec 12 18:34:49 2005
@@ -94,7 +94,7 @@
int active_db_percent_started(void);
int active_db_percent_stopped(void);
-/* get/set data handeling */
+/* get/set data handling */
#define active_db_get_int(t,a) active_db_get_int_var(t, NULL, a)
#define active_db_get_string(t,a) active_db_get_string_var(t, NULL, a)
#define active_db_get_next_string(t,a,l) active_db_get_next_string_var(t,NULL, a, l)
Modified: initng/src/initng_active_state.c
==============================================================================
--- initng/src/initng_active_state.c (original)
+++ initng/src/initng_active_state.c Mon Dec 12 18:34:49 2005
@@ -32,7 +32,7 @@
/* look for duplets */
if (initng_find_state(state->state_name) != NULL)
{
- F_("There exits a state with this state_name alredy, please check this!\n");
+ F_("There exists a state with this state_name already, please check this!\n");
return (FALSE);
}
Modified: initng/src/initng_common.c
==============================================================================
--- initng/src/initng_common.c (original)
+++ initng/src/initng_common.c Mon Dec 12 18:34:49 2005
@@ -91,7 +91,7 @@
/* Make sure there isn't any process with this name running */
if ((a_new = active_db_find_by_name(service_name)))
{
- F_("load_to_active(%s): Service with same name %s exits! \n",
+ F_("load_to_active(%s): Service with same name %s exists! \n",
service_name);
return (NULL);
}
@@ -143,7 +143,7 @@
if (active_db_dep_on_deep(a_new, current)
&& active_db_dep_on_deep(current, a_new))
{
- F_("load_to_active(%s): not loading service %s, cause it has a circular dependency with %s\n", service_name, a_new->name, current->name);
+ F_("load_to_active(%s): not loading service %s, because it has a circular dependency on %s\n", service_name, a_new->name, current->name);
active_db_free(a_new);
return NULL;
}
@@ -212,7 +212,7 @@
/*
* if service->name is "samba", and service->from_service->name is "daemon/samba"
* we have to update service->name.
- * also notice that service->name shud not exactly match service->from_service->name,
+ * also notice that service->name should not exactly match service->from_service->name,
* service->name might be "eth0" and service->from_service->name might be "net / *".
*/
@@ -371,7 +371,7 @@
/* make sure there is a state to set */
if (!state)
{
- F_("Cant set an empty state!\n");
+ F_("Can't set an empty state!\n");
return (FALSE);
}
Modified: initng/src/initng_control_command.c
==============================================================================
--- initng/src/initng_control_command.c (original)
+++ initng/src/initng_control_command.c Mon Dec 12 18:34:49 2005
@@ -40,7 +40,7 @@
{
if (current == cmd || current->command_id == cmd->command_id)
{
- F_("Cant add command: %c, %s, it exists alredy!\n",
+ F_("Can't add command: %c, %s, it exists already!\n",
current->command_id, current->description);
return (FALSE);
}
Modified: initng/src/initng_env_variable.c
==============================================================================
--- initng/src/initng_env_variable.c (original)
+++ initng/src/initng_env_variable.c Mon Dec 12 18:34:49 2005
@@ -399,7 +399,7 @@
}
default:
{
- D_("Dont know how to set a variable with %s:%i\n",
+ D_("Don't know how to set a variable with %s:%i\n",
entry->opt_name, entry->opt_type);
break;
}
Modified: initng/src/initng_execute.c
==============================================================================
--- initng/src/initng_execute.c (original)
+++ initng/src/initng_execute.c Mon Dec 12 18:34:49 2005
@@ -58,7 +58,7 @@
{
if (process->pt == type)
{
- F_("service %s, there exists a %i process allredy!\n",
+ F_("service %s, there exists a %i process already!\n",
service->name, type);
return (FAIL);
}
Modified: initng/src/initng_fd.c
==============================================================================
--- initng/src/initng_fd.c (original)
+++ initng/src/initng_fd.c Mon Dec 12 18:34:49 2005
@@ -101,7 +101,7 @@
/* can max read MAX_BUFFER (once allocated) - len (all currently read) - buffer_pos */
if ((MAX_BUFFER - len - p->buffer_pos) < 1)
{
- F_("Cant read more, buffer is out!\n");
+ F_("Can't read more, buffer is out!\n");
break;
}
len +=
Modified: initng/src/initng_fork.c
==============================================================================
--- initng/src/initng_fork.c (original)
+++ initng/src/initng_fork.c Mon Dec 12 18:34:49 2005
@@ -105,10 +105,10 @@
/*
* set up filedescriptors, for local fork,
- * a fork in initng, shud now rescive any input, but stdout & stderr, shud be sent
+ * a fork in initng, should now rescive any input, but stdout & stderr, should be sent
* to process->out_pipe[], that is set up by pipe() #man 2 pipe
* [0] for reading, and [1] for writing, as the pipe is for sending output
- * FROM the fork, to initng for handle, the input part shud be closed here,
+ * FROM the fork, to initng for handle, the input part should be closed here,
* the other are maped to STDOUT and STDERR.
*/
@@ -121,7 +121,7 @@
dup2(process->out_pipe[1], STDOUT_FILENO);
dup2(process->out_pipe[1], STDERR_FILENO);
- /* set stdin, stdout, and stderr, that is shud not be closed, if this child do execve() */
+ /* set stdin, stdout, and stderr, that is should not be closed, if this child do execve() */
fcntl(STDIN_FILENO, F_SETFD, 0);
fcntl(STDOUT_FILENO, F_SETFD, 0);
fcntl(STDERR_FILENO, F_SETFD, 0);
Modified: initng/src/initng_handler.c
==============================================================================
--- initng/src/initng_handler.c (original)
+++ initng/src/initng_handler.c Mon Dec 12 18:34:49 2005
@@ -110,7 +110,7 @@
continue;
}
- D_("Service %s has been STOPPING for %i, and its more then %i seconds\n", to_term->name, (time(0) - to_term->time_got_status), timeout);
+ D_("Service %s has been STOPPING for %i, and it's more then %i seconds\n", to_term->name, (time(0) - to_term->time_got_status), timeout);
/* ok, no go TERM all running processes */
process = safe = NULL;
@@ -176,7 +176,7 @@
/* check system state, if we can launch. */
if (g.sys_state != STATE_STARTING && g.sys_state != STATE_UP)
{
- F_("Cant start service %s, when system status is: %i !\n", service_to_start->name, g.sys_state);
+ F_("Can't start service %s, when system status is: %i !\n", service_to_start->name, g.sys_state);
return (FALSE);
}
@@ -184,21 +184,21 @@
if (!IS_MARK(service_to_start, &LOADING)
&& (IS_STARTING(service_to_start) || IS_WAITING(service_to_start)))
{
- D_("service %s is starting allredy.\n", service_to_start->name);
+ D_("service %s is starting already.\n", service_to_start->name);
return (TRUE);
}
/* it might alredy be up */
if (IS_UP(service_to_start))
{
- D_("service %s is alredy up!\n", service_to_start->name);
+ D_("service %s is already up!\n", service_to_start->name);
return (TRUE);
}
/* make sure state is in the states, that we can start */
if (!IS_MARK(service_to_start, &LOADING) && !IS_DOWN(service_to_start))
{
- W_("cant set a service with status %i:%s, to start\n",
+ W_("Can't set a service with status %i:%s, to start\n",
service_to_start->a_state, service_to_start->a_state->state_name);
return (FALSE);
}
@@ -235,7 +235,7 @@
if (!service_to_stop->a_state)
{
- F_("A status is not set, so i cant stop_service %s\n", service_to_stop->name);
+ F_("A status is not set, so i can't stop_service %s\n", service_to_stop->name);
return (FALSE);
}
@@ -254,7 +254,7 @@
if (IS_STARTING(service_to_stop))
{
- F_("Service %s is starting, cant stop it!\n", service_to_stop->name);
+ F_("Service %s is starting, can't stop it!\n", service_to_stop->name);
/*mark_service(service_to_stop, &STOPPED); */
return (FALSE);
}
@@ -314,7 +314,7 @@
if ((to_load = active_db_find_by_name(service)))
{
- D_("Service %s exits alredy!\n", to_load->name);
+ D_("Service %s exits already!\n", to_load->name);
return (to_load);
}
@@ -329,7 +329,7 @@
/* IF service alredy got a state, its no good */
if (to_load->a_state)
{
- D_("Initial service alredy got a state!\n");
+ D_("Initial service already got a state!\n");
return (NULL);
}
Modified: initng/src/initng_kill_handler.c
==============================================================================
--- initng/src/initng_kill_handler.c (original)
+++ initng/src/initng_kill_handler.c Mon Dec 12 18:34:49 2005
@@ -73,7 +73,7 @@
/* check service state */
if (!service->a_state)
{
- W_("Sertive has no state!\n");
+ W_("Service has no state!\n");
return;
}
Modified: initng/src/initng_main.c
==============================================================================
--- initng/src/initng_main.c (original)
+++ initng/src/initng_main.c Mon Dec 12 18:34:49 2005
@@ -97,7 +97,7 @@
restart_initng();
break;
case THEN_NEW_INIT:
- P_(" ** Launtching new init\n");
+ P_(" ** Launching new init\n");
new_init();
break;
case THEN_REBOOT:
@@ -338,7 +338,7 @@
printf("Launching /sbin/initng-segfault, this is pid: %i\n", getpid());
if (execve("/sbin/initng-segfault", argv, environ) == -1)
{
- printf("/sbin/initng-segfault did not exsist, will die!\n");
+ printf("/sbin/initng-segfault did not exist, will die!\n");
}
_exit(99);
}
Modified: initng/src/initng_process_db.h
==============================================================================
--- initng/src/initng_process_db.h (original)
+++ initng/src/initng_process_db.h Mon Dec 12 18:34:49 2005
@@ -49,7 +49,7 @@
char *buffer; /* stdout buffer */
int buffer_pos; /* Our current position in the buffer */
- struct list_head list; /* this process shud be in a list */
+ struct list_head list; /* this process should be in a list */
};
struct t_ptype_h
Modified: initng/src/initng_service_cache.c
==============================================================================
--- initng/src/initng_service_cache.c (original)
+++ initng/src/initng_service_cache.c Mon Dec 12 18:34:49 2005
@@ -81,7 +81,7 @@
new_serv = (service_h *) initng_calloc(1, sizeof(service_h));
if (!new_serv)
{
- F_("Cound not allocate space, for new copy of service!\n");
+ F_("Could not allocate space, for new copy of service!\n");
return (NULL);
}
Modified: initng/src/initng_service_data_types.c
==============================================================================
--- initng/src/initng_service_data_types.c (original)
+++ initng/src/initng_service_data_types.c Mon Dec 12 18:34:49 2005
@@ -47,9 +47,9 @@
if (current == ent)
{
if (ent->opt_name)
- F_("Option %s, alredy added!\n", ent->opt_name);
+ F_("Option %s, already added!\n", ent->opt_name);
else
- F_("Option, alredy added!\n");
+ F_("Option, already added!\n");
return;
}
Modified: initng/src/initng_static_data_id.c
==============================================================================
--- initng/src/initng_static_data_id.c (original)
+++ initng/src/initng_static_data_id.c Mon Dec 12 18:34:49 2005
@@ -49,7 +49,7 @@
};
/*
- * add some default options, that is needed by core, and shud
+ * add some default options, that is needed by core, and should
* be in option_db by default.
* This function is called, from main(), initziation.
*/
Modified: initng/src/initng_static_states.c
==============================================================================
--- initng/src/initng_static_states.c (original)
+++ initng/src/initng_static_states.c Mon Dec 12 18:34:49 2005
@@ -164,7 +164,7 @@
if (g.sys_state != STATE_STARTING && g.sys_state != STATE_UP)
{
- F_("Cant start service, when system status is: %i !\n", g.sys_state);
+ F_("Can't start service, when system status is: %i !\n", g.sys_state);
return;
}
@@ -429,7 +429,7 @@
/* make sure we got a process */
if (!process)
{
- F_("Service dont have any processes, dont know how to kill then.\n");
+ F_("Service doesn't have any processes, don't know how to kill then.\n");
return;
}
Modified: initng/src/initng_struct_data.c
==============================================================================
--- initng/src/initng_struct_data.c (original)
+++ initng/src/initng_struct_data.c Mon Dec 12 18:34:49 2005
@@ -76,7 +76,7 @@
if (!IT(STRING))
{
- F_("Cand only fetch a type, that is a STRING\n");
+ F_("Can only fetch a type, that is a STRING\n");
return (NULL);
}
@@ -116,7 +116,7 @@
if (!IT(INT))
{
- F_("Cand only fetch a type, that is a INT!\n");
+ F_("Can only fetch a type, that is a INT!\n");
return (0);
}
@@ -155,7 +155,7 @@
if (!IT(STRINGS))
{
- F_("Cand only fetch a type, that is a STRINGS!\n");
+ F_("Can only fetch a type, that is a STRINGS!\n");
return (NULL);
}
@@ -201,7 +201,7 @@
if (!type)
{
- F_("Type cant be zero!\n");
+ F_("Type can't be zero!\n");
return;
}
@@ -256,7 +256,7 @@
if (!type)
{
- F_("Type cant be zero!\n");
+ F_("Type can't be zero!\n");
return;
}
@@ -292,7 +292,7 @@
if (!type)
{
- F_("Type cant be zero!\n");
+ F_("Type can't be zero!\n");
return;
}
@@ -389,7 +389,7 @@
if (!type)
{
- F_("Type cant be zero!\n");
+ F_("Type can't be zero!\n");
return;
}
@@ -463,7 +463,7 @@
if (!type)
{
- F_("Type cant be zero!\n");
+ F_("Type can't be zero!\n");
return;
}
@@ -524,7 +524,7 @@
list_for_each_entry(current, from, list)
{
/* make sure type is set
- TODO, shud this be an assert(current->type) ??? */
+ TODO, should this be an assert(current->type) ??? */
if (!current->type)
continue;
Modified: initng/src/main.c
==============================================================================
--- initng/src/main.c (original)
+++ initng/src/main.c Mon Dec 12 18:34:49 2005
@@ -258,7 +258,7 @@
*/
if ((g.now - last) >= 3600 || (g.now - last) < 0)
{
- D_(" Clock squrew, time have changed over on hour, in one mainloop, compensating 3600 seconds.\n");
+ D_(" Clock skew, time have changed over one hour, in one mainloop, compensating 3600 seconds.\n");
active_db_compensate_time(g.now - last);
initng_compensate_time_call(g.now - last);
last += (g.now - last);
@@ -309,7 +309,7 @@
D_("I got a keyboard request!\n");
initng_signal_got_keyboard_request = FALSE;
if (!start_new_service_named("kbreq"))
- F_("keyboard requres service \"kbreq\", could not be launched.\n");
+ F_("keyboard requires service \"kbreq\", could not be launched.\n");
}
@@ -343,7 +343,7 @@
continue;
/*
- * After here i put things that shud be done every main
+ * After here i put things that should be done every main
* loop, g.interrupt or not ...
*/
Modified: initng/test/test_initng_load_module.c
==============================================================================
--- initng/test/test_initng_load_module.c (original)
+++ initng/test/test_initng_load_module.c Mon Dec 12 18:34:49 2005
@@ -124,7 +124,7 @@
print_modules();
CU_ASSERT(m != NULL);
- /* search the db, with only one entry, it shud not be hard to find */
+ /* search the db, with only one entry, it should not be hard to find */
current = NULL;
while_module_db(current)
{
Modified: initng/tools/install_service.c
==============================================================================
--- initng/tools/install_service.c (original)
+++ initng/tools/install_service.c Mon Dec 12 18:34:49 2005
@@ -783,7 +783,7 @@
/* set to true, if we are processing any block */
int if_block_processed = 0;
- /* shud line reading, be printed directly to outfile?? */
+ /* should line reading, be printed directly to outfile?? */
int if_block_print_out = 0;
/*
More information about the Initng-svn
mailing list