From: Jon Turney <jon.turney@dronecode.org.uk>
To: gdb-patches@sourceware.org
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 1/2] Simplify cygwin_buf_t
Date: Thu, 2 Jun 2022 15:12:57 +0100 [thread overview]
Message-ID: <20220602141258.18968-2-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20220602141258.18968-1-jon.turney@dronecode.org.uk>
Prior to c6ca3dab dropping support for Cygwin 1.5, cygwin_buf_t was
defined as char_t for Cygwin 1.5. After that, it's always wchar_t, so
just use that.
---
gdb/nat/windows-nat.c | 3 +--
gdb/windows-nat.c | 21 ++++++++++-----------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c
index ca6a529601e..20a2902b109 100644
--- a/gdb/nat/windows-nat.c
+++ b/gdb/nat/windows-nat.c
@@ -28,7 +28,6 @@
#else
#include <sys/cygwin.h>
#define __USEWIDE
-typedef wchar_t cygwin_buf_t;
#define GetModuleFileNameEx GetModuleFileNameExW
#endif
@@ -196,7 +195,7 @@ windows_process_info::get_exec_module_filename (char *exe_name_ret,
/* Cygwin prefers that the path be in /x/y/z format, so extract
the filename into a temporary buffer first, and then convert it
to POSIX format into the destination buffer. */
- cygwin_buf_t *pathbuf = (cygwin_buf_t *) alloca (exe_name_max_len * sizeof (cygwin_buf_t));
+ wchar_t *pathbuf = (wchar_t *) alloca (exe_name_max_len * sizeof (wchar_t));
len = GetModuleFileNameEx (handle,
dh_buf, pathbuf, exe_name_max_len);
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 8631a1b4569..ab438750186 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -90,7 +90,6 @@ static windows_process_info windows_process;
static CORE_ADDR cygwin_load_start;
static CORE_ADDR cygwin_load_end;
# define __USEWIDE
- typedef wchar_t cygwin_buf_t;
# define STARTUPINFO STARTUPINFOW
# define CreateProcess CreateProcessW
#endif
@@ -683,7 +682,7 @@ windows_make_so (const char *name, LPVOID load_addr)
strcat (buf, "\\ntdll.dll");
}
#else
- cygwin_buf_t buf[__PMAX];
+ wchar_t buf[__PMAX];
buf[0] = 0;
if (access (name, F_OK) != 0)
@@ -2340,13 +2339,13 @@ windows_nat_target::create_inferior (const char *exec_file,
{
STARTUPINFO si;
#ifdef __CYGWIN__
- cygwin_buf_t real_path[__PMAX];
- cygwin_buf_t shell[__PMAX]; /* Path to shell */
- cygwin_buf_t infcwd[__PMAX];
+ wchar_t real_path[__PMAX];
+ wchar_t shell[__PMAX]; /* Path to shell */
+ wchar_t infcwd[__PMAX];
const char *sh;
- cygwin_buf_t *toexec;
- cygwin_buf_t *cygallargs;
- cygwin_buf_t *args;
+ wchar_t *toexec;
+ wchar_t *cygallargs;
+ wchar_t *args;
char **old_env = NULL;
PWCHAR w32_env;
size_t len;
@@ -2403,7 +2402,7 @@ windows_nat_target::create_inferior (const char *exec_file,
{
flags |= DEBUG_ONLY_THIS_PROCESS;
if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, exec_file, real_path,
- __PMAX * sizeof (cygwin_buf_t)) < 0)
+ __PMAX * sizeof (wchar_t)) < 0)
error (_("Error starting executable: %d"), errno);
toexec = real_path;
#ifdef __USEWIDE
@@ -2442,13 +2441,13 @@ windows_nat_target::create_inferior (const char *exec_file,
error (_("Error converting inferior cwd: %d"), errno);
#ifdef __USEWIDE
- args = (cygwin_buf_t *) alloca ((wcslen (toexec) + wcslen (cygallargs) + 2)
+ args = (wchar_t *) alloca ((wcslen (toexec) + wcslen (cygallargs) + 2)
* sizeof (wchar_t));
wcscpy (args, toexec);
wcscat (args, L" ");
wcscat (args, cygallargs);
#else /* !__USEWIDE */
- args = (cygwin_buf_t *) alloca (strlen (toexec) + strlen (cygallargs) + 2);
+ args = (char *) alloca (strlen (toexec) + strlen (cygallargs) + 2);
strcpy (args, toexec);
strcat (args, " ");
strcat (args, cygallargs);
--
2.36.1
next prev parent reply other threads:[~2022-06-02 14:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-02 14:12 [PATCH 0/2] Clean up some Cygwin 1.5 !__USEWIDE cruft Jon Turney
2022-06-02 14:12 ` Jon Turney [this message]
2022-06-02 14:12 ` [PATCH 2/2] Simplify __USEWIDE Jon Turney
2022-06-02 14:43 ` [PATCH 0/2] Clean up some Cygwin 1.5 !__USEWIDE cruft Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220602141258.18968-2-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).