1 files changed, 192 insertions, 1 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 34932f60c..e59083ddb 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -112,6 +112,19 @@
 //config:       help
 //config:       Enable the editor to set some (ai, ic, showmatch) options.
 //config:
+//config:config FEATURE_VI_FILE_FORMAT
+//config:       bool "Enable detection of file format"
+//config:       default y
+//config:       depends on VI && FEATURE_VI_SETOPTS && PLATFORM_MINGW32
+//config:       help
+//config:       Enable the editor to detect the format of files it reads
+//config:       so they can be written out with the appropriate line
+//config:       endings. Also allow files to be edited in binary mode.
+//config:
+//config:       This enables the 'fileformat', 'fileformats' and 'binary'
+//config:       options and the '-b' command line flag.
+//config:
+//config:
 //config:config FEATURE_VI_SET
 //config:       bool "Support :set"
 //config:       default y
@@ -181,9 +194,12 @@
 //kbuild:lib-$(CONFIG_VI) += vi.o
 
 //usage:#define vi_trivial_usage
-//usage:       IF_FEATURE_VI_COLON("[-c CMD] ")IF_FEATURE_VI_READONLY("[-R] ")"[-H] [FILE]..."
+//usage:       IF_FEATURE_VI_FILE_FORMAT("[-b] ")IF_FEATURE_VI_COLON("[-c CMD] ")IF_FEATURE_VI_READONLY("[-R] ")"[-H] [FILE]..."
 //usage:#define vi_full_usage "\n\n"
 //usage:       "Edit FILE\n"
+//usage:        IF_FEATURE_VI_FILE_FORMAT(
+//usage:     "\n        -b      Edit file in binary mode"
+//usage:        )
 //usage:        IF_FEATURE_VI_COLON(
 //usage:     "\n        -c CMD  Initial command to run ($EXINIT and ~/.exrc also available)"
 //usage:        )
@@ -198,6 +214,9 @@
 #if ENABLE_FEATURE_VI_REGEX_SEARCH
 # include <regex.h>
 #endif
+#if ENABLE_PLATFORM_MINGW32
+# include "BB_VER.h"
+#endif
 
 // the CRASHME code is unmaintained, and doesn't currently build
 #define ENABLE_FEATURE_VI_CRASHME 0
@@ -224,7 +243,11 @@
 
 #endif
 
+#if !ENABLE_PLATFORM_MINGW32
 #define isbackspace(c) ((c) == term_orig.c_cc[VERASE] || (c) == 8 || (c) == 127)
