[RFA 2/2] Remove old Cygwin1.5 support

Pierre Muller pierre.muller@ics-cnrs.unistra.fr
Wed Apr 6 22:58:00 GMT 2011


Second part of the patch,

This part updates gdbserver/win32-low.c to use the
new cygwin_conv_path and cygwin_conv_path_list functions
in order to avoid build failure due to deprecated warning.

  Christopher, is this patch acceptable as is?

Pierre Muller.

2011-04-07  Pierre Muller  <muller@ics.u-strasbg.fr>

	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.


diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index b47081b..9cdd1b4 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 len = 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 (len);
       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, len);
       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



More information about the Gdb-patches mailing list