Mercurial > vim
view src/iscygpty.c @ 33004:50e7d33c40f9 v9.0.1794
patch 9.0.1794: autoconf: not correctly detecing include dirs
Commit: https://github.com/vim/vim/commit/74e1dada4199b2d9e68ccaafdb7895c85b4b08f1
Author: Illia Bobyr <illia.bobyr@gmail.com>
Date: Sun Aug 27 18:26:54 2023 +0200
patch 9.0.1794: autoconf: not correctly detecing include dirs
Problem: autoconf: not correctly detecing include dirs
Solution: make use of python3 to generate includedirs
configure: Python3: Use sysconfig for -I
It seems better to use tools provided by Python for determining the
include directories, rather than construct them "manually".
Current system is broken when using virtual environments for python
3.11.4. It used to work before, but now it detects a incorrect value
for `-I`.
It would probably make sense to switch to a similar logic for lib
folders, that is for the `-l` switch. There are also
`sysconfig.get_config_h_filename()` and
`sysconfig.get_makefile_filename()`, that could replace more Python
specific logic in the current `configure{.ac,}`.
sysconfig provides the necessary tools since Python 2.7.
closes: #12889
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Illia Bobyr <illia.bobyr@gmail.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 27 Aug 2023 18:45:03 +0200 |
parents | faf7fcd1c8d5 |
children | 1ffdcd8a424e |
line wrap: on
line source
/* * iscygpty.c -- part of ptycheck * https://github.com/k-takata/ptycheck * * Copyright (c) 2015-2017 K.Takata * * You can redistribute it and/or modify it under the terms of either * the MIT license (as described below) or the Vim license. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifdef _WIN32 #include <ctype.h> #include <io.h> #include <wchar.h> #include <windows.h> #ifdef USE_FILEEXTD // VC 7.1 or earlier doesn't support SAL. # if !defined(_MSC_VER) || (_MSC_VER < 1400) # define __out # define __in # define __in_opt # endif // Win32 FileID API Library: // http://www.microsoft.com/en-us/download/details.aspx?id=22599 // Needed for WinXP. # include <fileextd.h> #else // USE_FILEEXTD // VC 8 or earlier. # if defined(_MSC_VER) && (_MSC_VER < 1500) # ifdef ENABLE_STUB_IMPL # define STUB_IMPL # else # error "Win32 FileID API Library is required for VC2005 or earlier." # endif # endif #endif // USE_FILEEXTD #ifdef __MINGW32__ # define UNUSED __attribute__((unused)) #else # define UNUSED #endif #include "iscygpty.h" //#define USE_DYNFILEID #ifdef USE_DYNFILEID typedef BOOL (WINAPI *pfnGetFileInformationByHandleEx)( HANDLE hFile, FILE_INFO_BY_HANDLE_CLASS FileInformationClass, LPVOID lpFileInformation, DWORD dwBufferSize); static pfnGetFileInformationByHandleEx pGetFileInformationByHandleEx = NULL; # ifndef USE_FILEEXTD static BOOL WINAPI stub_GetFileInformationByHandleEx( HANDLE hFile UNUSED, FILE_INFO_BY_HANDLE_CLASS FileInformationClass UNUSED, LPVOID lpFileInformation UNUSED, DWORD dwBufferSize UNUSED) { return FALSE; } # endif static void setup_fileid_api(void) { if (pGetFileInformationByHandleEx != NULL) { return; } pGetFileInformationByHandleEx = (pfnGetFileInformationByHandleEx) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetFileInformationByHandleEx"); if (pGetFileInformationByHandleEx == NULL) { # ifdef USE_FILEEXTD pGetFileInformationByHandleEx = GetFileInformationByHandleEx; # else pGetFileInformationByHandleEx = stub_GetFileInformationByHandleEx; # endif } } #else # define pGetFileInformationByHandleEx GetFileInformationByHandleEx # define setup_fileid_api() #endif #define is_wprefix(s, prefix) \ (wcsncmp((s), (prefix), sizeof(prefix) / sizeof(WCHAR) - 1) == 0) // Check if the fd is a cygwin/msys's pty. int is_cygpty(int fd) { #ifdef STUB_IMPL return 0; #else HANDLE h; int size = sizeof(FILE_NAME_INFO) + sizeof(WCHAR) * (MAX_PATH - 1); FILE_NAME_INFO *nameinfo; WCHAR *p = NULL; setup_fileid_api(); h = (HANDLE) _get_osfhandle(fd); if (h == INVALID_HANDLE_VALUE) { return 0; } // Cygwin/msys's pty is a pipe. if (GetFileType(h) != FILE_TYPE_PIPE) { return 0; } nameinfo = malloc(size + sizeof(WCHAR)); if (nameinfo == NULL) { return 0; } // Check the name of the pipe: // '\{cygwin,msys}-XXXXXXXXXXXXXXXX-ptyN-{from,to}-master' if (pGetFileInformationByHandleEx(h, FileNameInfo, nameinfo, size)) { nameinfo->FileName[nameinfo->FileNameLength / sizeof(WCHAR)] = L'\0'; p = nameinfo->FileName; if (is_wprefix(p, L"\\cygwin-")) { // Cygwin p += 8; } else if (is_wprefix(p, L"\\msys-")) { // MSYS and MSYS2 p += 6; } else { p = NULL; } if (p != NULL) { while (*p && isxdigit(*p)) // Skip 16-digit hexadecimal. ++p; if (is_wprefix(p, L"-pty")) { p += 4; } else { p = NULL; } } if (p != NULL) { while (*p && isdigit(*p)) // Skip pty number. ++p; if (is_wprefix(p, L"-from-master")) { //p += 12; } else if (is_wprefix(p, L"-to-master")) { //p += 10; } else { p = NULL; } } } free(nameinfo); return (p != NULL); #endif // STUB_IMPL } // Check if at least one cygwin/msys pty is used. int is_cygpty_used(void) { int fd, ret = 0; for (fd = 0; fd < 3; fd++) { ret |= is_cygpty(fd); } return ret; } #endif // _WIN32 // vim: set ts=4 sw=4: