diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-22 00:47:18 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-06-22 00:47:18 +0200 |
commit | fbb12ddc6a53ad97ff6bcc7ed9b253c09001ad2f (patch) | |
tree | 94c82f9eac30c86a1ec4f4d06f6c17b72b47cf3e /include | |
parent | b6bca7703bbe6aacec0bda964c82fad389a02b69 (diff) | |
download | busybox-w32-1_14_2.tar.gz busybox-w32-1_14_2.tar.bz2 busybox-w32-1_14_2.zip |
post 1.14.1 fixes; bump version to 1.14.21_14_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 2 | ||||
-rw-r--r-- | include/usage.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2868eba03..bedf659b7 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1099,6 +1099,8 @@ const char *get_signame(int number) FAST_FUNC; | |||
1099 | void print_signames(void) FAST_FUNC; | 1099 | void print_signames(void) FAST_FUNC; |
1100 | 1100 | ||
1101 | char *bb_simplify_path(const char *path) FAST_FUNC; | 1101 | char *bb_simplify_path(const char *path) FAST_FUNC; |
1102 | /* Returns ptr to NUL */ | ||
1103 | char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC; | ||
1102 | 1104 | ||
1103 | #define FAIL_DELAY 3 | 1105 | #define FAIL_DELAY 3 |
1104 | extern void bb_do_delay(int seconds) FAST_FUNC; | 1106 | extern void bb_do_delay(int seconds) FAST_FUNC; |
diff --git a/include/usage.h b/include/usage.h index d3bf7849e..bfacc5611 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -3404,12 +3404,15 @@ | |||
3404 | "files do not block on disk I/O" | 3404 | "files do not block on disk I/O" |
3405 | 3405 | ||
3406 | #define readlink_trivial_usage \ | 3406 | #define readlink_trivial_usage \ |
3407 | USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE" | 3407 | USE_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE" |
3408 | #define readlink_full_usage "\n\n" \ | 3408 | #define readlink_full_usage "\n\n" \ |
3409 | "Display the value of a symlink" \ | 3409 | "Display the value of a symlink" \ |
3410 | USE_FEATURE_READLINK_FOLLOW( "\n" \ | 3410 | USE_FEATURE_READLINK_FOLLOW( "\n" \ |
3411 | "\nOptions:" \ | 3411 | "\nOptions:" \ |
3412 | "\n -f Canonicalize by following all symlinks") \ | 3412 | "\n -f Canonicalize by following all symlinks" \ |
3413 | "\n -n Don't add newline" \ | ||
3414 | "\n -v Verbose" \ | ||
3415 | ) \ | ||
3413 | 3416 | ||
3414 | #define readprofile_trivial_usage \ | 3417 | #define readprofile_trivial_usage \ |
3415 | "[OPTIONS]..." | 3418 | "[OPTIONS]..." |