aboutsummaryrefslogtreecommitdiff
path: root/src/cmdline.opt
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2016-02-24 13:07:28 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2016-02-24 13:07:28 +0200
commit4049c8b3ba918949106ef8e96ac5e767f4b9406b (patch)
treefa531f5217f88fb344fc409d5ad3be410e45d9b3 /src/cmdline.opt
parent59e25f1ffcdf5bd4f6b8d9da92718f82bcc259b1 (diff)
downloadpies-4049c8b3ba918949106ef8e96ac5e767f4b9406b.tar.gz
pies-4049c8b3ba918949106ef8e96ac5e767f4b9406b.tar.bz2
Cleanup initialization code
* src/cmdline.opt (parse_options): Change signature. Handle sysvinit case. * src/pies.c (set_conf_file_names): Handle sysvinit case. (main): Move some parts of sysvinit-specific initialization to set_conf_file_names.
Diffstat (limited to 'src/cmdline.opt')
-rw-r--r--src/cmdline.opt18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/cmdline.opt b/src/cmdline.opt
index 389cea7..7d6f7d4 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -208,7 +208,21 @@ END
OPTIONS_END
void
-parse_options(int argc, char *argv[], int *index)
+parse_options (int *pargc, char ***pargv)
{
- GETOPT(argc, argv, *index)
+ int argc = *pargc;
+ char **argv = *pargv;
+ int index;
+
+ if (init_process)
+ {
+ sysvinit_parse_argv (argc, argv);
+ index = argc;
+ }
+ else
+ {
+ GETOPT(argc, argv, index);
+ }
+ *pargc -= index;
+ *pargv += index;
}

Return to:

Send suggestions and report system problems to the System administrator.