+#else
+#define isbackspace(c) ((c) == 8 || (c) == 127)
+#endif
 
 enum {
         MAX_TABSTOP = 32, // sanity limit
@@ -298,6 +321,7 @@ struct globals {
 
         // the rest
 #if ENABLE_FEATURE_VI_SETOPTS
+#if !ENABLE_FEATURE_VI_FILE_FORMAT
         smallint vi_setops;     // set by setops()
 #define VI_AUTOINDENT (1 << 0)
 #define VI_EXPANDTAB  (1 << 1)
@@ -305,6 +329,19 @@ struct globals {
 #define VI_IGNORECASE (1 << 3)
 #define VI_SHOWMATCH  (1 << 4)
 #define VI_TABSTOP    (1 << 5)
+#else
+        int vi_setops;     // set by setops()
+#define VI_AUTOINDENT (1 << 0)
+#define VI_BINARY     (1 << 1)
+#define VI_EXPANDTAB  (1 << 2)
+#define VI_FILEFORMAT (1 << 3)
+#define VI_FILEFORMATS (1 << 4)
+#define VI_ERR_METHOD (1 << 5)
+#define VI_IGNORECASE (1 << 6)
+#define VI_SHOWMATCH  (1 << 7)
+#define VI_TABSTOP    (1 << 8)
+#define binary     (vi_setops & VI_BINARY    )
+#endif
 #define autoindent (vi_setops & VI_AUTOINDENT)
 #define expandtab  (vi_setops & VI_EXPANDTAB )
 #define err_method (vi_setops & VI_ERR_METHOD) // indicate error with beep or flash
@@ -313,11 +350,25 @@ struct globals {
 // order of constants and strings must match
 #define OPTS_STR \
                 "ai\0""autoindent\0" \
+                IF_FEATURE_VI_FILE_FORMAT("bin\0""binary\0") \
                 "et\0""expandtab\0" \
+                IF_FEATURE_VI_FILE_FORMAT("ff\0""fileformat\0") \
+                IF_FEATURE_VI_FILE_FORMAT("ffs\0""fileformats\0") \
                 "fl\0""flash\0" \
                 "ic\0""ignorecase\0" \
                 "sm\0""showmatch\0" \
                 "ts\0""tabstop\0"
+
+#define FF_DOS  0
+#define FF_UNIX 1
+
+#define FF_STR \
+                "dos\0" \
+                "unix\0"
+
+#define FFS_STR \
+                "dos,unix\0" \
+                "unix,dos\0"
 #else
 #define autoindent (0)
 #define expandtab  (0)
@@ -384,6 +435,10 @@ struct globals {
         int newindent;          // autoindent value for 'O'/'cc' commands
                                                 // or -1 to use indent from previous line
 #endif
+#if ENABLE_FEATURE_VI_FILE_FORMAT
+        smallint fileformat;
+        smallint fileformats;
+#endif
         smallint cmd_error;
 
         // former statics
@@ -511,6 +566,8 @@ struct globals {
 #define last_search_pattern     (G.last_search_pattern)
 #define char_insert__indentcol  (G.char_insert__indentcol)
 #define newindent               (G.newindent          )
+#define fileformat              (G.fileformat         )
+#define fileformats             (G.fileformats        )
 #define cmd_error               (G.cmd_error          )
 
 #define edit_file__cur_line     (G.edit_file__cur_line)
@@ -615,6 +672,23 @@ static ALWAYS_INLINE int query_screen_dimensions(void)
 // sleep for 'h' 1/100 seconds, return 1/0 if stdin is (ready for read)/(not ready)
 static int mysleep(int hund)
 {
+#if ENABLE_PLATFORM_MINGW32
+        HANDLE h = GetStdHandle(STD_INPUT_HANDLE);
+        DWORD ret;
+
+        if (hund == 0) {
+                // Allow two events in the queue.  Otherwise pasted test isn't
+                // displayed because there's still a key release event waiting
+                // after the last character is processed.
+                DWORD nevent_out;
+
+                ret = GetNumberOfConsoleInputEvents(h, &nevent_out);
+                return ret != 0 ? (nevent_out > 2) : 0;
+        }
+        fflush_all();
+        ret = WaitForSingleObject(h, hund*10);
+        return ret != WAIT_TIMEOUT;
+#else
         struct pollfd pfd[1];
 
         if (hund != 0)
@@ -623,6 +697,7 @@ static int mysleep(int hund)
         pfd[0].fd = STDIN_FILENO;
         pfd[0].events = POLLIN;
         return safe_poll(pfd, 1, hund*10) > 0;
+#endif
 }
 
 //----- Set terminal attributes --------------------------------
@@ -1978,6 +2053,18 @@ static char *yank_delete(char *start, char *stop, int buftype, int yf, int undo)
         return p;
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static int count_cr(char *p, int len)
+{
+        int i, cnt;
+
+        for (i = cnt = 0; i < len; ++i)
+                if (p[i] == '\n')
+                        ++cnt;
+        return cnt;
+}
+#endif
+
 // might reallocate text[]!
 static int file_insert(const char *fn, char *p, int initial)
 {
@@ -1990,7 +2077,13 @@ static int file_insert(const char *fn, char *p, int initial)
         if (p > end)
                 p = end;
 
+#if !ENABLE_PLATFORM_MINGW32
         fd = open(fn, O_RDONLY);
+#elif ENABLE_FEATURE_VI_FILE_FORMAT
+        fd = open(fn, O_RDONLY | (!binary ? _O_TEXT : 0));
+#else
+        fd = open(fn, O_RDONLY | _O_TEXT);
+#endif
         if (fd < 0) {
                 if (!initial)
                         status_line_bold_errno(fn);
@@ -2013,8 +2106,15 @@ static int file_insert(const char *fn, char *p, int initial)
                 status_line_bold_errno(fn);
                 p = text_hole_delete(p, p + size - 1, NO_UNDO); // un-do buffer insert
         } else if (cnt < size) {
+#if ENABLE_PLATFORM_MINGW32
+                // On WIN32 a partial read might just mean CRs have been removed
+                int cnt_cr = cnt + count_cr(p, cnt);
+#endif
                 // There was a partial read, shrink unused space
                 p = text_hole_delete(p + cnt, p + size - 1, NO_UNDO);
+#if ENABLE_PLATFORM_MINGW32
+                if (cnt_cr < size)
+#endif
                 status_line_bold("can't read '%s'", fn);
         }
 # if ENABLE_FEATURE_VI_UNDO
@@ -2022,6 +2122,10 @@ static int file_insert(const char *fn, char *p, int initial)
                 undo_push_insert(p, size, ALLOW_UNDO);
         }
 # endif
+#if ENABLE_FEATURE_VI_FILE_FORMAT
+        if (initial && cnt > 0)
+                fileformat = cnt == size ? FF_UNIX : FF_DOS;
+#endif
  fi:
         close(fd);
 
@@ -2312,6 +2416,9 @@ static int init_text_buffer(char *fn)
         free(text);
         text_size = 10240;
         screenbegin = dot = end = text = xzalloc(text_size);
+#if ENABLE_FEATURE_VI_FILE_FORMAT
+        fileformat = fileformats;
+#endif
 
         update_filename(fn);
         rc = file_insert(fn, text, 1);
@@ -2358,6 +2465,13 @@ static uintptr_t string_insert(char *p, const char *s, int undo) // insert the s
 static int file_write(char *fn, char *first, char *last)
 {
         int fd, cnt, charcnt;
+#if ENABLE_PLATFORM_MINGW32
+# if ENABLE_FEATURE_VI_FILE_FORMAT
+#  define dos (!binary && fileformat == FF_DOS)
+# else
+#  define dos (1)
+# endif
+#endif
 
         if (fn == 0) {
                 status_line_bold("No current filename");
@@ -2366,12 +2480,22 @@ static int file_write(char *fn, char *first, char *last)
         // By popular request we do not open file with O_TRUNC,
         // but instead ftruncate() it _after_ successful write.
         // Might reduce amount of data lost on power fail etc.
+#if !ENABLE_PLATFORM_MINGW32
         fd = open(fn, (O_WRONLY | O_CREAT), 0666);
+#else
+        fd = open(fn, (O_WRONLY | O_CREAT | (dos ? _O_TEXT : 0)), 0666);
+#endif
         if (fd < 0)
                 return -1;
         cnt = last - first + 1;
         charcnt = full_write(fd, first, cnt);
+#if !ENABLE_PLATFORM_MINGW32
         ftruncate(fd, charcnt);
+#else
+        // If file was written in text mode it will be bigger so adjust
+        // the truncation to match.
+        ftruncate(fd, charcnt + (dos ? count_cr(first, cnt) : 0));
+#endif
         if (charcnt == cnt) {
                 // good write
                 //modified_count = FALSE;
@@ -2660,6 +2784,7 @@ static void setops(char *args, int flg_no)
 
         index = 1 << (index >> 1); // convert to VI_bit
 
+#if !ENABLE_FEATURE_VI_FILE_FORMAT
         if (index & VI_TABSTOP) {
                 int t;
                 if (!eq || flg_no) // no "=NNN" or it is "notabstop"?
@@ -2670,11 +2795,43 @@ static void setops(char *args, int flg_no)
                 tabstop = t;
                 return;
         }
+#else
+        if (index & (VI_TABSTOP | VI_FILEFORMAT | VI_FILEFORMATS)) {
+                if (!eq || flg_no) // no "=NNN" or it is "notabstop"?
+                        goto bad;
+                if (index & VI_TABSTOP) {
+                        int t = bb_strtou(eq + 1, NULL, 10);
+                        if (t <= 0 || t > MAX_TABSTOP)
+                                goto bad;
+                        tabstop = t;
+                        return;
+                } else if (index & VI_FILEFORMAT) {
+                        int t = index_in_strings(FF_STR, eq + 1);
+                        if (t < 0)
+                                goto bad;
+                        if (fileformat != t)
+                                modified_count++;
+                        fileformat = t;
+                        return;
+                } else { // VI_FILEFORMATS
+                        int t = index_in_strings(FFS_STR, eq + 1);
+                        if (t < 0)
+                                goto bad;
+                        fileformats = t;
+                        return;
+                }
+        }
+#endif
         if (eq) goto bad; // boolean option has "="?
         if (flg_no) {
                 vi_setops &= ~index;
         } else {
                 vi_setops |= index;
+#if ENABLE_FEATURE_VI_FILE_FORMAT
+                if (index == VI_BINARY) {
+                        vi_setops &= ~VI_EXPANDTAB;
+                }
+#endif
         }
 }
 # endif
@@ -3166,6 +3323,7 @@ static void colon(char *buf)
                 if (!args[0] || strcmp(args, "all") == 0) {
                         // print out values of all options
 #  if ENABLE_FEATURE_VI_SETOPTS
+#   if !ENABLE_FEATURE_VI_FILE_FORMAT
                         status_line_bold(
                                 "%sautoindent "
                                 "%sexpandtab "
@@ -3180,6 +3338,28 @@ static void colon(char *buf)
                                 showmatch ? "" : "no",
                                 tabstop
                         );
+#   else // ENABLE_FEATURE_VI_FILE_FORMAT
+                        unsigned int mask = 1, j = 0;
+                        go_bottom_and_clear_to_eol();
+                        for (;;) {
+                                const char *name = nth_string(OPTS_STR, 2 * j + 1);
+                                if (!name[0])
+                                        break;
+                                if (mask == VI_FILEFORMAT)
+                                        printf("%s=%s ", name, nth_string(FF_STR, fileformat));
+                                else if (mask == VI_FILEFORMATS)
+                                        printf("%s=%s ", name, nth_string(FFS_STR, fileformats));
+                                else if (mask == VI_TABSTOP)
+                                        printf("%s=%u ", name, tabstop);
+                                else
+                                        printf("%s%s ", vi_setops & mask ? "" : "no", name);
+                                if (j++ == 4)
+                                        bb_putchar('\n');
+                                mask <<= 1;
+                        }
+                        bb_putchar('\n');
+                        Hit_Return();
+#   endif
 #  endif
                         goto ret;
                 }
@@ -4934,17 +5114,20 @@ static void edit_file(char *fn)
 }
 
 #define VI_OPTSTR \
+        IF_FEATURE_VI_FILE_FORMAT("b") \
         IF_FEATURE_VI_CRASHME("C") \
         IF_FEATURE_VI_COLON("c:*") \
         "Hh" \
         IF_FEATURE_VI_READONLY("R")
 
 enum {
+        IF_FEATURE_VI_FILE_FORMAT(OPTBIT_b,)
         IF_FEATURE_VI_CRASHME(OPTBIT_C,)
         IF_FEATURE_VI_COLON(OPTBIT_c,)
         OPTBIT_H,
         OPTBIT_h,
         IF_FEATURE_VI_READONLY(OPTBIT_R,)
+        OPT_b = IF_FEATURE_VI_FILE_FORMAT(      (1 << OPTBIT_b)) + 0,
         OPT_C = IF_FEATURE_VI_CRASHME(  (1 << OPTBIT_C)) + 0,
         OPT_c = IF_FEATURE_VI_COLON(    (1 << OPTBIT_c)) + 0,
         OPT_H = 1 << OPTBIT_H,
@@ -4981,6 +5164,10 @@ int vi_main(int argc, char **argv)
         //vi_setops = 0;
         opts = getopt32(argv, VI_OPTSTR IF_FEATURE_VI_COLON(, &initial_cmds));
 
+#if ENABLE_FEATURE_VI_FILE_FORMAT
+        if (opts & OPT_b)
+                vi_setops |= VI_BINARY;
+#endif
 #if ENABLE_FEATURE_VI_CRASHME
         if (opts & OPT_C)
                 crashme = 1;
@@ -5016,7 +5203,11 @@ int vi_main(int argc, char **argv)
 
                                 // .exrc must belong to and only be writable by user
                                 if (stat(exrc, &st) == 0) {
+# if !ENABLE_PLATFORM_MINGW32
                                         if ((st.st_mode & (S_IWGRP|S_IWOTH)) == 0
+# else
+                                        if (1
+# endif
                                          && st.st_uid == getuid()
                                         ) {
                                                 cmds = xmalloc_open_read_close(exrc, NULL);