Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge

6 files changed, 98 insertions, 1 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 2eeb9d77a..9d38b1f88 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -7,6 +7,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//usage:#define awk_trivial_usage
+//usage:       "[OPTIONS] [AWK_PROGRAM] [FILE]..."
+//usage:#define awk_full_usage "\n\n"
+//usage:       "Options:"
+//usage:     "\n        -v VAR=VAL      Set variable"
+//usage:     "\n        -F SEP          Use SEP as field separator"
+//usage:     "\n        -f FILE         Read program from FILE"
+
 #include "libbb.h"
 #include "xregex.h"
 #include <math.h>
diff --git a/editors/cmp.c b/editors/cmp.c
index f84a56e3e..3a0f5aa4f 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -10,6 +10,15 @@
 /* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
 
+//usage:#define cmp_trivial_usage
+//usage:       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
+//usage:#define cmp_full_usage "\n\n"
+//usage:       "Compare FILE1 with FILE2 (or stdin)\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -l      Write the byte numbers (decimal) and values (octal)"
+//usage:     "\n                for all differing bytes"
+//usage:     "\n        -s      Quiet"
+
 #include "libbb.h"
 
 static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
diff --git a/editors/diff.c b/editors/diff.c
index ca4a4eae7..daa58af9b 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -76,6 +76,28 @@
  * 6n words for files of length n.
  */
 
+//usage:#define diff_trivial_usage
+//usage:       "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
+//usage:#define diff_full_usage "\n\n"
+//usage:       "Compare files line by line and output the differences between them.\n"
+//usage:       "This implementation supports unified diffs only.\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -a      Treat all files as text"
+//usage:     "\n        -b      Ignore changes in the amount of whitespace"
+//usage:     "\n        -B      Ignore changes whose lines are all blank"
+//usage:     "\n        -d      Try hard to find a smaller set of changes"
+//usage:     "\n        -i      Ignore case differences"
+//usage:     "\n        -L      Use LABEL instead of the filename in the unified header"
+//usage:     "\n        -N      Treat absent files as empty"
+//usage:     "\n        -q      Output only whether files differ"
+//usage:     "\n        -r      Recurse"
+//usage:     "\n        -S      Start with FILE when comparing directories"
+//usage:     "\n        -T      Make tabs line up by prefixing a tab when necessary"
+//usage:     "\n        -s      Report when two files are the same"
+//usage:     "\n        -t      Expand tabs to spaces in output"
+//usage:     "\n        -U      Output LINES lines of context"
+//usage:     "\n        -w      Ignore all whitespace"
+
 #include "libbb.h"
 
 #if 0
@@ -952,6 +974,31 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
         if (gotstdin && (S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode)))
                 bb_error_msg_and_die("can't compare stdin to a directory");
 
+        /* Compare metadata to check if the files are the same physical file.
+         *
+         * Comment from diffutils source says:
+         * POSIX says that two files are identical if st_ino and st_dev are
+         * the same, but many file systems incorrectly assign the same (device,
+         * inode) pair to two distinct files, including:
+         * GNU/Linux NFS servers that export all local file systems as a
+         * single NFS file system, if a local device number (st_dev) exceeds
+         * 255, or if a local inode number (st_ino) exceeds 16777215.
+         */
+        if (ENABLE_DESKTOP
+         && stb[0].st_ino == stb[1].st_ino
+         && stb[0].st_dev == stb[1].st_dev
+         && stb[0].st_size == stb[1].st_size
+         && stb[0].st_mtime == stb[1].st_mtime
+         && stb[0].st_ctime == stb[1].st_ctime
+         && stb[0].st_mode == stb[1].st_mode
+         && stb[0].st_nlink == stb[1].st_nlink
+         && stb[0].st_uid == stb[1].st_uid
+         && stb[0].st_gid == stb[1].st_gid
+        ) {
+                /* files are physically the same; no need to compare them */
+                return STATUS_SAME;
+        }
+
         if (S_ISDIR(stb[0].st_mode) && S_ISDIR(stb[1].st_mode)) {
 #if ENABLE_FEATURE_DIFF_DIR
                 diffdir(file, s_start);
diff --git a/editors/ed.c b/editors/ed.c
index b1b6a8d27..dbb51306c 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -7,6 +7,9 @@
  * The "ed" built-in command (much simplified)
  */
 
+//usage:#define ed_trivial_usage ""
+//usage:#define ed_full_usage ""
+
 #include "libbb.h"
 
 typedef struct LINE {
@@ -451,7 +454,7 @@ static void subCommand(const char *cmd, int num1, int num2)
 
                 /*
                  * The new string is larger, so allocate a new line
-                 * structure and use that.  Link it in in place of
+                 * structure and use that.  Link it in place of
                  * the old line structure.
                  */
                 nlp = xmalloc(sizeof(LINE) + lp->len + deltaLen);
diff --git a/editors/sed.c b/editors/sed.c
index d3555243f..9ab758bd7 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -58,6 +58,23 @@
         Reference http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
 */
 
+//usage:#define sed_trivial_usage
+//usage:       "[-efinr] SED_CMD [FILE]..."
+//usage:#define sed_full_usage "\n\n"
+//usage:       "Options:"
+//usage:     "\n        -e CMD  Add CMD to sed commands to be executed"
+//usage:     "\n        -f FILE Add FILE contents to sed commands to be executed"
+//usage:     "\n        -i      Edit files in-place (else sends result to stdout)"
+//usage:     "\n        -n      Suppress automatic printing of pattern space"
+//usage:     "\n        -r      Use extended regex syntax"
+//usage:     "\n"
+//usage:     "\nIf no -e or -f, the first non-option argument is the sed command string."
+//usage:     "\nRemaining arguments are input files (stdin if none)."
+//usage:
+//usage:#define sed_example_usage
+//usage:       "$ echo \"foo\" | sed -e 's/f[a-zA-Z]o/bar/g'\n"
+//usage:       "bar\n"
+
 #include "libbb.h"
 #include "xregex.h"
 
diff --git a/editors/vi.c b/editors/vi.c
index f59d5a706..712af0326 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -21,6 +21,19 @@
  *      An "ex" line oriented mode- maybe using "cmdedit"
  */
 
+//usage:#define vi_trivial_usage
+//usage:       "[OPTIONS] [FILE]..."
+//usage:#define vi_full_usage "\n\n"
+//usage:       "Edit FILE\n"
+//usage:     "\nOptions:"
+//usage:        IF_FEATURE_VI_COLON(
+//usage:     "\n        -c      Initial command to run ($EXINIT also available)"
+//usage:        )
+//usage:        IF_FEATURE_VI_READONLY(
+//usage:     "\n        -R      Read-only"
+//usage:        )
+//usage:     "\n        -H      Short help regarding available features"
+
 #include "libbb.h"
 
 /* the CRASHME code is unmaintained, and doesn't currently build */