Vladimir N. Oleynik writes:

[oweals/busybox.git] / editors / vi.c

diff --git a/editors/vi.c b/editors/vi.c
index 8e9ecc92597a08f43740def8e501a3ac3b66661e..57b011444bc4d3b512fafd6c4b81b91731537336 100644 (file)
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -19,7 +19,7 @@
  */
 
 static const char vi_Version[] =
-       "$Id: vi.c,v 1.26 2002/12/02 21:18:08 bug1 Exp $";
+       "$Id: vi.c,v 1.32 2004/02/04 11:19:44 andersen Exp $";
 
 /*
  * To compile for standalone use:
@@ -197,9 +197,6 @@ static jmp_buf restart;             // catch_sig()
 #if defined(CONFIG_FEATURE_VI_USE_SIGNALS) || defined(CONFIG_FEATURE_VI_CRASHME)
 static int my_pid;
 #endif
-#ifdef CONFIG_FEATURE_VI_WIN_RESIZE
-static struct winsize winsize; // remember the window size
-#endif                                                 /* CONFIG_FEATURE_VI_WIN_RESIZE */
 #ifdef CONFIG_FEATURE_VI_DOT_CMD
 static int adding2q;           // are we currently adding user input to q
 static Byte *last_modifying_cmd;       // last modifying cmd for "."
@@ -403,7 +400,7 @@ extern int vi_main(int argc, char **argv)
                for (; optind < argc; optind++) {
                        editing = 1;    // 0=exit, 1=one file, 2+ =many files
                        free(cfn);
-                       cfn = (Byte *) xstrdup(argv[optind]);
+                       cfn = (Byte *) bb_xstrdup(argv[optind]);
                        edit_file(cfn);
                }
        }
@@ -412,6 +409,14 @@ extern int vi_main(int argc, char **argv)
        return (0);
 }
 
+#ifdef CONFIG_FEATURE_VI_WIN_RESIZE
+//----- See what the window size currently is --------------------
+static inline void window_size_get(int fd)
+{
+       get_terminal_width_height(fd, &columns, &rows);
+}
+#endif                                                 /* CONFIG_FEATURE_VI_WIN_RESIZE */
+
 static void edit_file(Byte * fn)
 {
        Byte c;
@@ -597,7 +602,7 @@ static Byte *get_one_address(Byte * p, int *addr)   // get colon addr, if present
                        *q++ = *p;
                        *q = '\0';
                }
-               pat = (Byte *) xstrdup((char *) buf);   // save copy of pattern
+               pat = (Byte *) bb_xstrdup((char *) buf);        // save copy of pattern
                if (*p == '/')
                        p++;
                q = char_search(dot, pat, FORWARD, FULL);
@@ -811,7 +816,7 @@ static void colon(Byte * buf)
 
                // There is a read-able regular file
                // make this the current file
-               q = (Byte *) xstrdup((char *) fn);      // save the cfn
+               q = (Byte *) bb_xstrdup((char *) fn);   // save the cfn
                free(cfn);              // free the old name
                cfn = q;                        // remember new cfn
 
@@ -862,7 +867,7 @@ static void colon(Byte * buf)
                if (strlen((char *) args) > 0) {
                        // user wants a new filename
                        free(cfn);
-                       cfn = (Byte *) xstrdup((char *) args);
+                       cfn = (Byte *) bb_xstrdup((char *) args);
                } else {
                        // user wants file status info
                        edit_status();
@@ -1664,8 +1669,13 @@ static Byte find_range(Byte ** start, Byte ** stop, Byte c)
                q = dot;
        } else if (strchr("wW", c)) {
                do_cmd(c);              // execute movement cmd
-               if (dot > text)
-                       dot--;          // move back off of next word
+               // if we are at the next word's first char
+               // step back one char
+               // but check the possibilities when it is true
+               if (dot > text && ((isspace(dot[0]) && !isspace(dot[0]))
+                               || (ispunct(dot[-1]) && !ispunct(dot[0]))
+                               || (isalnum(dot[-1]) && !isalnum(dot[0]))))
+                       dot--;          // move back off of next word
                if (dot > text && *dot == '\n')
                        dot--;          // stay off NL
                q = dot;
@@ -2108,10 +2118,8 @@ static void rawmode(void)
        term_vi.c_lflag &= (~ICANON & ~ECHO);   // leave ISIG ON- allow intr's
        term_vi.c_iflag &= (~IXON & ~ICRNL);
        term_vi.c_oflag &= (~ONLCR);
-#ifndef linux
        term_vi.c_cc[VMIN] = 1;
        term_vi.c_cc[VTIME] = 0;
-#endif
        erase_char = term_vi.c_cc[VERASE];
        tcsetattr(0, TCSANOW, &term_vi);
 }
