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

This commit is contained in:
Christian Ruppert 2011-07-05 00:51:29 +02:00
parent 49f1a8702b
commit 003d4ba15b

View File

@ -1333,12 +1333,6 @@ runscript(int argc, char **argv)
prefix = NULL; prefix = NULL;
retval = svc_exec("status", NULL); retval = svc_exec("status", NULL);
} else { } else {
if (strcmp(optarg, "pause") == 0) {
ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
deps = false;
optarg = "stop";
}
if (strcmp(optarg, "conditionalrestart") == 0 || if (strcmp(optarg, "conditionalrestart") == 0 ||
strcmp(optarg, "condrestart") == 0) strcmp(optarg, "condrestart") == 0)
{ {
@ -1349,7 +1343,11 @@ runscript(int argc, char **argv)
svc_restart(); svc_restart();
} else if (strcmp(optarg, "start") == 0) { } else if (strcmp(optarg, "start") == 0) {
svc_start(); 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) if (deps && in_background)
get_started_services(); get_started_services();
svc_stop(); svc_stop();