Mercurial > vim
view src/vimrun.c @ 33101:8cbdd2cbf10a v9.0.1835
patch 9.0.1835: Perl interface has problems with load PL_current_context
Commit: https://github.com/vim/vim/commit/7a9d1aa878d8724e28893b968016b86a3a70c63f
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Fri Sep 1 18:46:17 2023 +0200
patch 9.0.1835: Perl interface has problems with load PL_current_context
Problem: Perl interface has problems with load PL_current_context
Solution: Fix Perl interface to load PL_current_context from library
In #12914, in order to fix an issue with Perl 5.36 dynamic builds, (that
version introduced a thread-local `PL_current_context`), the file added
the variable manually so we can satisfy the linker. However, the
variable is a different one from the one in the library, so there could
be unpredictable behavior. Instead, just use `dlsym` to load the context
from the library. The fact that it's thread-local doesn't matter too
much to us because Vim's interface is single-threaded so it will work
properly.
closes: #12996
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 01 Sep 2023 19:00:04 +0200 |
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; }