diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
| commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
| tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /debianutils | |
| parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
| parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
| download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip | |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/mktemp.c | 1 | ||||
| -rw-r--r-- | debianutils/run_parts.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index f4961af59..007cb1c5b 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n" | 37 | //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n" |
| 38 | //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" | 38 | //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" |
| 39 | //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" | 39 | //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" |
| 40 | //usage: "\nOptions:" | ||
| 41 | //usage: "\n -d Make directory, not file" | 40 | //usage: "\n -d Make directory, not file" |
| 42 | ////usage: "\n -q Fail silently on errors" - we ignore this opt | 41 | ////usage: "\n -q Fail silently on errors" - we ignore this opt |
| 43 | //usage: "\n -t Prepend base directory name to TEMPLATE" | 42 | //usage: "\n -t Prepend base directory name to TEMPLATE" |
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c index 0c2302696..65cbfc338 100644 --- a/debianutils/run_parts.c +++ b/debianutils/run_parts.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | //usage: "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY" | 34 | //usage: "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY" |
| 35 | //usage:#define run_parts_full_usage "\n\n" | 35 | //usage:#define run_parts_full_usage "\n\n" |
| 36 | //usage: "Run a bunch of scripts in DIRECTORY\n" | 36 | //usage: "Run a bunch of scripts in DIRECTORY\n" |
| 37 | //usage: "\nOptions:" | ||
| 38 | //usage: "\n -t Print what would be run, but don't actually run anything" | 37 | //usage: "\n -t Print what would be run, but don't actually run anything" |
| 39 | //usage: "\n -a ARG Pass ARG as argument for every program" | 38 | //usage: "\n -a ARG Pass ARG as argument for every program" |
| 40 | //usage: "\n -u MASK Set the umask to MASK before running every program" | 39 | //usage: "\n -u MASK Set the umask to MASK before running every program" |