[Pkg-wmaker-commits] [wmppp.app] 88/120: wmppp.app: Command line options take precedence over configuration files.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmppp.app.

commit a62c4586cdab0aa8686b036a3fdd0f4c0aadb319
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue May 19 22:31:10 2015 -0500

    wmppp.app: Command line options take precedence over configuration files.
    
    Since we now reread the configuration files on occasion, the options given
    at the command line could be overwritten.  To avoid this, we save the
    command line options and always use them if present.
---
 wmppp.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/wmppp.c b/wmppp.c
index 975a995..15323e6 100644
--- a/wmppp.c
+++ b/wmppp.c
@@ -270,6 +270,12 @@ char	*speed_action = NULL;
 char	*ifdown_action = NULL;
 char    *stamp_file = NULL;
 
+char	*start_action_cmdline = NULL;
+char	*stop_action_cmdline = NULL;
+char	*speed_action_cmdline = NULL;
+char	*ifdown_action_cmdline = NULL;
+char	*stamp_file_cmdline = NULL;
+
   /**********************/
  /* Parse Command Line */
 /**********************/
@@ -303,7 +309,7 @@ int parse_cmdline(int argc, char *argv[]) {
 				if (!strcmp(arg+1, "i"))
 					active_interface = argv[++i];
 				else if (!strcmp(arg+1, "ifdown"))
-					ifdown_action = argv[++i];
+					ifdown_action_cmdline = argv[++i];
 				else {
 					usage();
 					exit(1);
@@ -311,13 +317,13 @@ int parse_cmdline(int argc, char *argv[]) {
 				break;
 			case 's' :
 				if (!strcmp(arg+1, "speed"))
-					speed_action = argv[++i];
+					speed_action_cmdline = argv[++i];
 				else if (!strcmp(arg+1, "start"))
-					start_action = argv[++i];
+					start_action_cmdline = argv[++i];
 				else if (!strcmp(arg+1, "stop"))
-					stop_action = argv[++i];
+					stop_action_cmdline = argv[++i];
 				else if (!strcmp(arg+1, "stampfile"))
-					stamp_file = argv[++i];
+					stamp_file_cmdline = argv[++i];
 				else {
 					usage();
 					exit(1);
@@ -386,6 +392,18 @@ void reread(int signal) {
 	strcpy(temp, "/etc/wmppprc.fixed");
 	parse_rcfile(temp, wmppp_keys);
 
+	/* command line options take precedence */
+	if (start_action_cmdline)
+		strcpy(start_action, start_action_cmdline);
+	if (stop_action_cmdline)
+		strcpy(stop_action, stop_action_cmdline);
+	if (speed_action_cmdline)
+		strcpy(speed_action, speed_action_cmdline);
+	if (ifdown_action_cmdline)
+		strcpy(ifdown_action, ifdown_action_cmdline);
+	if (stamp_file_cmdline)
+		strcpy(stamp_file, stamp_file_cmdline);
+
 }
 
   /********/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmppp.app.git