From 812394259c5a32c0054a2068db00e7e2a4b03dc7 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Thu, 7 Apr 2011 23:59:59 +0000 Subject: [PATCH] Remove support for old Cygwin 1.5 versions. * win32-low.c (win32_create_inferior): Use new cygwin_path_list function to avoid warning. (win32_add_one_solib): Use cygwin_conv_path function to avoid warning. --- gdb/gdbserver/ChangeLog | 8 ++++++++ gdb/gdbserver/win32-low.c | 12 +++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 33d080fbea4..a633155e716 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,11 @@ +2011-04-07 Pierre Muller + + Remove support for old Cygwin 1.5 versions. + * win32-low.c (win32_create_inferior): Use new cygwin_path_list + function to avoid warning. + (win32_add_one_solib): Use cygwin_conv_path function to avoid + warning. + 2011-03-18 Pierre Muller * gdbserver/server.h (Macro _): Define it if not available. diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index b47081b7079..51bc1d65a3e 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -536,13 +536,15 @@ win32_create_inferior (char *program, char **program_args) path_ptr = getenv ("PATH"); if (path_ptr) { + int size = cygwin_conv_path_list (CCP_POSIX_TO_WIN_A, path_ptr, NULL, 0); orig_path = alloca (strlen (path_ptr) + 1); - new_path = alloca (cygwin_posix_to_win32_path_list_buf_size (path_ptr)); + new_path = alloca (size); strcpy (orig_path, path_ptr); - cygwin_posix_to_win32_path_list (path_ptr, new_path); + cygwin_conv_path_list (CCP_POSIX_TO_WIN_A, path_ptr, new_path, size); setenv ("PATH", new_path, 1); - } - cygwin_conv_to_win32_path (program, real_path); + } + cygwin_conv_path (CCP_POSIX_TO_WIN_A, program, real_path, + MAXPATHLEN); program = real_path; #endif @@ -925,7 +927,7 @@ win32_add_one_solib (const char *name, CORE_ADDR load_addr) #endif #ifdef __CYGWIN__ - cygwin_conv_to_posix_path (buf, buf2); + cygwin_conv_path (CCP_WIN_A_TO_POSIX, buf, buf2, sizeof (buf2)); #else strcpy (buf2, buf); #endif -- 2.30.2