aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-09-26 10:46:44 +0000
committerRoy Marples <roy@marples.name>2007-09-26 10:46:44 +0000
commit1d0b234e942bbd5572585abf2b156e9991057cd4 (patch)
tree40c2efafc9a0e5c66e2966d86325ce56262ec3e2
parent46af0c7ddbf5e346e2895494796262c915917028 (diff)
Fix Makefile for pmake, document s-s-d options and increase usage gap
-rw-r--r--src/Makefile2
-rw-r--r--src/_usage.c2
-rw-r--r--src/start-stop-daemon.c40
3 files changed, 22 insertions, 22 deletions
diff --git a/src/Makefile b/src/Makefile
index 251db00e..04fef6e5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -84,7 +84,7 @@ RC_SBINLINKS = mark_service_starting mark_service_inactive \
rc-abort
BINLINKS = rc-status
SBINLINKS = env-update rc-update runscript start-stop-daemon
-ALL_LINKS = $(sort $(BINLINKS) $(SBINLINKS) $(RC_BINLINKS) $(RC_SBINLINKS))
+ALL_LINKS = $(BINLINKS) $(SBINLINKS) $(RC_BINLINKS) $(RC_SBINLINKS)
# We also define _BSD_SOURCE so both Linux and the BSDs get a few
# handy functions which makes our lives a lot easier
diff --git a/src/_usage.c b/src/_usage.c
index be757dff..5d693381 100644
--- a/src/_usage.c
+++ b/src/_usage.c
@@ -20,7 +20,7 @@ static void usage (int exit_status)
for (i = 0; longopts[i].name; ++i) {
int len = printf (" -%c, --%s %s", longopts[i].val, longopts[i].name,
has_arg[longopts[i].has_arg]);
- while (++len < 25)
+ while (++len < 30)
printf (" ");
puts (longopts_help[i]);
}
diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c
index 89d03a2f..6916aafc 100644
--- a/src/start-stop-daemon.c
+++ b/src/start-stop-daemon.c
@@ -487,26 +487,26 @@ static struct option longopts[] = {
{ NULL, 0, NULL, 0}
};
static const char * const longopts_help[] = {
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
+ "Stop daemon",
+ "Set a nicelevel when starting",
+ "Retry schedule to use when stopping",
+ "Start daemon",
+ "deprecated, use --exec",
+ "Force daemon to background",
+ "deprecated, use --user",
+ "Change the PWD",
+ "Change the process group",
+ "Create a pidfile",
+ "Match process name",
+ "deprecated",
+ "Match pid found in this file",
+ "Send a different signal",
+ "Test actions, don't do them",
+ "Change the process user",
+ "Chroot to this directory",
+ "Binary to start/stop",
+ "Redirect stdout to file",
+ "Redirect stderr to file",
longopts_help_COMMON
};
#include "_usage.c"