Mercurial > vim
view src/vimrun.c @ 34114:099e0a527665 v9.1.0021
patch 9.1.0021: i_CTRL-R- doesn't work for multibyte chars in Replace mode
Commit: https://github.com/vim/vim/commit/424ec1f235a53131042aed94d30f6e2528e551d9
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Jan 12 17:43:05 2024 +0100
patch 9.1.0021: i_CTRL-R- doesn't work for multibyte chars in Replace mode
Problem: i_CTRL-R- doesn't work for multibyte chars in Replace mode,
Coverity complains missing return value for u_save_cursor()
Solution: Use mb_charlen() and del_chars() instead, handle failure mode
for u_save_cursor() correctly (@zeertzjq)
closes: #13846
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 12 Jan 2024 18:00:03 +0100 |
parents | 2559dc02bd64 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * this file by Vince Negri * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. * See README.txt for an overview of the Vim source code. */ /* * vimrun.c - Tiny Win32 program to safely run an external command in a * DOS console. * This program is required to avoid that typing CTRL-C in the DOS * console kills Vim. Now it only kills vimrun. */ #include <stdio.h> #include <stdlib.h> #include <conio.h> #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <windows.h> int main(void) { const wchar_t *p; wchar_t *cmd; size_t cmdlen; int retval; int inquote = 0; int silent = 0; HANDLE hstdout; DWORD written; p = (const wchar_t *)GetCommandLineW(); /* * Skip the executable name, which might be in "". */ while (*p) { if (*p == L'"') inquote = !inquote; else if (!inquote && *p == L' ') { ++p; break; } ++p; } while (*p == L' ') ++p; /* * "-s" argument: don't wait for a key hit. */ if (p[0] == L'-' && p[1] == L's' && p[2] == L' ') { silent = 1; p += 3; while (*p == L' ') ++p; } // Print the command, including quotes and redirection. hstdout = GetStdHandle(STD_OUTPUT_HANDLE); WriteConsoleW(hstdout, p, wcslen(p), &written, NULL); WriteConsoleW(hstdout, L"\r\n", 2, &written, NULL); // If the command starts and ends with double quotes, // Enclose the command in parentheses. cmd = NULL; cmdlen = wcslen(p); if (cmdlen >= 2 && p[0] == L'"' && p[cmdlen - 1] == L'"') { cmdlen += 3; cmd = malloc(cmdlen * sizeof(wchar_t)); if (cmd == NULL) { perror("vimrun malloc(): "); return -1; } _snwprintf(cmd, cmdlen, L"(%s)", p); p = cmd; } /* * Do it! */ retval = _wsystem(p); if (cmd) free(cmd); if (retval == -1) perror("vimrun system(): "); else if (retval != 0) printf("shell returned %d\n", retval); if (!silent) { puts("Hit any key to close this window..."); while (_kbhit()) (void)_getch(); (void)_getch(); } return retval; }