[gentoo-commits] proj/openrc:master commit in: src/rc/

[Christian Ruppert]

commit:     003d4ba15be5f43eb868cf89e8c8c7db46e9dc94
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 22:51:29 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 22:51:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=003d4ba1

Don't write into optarg, this also fixes a compiler warning.

---
 src/rc/runscript.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index a6a8d0e..f62e8dc 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -1333,12 +1333,6 @@ runscript(int argc, char **argv)
 			prefix = NULL;
 			retval = svc_exec("status", NULL);
 		} else {
-			if (strcmp(optarg, "pause") == 0) {
-				ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
-				deps = false;
-				optarg = "stop";
-			}
-
 			if (strcmp(optarg, "conditionalrestart") == 0 ||
 			    strcmp(optarg, "condrestart") == 0)
 			{
@@ -1349,7 +1343,11 @@ runscript(int argc, char **argv)
 				svc_restart();
 			} else if (strcmp(optarg, "start") == 0) {
 				svc_start();
-			} else if (strcmp(optarg, "stop") == 0) {
+			} else if (strcmp(optarg, "stop") == 0 || strcmp(optarg, "pause") == 0) {
+				if (strcmp(optarg, "pause") == 0) {
+					ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
+					deps = false;
+				}
 				if (deps && in_background)
 					get_started_services();
 				svc_stop();