post 1.14.1 fixes; bump version to 1.14.21_14_2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

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;
 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 d3bf7849e..bfacc5611 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]..."