From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id EDF963858D28; Mon, 28 Aug 2023 09:22:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EDF963858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693214534; bh=qCATLaxVzrzb7J61AGwHK9p5fV3WF8MuCKvl6NEAYWg=; h=From:To:Subject:Date:From; b=YCEQY2MAc6eSgv2v1zfkts/zt/3YWbr3z2yeCa0/2DQDGGVuNjLPW7uyWWW9nVvms aw9GxFKY+p2Ds36Ou1AqC3QXtWlDr8tb8whUAPu+rpVUqlAQT2TFHolEMV94dnnDTW 60HGwil6An2tvfdeoVTWo2z4QkyAWqORaQy2e/SA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: termios: Refactor the function is_console_app(). X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: eb1584b491384e072c949ecd78ec85de244661fe X-Git-Newrev: 50ff7901a5dbb2c57548d1bc125bbfbd17d37889 Message-Id: <20230828092214.EDF963858D28@sourceware.org> Date: Mon, 28 Aug 2023 09:22:14 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D50ff7901a5d= bb2c57548d1bc125bbfbd17d37889 commit 50ff7901a5dbb2c57548d1bc125bbfbd17d37889 Author: Takashi Yano Date: Mon Aug 28 17:38:52 2023 +0900 Cygwin: termios: Refactor the function is_console_app(). =20 Signed-off-by: Takashi Yano Diff: --- winsup/cygwin/fhandler/termios.cc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/winsup/cygwin/fhandler/termios.cc b/winsup/cygwin/fhandler/ter= mios.cc index 789ae0179..d106955dc 100644 --- a/winsup/cygwin/fhandler/termios.cc +++ b/winsup/cygwin/fhandler/termios.cc @@ -704,22 +704,20 @@ static bool is_console_app (const WCHAR *filename) { HANDLE h; - const int id_offset =3D 92; h =3D CreateFileW (filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); char buf[1024]; DWORD n; ReadFile (h, buf, sizeof (buf), &n, 0); CloseHandle (h); - char *p =3D (char *) memmem (buf, n, "PE\0\0", 4); - if (p && p + id_offset < buf + n) - return p[id_offset] =3D=3D '\003'; /* 02: GUI, 03: console */ - else - { - wchar_t *e =3D wcsrchr (filename, L'.'); - if (e && (wcscasecmp (e, L".bat") =3D=3D 0 || wcscasecmp (e, L".cmd"= ) =3D=3D 0)) - return true; - } + /* The offset of Subsystem is the same for both IMAGE_NT_HEADERS32 and + IMAGE_NT_HEADERS64, so only IMAGE_NT_HEADERS32 is used here. */ + IMAGE_NT_HEADERS32 *p =3D (IMAGE_NT_HEADERS32 *) memmem (buf, n, "PE\0\0= ", 4); + if (p && (char *) &p->OptionalHeader.DllCharacteristics <=3D buf + n) + return p->OptionalHeader.Subsystem =3D=3D IMAGE_SUBSYSTEM_WINDOWS_CUI; + wchar_t *e =3D wcsrchr (filename, L'.'); + if (e && (wcscasecmp (e, L".bat") =3D=3D 0 || wcscasecmp (e, L".cmd") = =3D=3D 0)) + return true; return false; }