summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenys Vlasenko2009-06-22 00:47:18 +0200
committerDenys Vlasenko2009-06-22 00:47:18 +0200
commitfbb12ddc6a53ad97ff6bcc7ed9b253c09001ad2f (patch)
tree94c82f9eac30c86a1ec4f4d06f6c17b72b47cf3e /include
parentb6bca7703bbe6aacec0bda964c82fad389a02b69 (diff)
downloadbusybox-1_14_2.zip
busybox-1_14_2.tar.gz
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.h2
-rw-r--r--include/usage.h7
2 files changed, 7 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 2868eba..bedf659 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1099,6 +1099,8 @@ const char *get_signame(int number) FAST_FUNC;
void print_signames(void) FAST_FUNC;
char *bb_simplify_path(const char *path) FAST_FUNC;
+/* Returns ptr to NUL */
+char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC;
#define FAIL_DELAY 3
extern void bb_do_delay(int seconds) FAST_FUNC;
diff --git a/include/usage.h b/include/usage.h
index d3bf784..bfacc56 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -3404,12 +3404,15 @@
"files do not block on disk I/O"
#define readlink_trivial_usage \
- USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE"
+ USE_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE"
#define readlink_full_usage "\n\n" \
"Display the value of a symlink" \
USE_FEATURE_READLINK_FOLLOW( "\n" \
"\nOptions:" \
- "\n -f Canonicalize by following all symlinks") \
+ "\n -f Canonicalize by following all symlinks" \
+ "\n -n Don't add newline" \
+ "\n -v Verbose" \
+ ) \
#define readprofile_trivial_usage \
"[OPTIONS]..."