@@ -2122,29 +2130,6 @@ static void cookmode(void)
        tcsetattr(0, TCSANOW, &term_orig);
 }
 
-#ifdef CONFIG_FEATURE_VI_WIN_RESIZE
-//----- See what the window size currently is --------------------
-static void window_size_get(int sig)
-{
-       int i;
-
-       i = ioctl(0, TIOCGWINSZ, &winsize);
-       if (i != 0) {
-               // force 24x80
-               winsize.ws_row = 24;
-               winsize.ws_col = 80;
-       }
-       if (winsize.ws_row <= 1) {
-               winsize.ws_row = 24;
-       }
-       if (winsize.ws_col <= 1) {
-               winsize.ws_col = 80;
-       }
-       rows = (int) winsize.ws_row;
-       columns = (int) winsize.ws_col;
-}
-#endif                                                 /* CONFIG_FEATURE_VI_WIN_RESIZE */
-
 //----- Come here when we get a window resize signal ---------
 #ifdef CONFIG_FEATURE_VI_USE_SIGNALS
 static void winch_sig(int sig)
@@ -2432,7 +2417,7 @@ static Byte *get_input_line(Byte * prompt) // get input line- use "status line"
        }
        refresh(FALSE);
        free(obufp);
-       obufp = (Byte *) xstrdup((char *) buf);
+       obufp = (Byte *) bb_xstrdup((char *) buf);
        return (obufp);
 }
 
@@ -3215,7 +3200,7 @@ key_cmd_mode:
                if (cmdcnt-- > 1) {
                        do_cmd(c);
                }                               // repeat cnt
-               dot = end_line(dot + 1);
+               dot = end_line(dot);
                break;
        case '%':                       // %- find matching char of pair () [] {}
                for (q = dot; q < end && *q != '\n'; q++) {
@@ -3263,7 +3248,7 @@ key_cmd_mode:
                // Stuff the last_modifying_cmd back into stdin
                // and let it be re-executed.
                if (last_modifying_cmd != 0) {
-                       ioq = ioq_start = (Byte *) xstrdup((char *) last_modifying_cmd);
+                       ioq = ioq_start = (Byte *) bb_xstrdup((char *) last_modifying_cmd);
                }
                break;
 #endif                                                 /* CONFIG_FEATURE_VI_DOT_CMD */
@@ -3278,7 +3263,7 @@ key_cmd_mode:
                if (strlen((char *) q) > 1) {   // new pat- save it and find
                        // there is a new pat
                        free(last_search_pattern);
-                       last_search_pattern = (Byte *) xstrdup((char *) q);
+                       last_search_pattern = (Byte *) bb_xstrdup((char *) q);
                        goto dc3;       // now find the pattern
                }
                // user changed mind and erased the "/"-  do nothing
@@ -3951,7 +3936,7 @@ static void crash_test()
 {
        static time_t oldtim;
        time_t tim;
-       char d[2], buf[BUFSIZ], msg[BUFSIZ];
+       char d[2], msg[BUFSIZ];
 
        msg[0] = '\0';
        if (end < text) {
@@ -3975,7 +3960,7 @@ static void crash_test()
 
        if (strlen(msg) > 0) {
                alarm(0);
-               printf(buf, "\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s",
+               printf("\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s",
                        totalcmds, last_input_char, msg, SOs, SOn);
                fflush(stdout);
                while (read(0, d, 1) > 0) {