* config/slite-gdb.exp (gdb_start): Use "full_buffer", not

[binutils.git] / gdb / win32-nat.c

diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 82b5e0ba9362df2b3e1f654ec90c5dc1b37eea1b..81a8a0662f4d9b8e0b3b3e415f409dc64ab5e46a 100644 (file)
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -1,8 +1,7 @@
 /* Target-vector operations for controlling win32 child processes, for GDB.
 /* Target-vector operations for controlling win32 child processes, for GDB.

-   Copyright 1995, 1996
-   Free Software Foundation, Inc.
-
+   Copyright 1995, 1996 Free Software Foundation, Inc.

    Contributed by Cygnus Support.
    Contributed by Cygnus Support.

+

    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify


@@ -21,6 +20,8 @@
 
 /* by Steve Chamberlain, [email protected] */
 
 
 /* by Steve Chamberlain, [email protected] */
 

+/* We assume we're being built with and will be used for cygwin32.  */
+

 #include "defs.h"
 #include "frame.h"             /* required by inferior.h */
 #include "inferior.h"
 #include "defs.h"
 #include "frame.h"             /* required by inferior.h */
 #include "inferior.h"


@@ -39,6 +40,7 @@
 #include "gdbthread.h"
 #include "gdbcmd.h"
 #include <sys/param.h>
 #include "gdbthread.h"
 #include "gdbcmd.h"
 #include <sys/param.h>

+#include <unistd.h>

 
 #define CHECK(x)       check (x, __FILE__,__LINE__)
 #define DEBUG_EXEC(x)  if (debug_exec)         printf x
 
 #define CHECK(x)       check (x, __FILE__,__LINE__)
 #define DEBUG_EXEC(x)  if (debug_exec)         printf x


@@ -49,6 +51,8 @@
 /* Forward declaration */
 extern struct target_ops child_ops;
 
 /* Forward declaration */
 extern struct target_ops child_ops;
 

+static void child_stop PARAMS ((void));
+

 /* The most recently read context. Inspect ContextFlags to see what 
    bits are valid. */
 
 /* The most recently read context. Inspect ContextFlags to see what 
    bits are valid. */
 


@@ -68,7 +72,6 @@ static int event_count = 0;
 /* User options. */
 static int new_console = 0;
 static int new_group = 0;
 /* User options. */
 static int new_console = 0;
 static int new_group = 0;

-static int dos_path_style = 0;

 static int debug_exec = 0;             /* show execution */
 static int debug_events = 0;           /* show events from kernel */
 static int debug_memory = 0;           /* show target memory accesses */
 static int debug_exec = 0;             /* show execution */
 static int debug_events = 0;           /* show events from kernel */
 static int debug_memory = 0;           /* show target memory accesses */


@@ -326,8 +329,8 @@ handle_load_dll (char *eventp)
                             &done);
        }
 
                             &done);
        }
 

-
-      dos_path_to_unix_path (dll_name, unix_dll_name);
+      /* FIXME: Can we delete this call?  */
+      cygwin32_conv_to_posix_path (dll_name, unix_dll_name);

 
       /* FIXME!! It would be nice to define one symbol which pointed to the 
          front of the dll if we can't find any symbols. */
 
       /* FIXME!! It would be nice to define one symbol which pointed to the 
          front of the dll if we can't find any symbols. */


@@ -597,138 +600,6 @@ child_open (arg, from_tty)
   error ("Use the \"run\" command to start a Unix child process.");
 }
 
   error ("Use the \"run\" command to start a Unix child process.");
 }
 

-
-/* Convert a unix-style set-of-paths (a colon-separated list of directory
-   paths with forward slashes) into the dos style (semicolon-separated 
-   list with backward slashes), simultaneously undoing any translations
-   performed by the mount table. */
-
-static char *buf = NULL;
-static int blen = 2000;
-
-static char *
-unix_paths_to_dos_paths(char *newenv)
-{
-  int ei;
-  char *src;
-
-  if (buf == 0)
-    buf = (char *) malloc(blen);
-
-  if (newenv == 0 || *newenv == 0 ||
-     (src = strchr(newenv, '=')) == 0) /* find the equals sign */
-    return 0;
-
-  src++;                               /* now skip past it */
-
-  if (src[0] == '/' ||                 /* is this a unix style path? */
-     (src[0] == '.' && src[1] == '/') ||
-     (src[0] == '.' && src[1] == '.' && src[2] == '/'))
-    { /* we accept that we will fail on a relative path like 'foo/mumble' */
-      /* Found an env name, turn from unix style into dos style */
-      int len = src - newenv;
-      char *dir = buf + len;
-
-      memcpy(buf, newenv, len);
-      /* Split out the colons */
-      while (1)
-       {
-         char *tok = strchr (src, ':');
-         int doff = dir - buf;
-
-         if (doff + MAX_PATH > blen) 
-           {
-             blen *= 2;
-             buf = (char *) realloc((void *) buf, blen);
-             dir = buf + doff;
-           }
-         if (tok)
-           {
-             *tok = 0;
-                   cygwin32_unix_path_to_dos_path_keep_rel (src, dir);
-             *tok = ':';
-             dir += strlen(dir);
-             src = tok + 1;
-             *dir++ = ';';
-           }
-         else
-           {
-      cygwin32_unix_path_to_dos_path_keep_rel (src, dir);
-             dir += strlen(dir);
-             *dir++ = 0;
-             break;
-           }
-       }
-      return buf;
-    }
-  return 0;
-}
-
-/* Convert a dos-style set-of-paths (a semicolon-separated list with
-   backward slashes) into the dos style (colon-separated list of
-   directory paths with forward slashes), simultaneously undoing any
-   translations performed by the mount table. */
-
-static char *
-dos_paths_to_unix_paths(char *newenv)
-{
-  int ei;
-  char *src;
-
-  if (buf == 0)
-    buf = (char *) malloc(blen);
-
-  if (newenv == 0 || *newenv == 0 ||
-     (src = strchr(newenv, '=')) == 0) /* find the equals sign */
-    return 0;
-
-  src++;                               /* now skip past it */
-
-  if (src[0] == '\\' ||                /* is this a dos style path? */
-     (isalpha(src[0]) && src[1] == ':' && src[2] == '\\') ||
-     (src[0] == '.' && src[1] == '\\') ||
-     (src[0] == '.' && src[1] == '.' && src[2] == '\\'))
-    { /* we accept that we will fail on a relative path like 'foo\mumble' */
-      /* Found an env name, turn from dos style into unix style */
-      int len = src - newenv;
-      char *dir = buf + len;
-
-      memcpy(buf, newenv, len);
-      /* Split out the colons */
-      while (1)
-       {
-         char *tok = strchr (src, ';');
-         int doff = dir - buf;
-         
-         if (doff + MAX_PATH > blen) 
-           {
-             blen *= 2;
-             buf = (char *) realloc((void *) buf, blen);
-             dir = buf + doff;
-           }
-         if (tok)
-           {
-             *tok = 0;
-                cygwin32_dos_path_to_unix_path_keep_rel (src, dir);
-             *tok = ';';
-             dir += strlen(dir);
-             src = tok + 1;
-             *dir++ = ':';
-           }
-         else
-           {
-                cygwin32_dos_path_to_unix_path_keep_rel (src, dir);
-             dir += strlen(dir);
-             *dir++ = 0;
-             break;
-           }
-       }
-      return buf;
-    }
-  return 0;
-}
-
-

 /* Start an inferior win32 child process and sets inferior_pid to its pid.
    EXEC_FILE is the file to run.
    ALLARGS is a string containing the arguments to the program.
 /* Start an inferior win32 child process and sets inferior_pid to its pid.
    EXEC_FILE is the file to run.
    ALLARGS is a string containing the arguments to the program.


@@ -761,7 +632,7 @@ child_create_inferior (exec_file, allargs, env)
   memset (&si, 0, sizeof (si));
   si.cb = sizeof (si);
 
   memset (&si, 0, sizeof (si));
   si.cb = sizeof (si);
 

-  unix_path_to_dos_path (exec_file, real_path);
+  cygwin32_conv_to_win32_path (exec_file, real_path);

 
   flags = DEBUG_ONLY_THIS_PROCESS; 
 
 
   flags = DEBUG_ONLY_THIS_PROCESS; 
 


@@ -778,46 +649,78 @@ child_create_inferior (exec_file, allargs, env)
   strcat (args, " ");
   strcat (args, allargs);
 
   strcat (args, " ");
   strcat (args, allargs);
 

-#if 0
-  /* get total size for env strings */
-  for (envlen = 0, i = 0; env[i] && *env[i]; i++)
-    envlen += strlen(env[i]) + 1;       
-#else
-  /* get total size for env strings */
-  for (envlen = 0, i = 0; env[i] && *env[i]; i++)
-    {
-#if 0
-      winenv = 0;
-#else
-      winenv = unix_paths_to_dos_paths(env[i]);
-#endif
-      envlen += winenv ? strlen(winenv) + 1 : strlen(env[i]) + 1;
-    }
-#endif
-
-  winenv = alloca(2 * envlen + 1);     /* allocate new buffer */
-
-  /* copy env strings into new buffer */
-  for (temp = winenv, i = 0; env[i] && *env[i];     i++) 
-    {
-#if 0
-      char *p = 0;
-#else
-      char *p = unix_paths_to_dos_paths(env[i]);
-#endif
-      strcpy(temp, p ? p : env[i]);
-      temp += strlen(temp) + 1;
-    }
-#if 0
-  /* copy env strings into new buffer */
-  for (temp = winenv, i = 0; env[i] && *env[i];     i++) 
-    {
-      strcpy(temp, env[i]);
-      temp += strlen(temp) + 1;
-    }
-#endif
-
-  *temp = 0;                   /* final nil string to terminate new env */
+  /* Prepare the environment vars for CreateProcess.  */
+  {
+    /* This code use to assume all env vars were file names and would
+       translate them all to win32 style.  That obviously doesn't work in the
+       general case.  The current rule is that we only translate PATH.
+       We need to handle PATH because we're about to call CreateProcess and
+       it uses PATH to find DLL's.  Fortunately PATH has a well-defined value
+       in both posix and win32 environments.  cygwin.dll will change it back
+       to posix style if necessary.  */
+
+    static const char *conv_path_names[] =
+      {
+       "PATH=",
+       0
+      };
+
+    /* CreateProcess takes the environment list as a null terminated set of
+       strings (i.e. two nulls terminate the list).  */
+
+    /* Get total size for env strings.  */
+    for (envlen = 0, i = 0; env[i] && *env[i]; i++)
+      {
+       int j, len;
+
+       for (j = 0; conv_path_names[j]; j++)
+         {
+           len = strlen (conv_path_names[j]);
+           if (strncmp (conv_path_names[j], env[i], len) == 0)
+             {
+               if (cygwin32_posix_path_list_p (env[i] + len))
+                 envlen += len
+                   + cygwin32_posix_to_win32_path_list_buf_size (env[i] + len);
+               else
+                 envlen += strlen (env[i]) + 1;
+               break;
+             }
+         }
+       if (conv_path_names[j] == NULL)
+         envlen += strlen (env[i]) + 1;
+      }
+
+    winenv = alloca (envlen + 1);
+
+    /* Copy env strings into new buffer.  */
+    for (temp = winenv, i = 0; env[i] && *env[i]; i++) 
+      {
+       int j, len;
+
+       for (j = 0; conv_path_names[j]; j++)
+         {
+           len = strlen (conv_path_names[j]);
+           if (strncmp (conv_path_names[j], env[i], len) == 0)
+             {
+               if (cygwin32_posix_path_list_p (env[i] + len))
+                 {
+                   memcpy (temp, env[i], len);
+                   cygwin32_posix_to_win32_path_list (env[i] + len, temp + len);
+                 }
+               else
+                 strcpy (temp, env[i]);
+               break;
+             }
+         }
+       if (conv_path_names[j] == NULL)
+         strcpy (temp, env[i]);
+
+       temp += strlen (temp) + 1;
+      }
+
+    /* Final nil string to terminate new env.  */
+    *temp = 0;
+  }

 
   ret = CreateProcess (0,
                       args,    /* command line */
 
   ret = CreateProcess (0,
                       args,    /* command line */


@@ -864,7 +767,7 @@ child_mourn_inferior ()
 /* Send a SIGINT to the process group.  This acts just like the user typed a
    ^C on the controlling terminal. */
 
 /* Send a SIGINT to the process group.  This acts just like the user typed a
    ^C on the controlling terminal. */
 

-void
+static void

 child_stop ()
 {
   DEBUG_EVENTS (("gdb: GenerateConsoleCtrlEvent (CTRLC_EVENT, 0)\n"));
 child_stop ()
 {
   DEBUG_EVENTS (("gdb: GenerateConsoleCtrlEvent (CTRLC_EVENT, 0)\n"));


@@ -1000,41 +903,6 @@ struct target_ops child_ops =
   OPS_MAGIC                    /* to_magic */
 };
 
   OPS_MAGIC                    /* to_magic */
 };
 

-#include "environ.h"
-
-static void
-set_pathstyle_dos(args, from_tty, c)
-     char *args;
-     int from_tty;
-     struct cmd_list_element *c;
-{
-  char **vector = environ_vector(inferior_environ);
-  char *thisvar;
-  int dos = *(int *) c->var;
-
-  if (info_verbose)
-    printf_unfiltered ("Change dos_path_style to %s\n", dos ? "true":"false");
-
-  while (vector && *vector) 
-    {
-      if (dos)
-       thisvar = unix_paths_to_dos_paths(*vector);
-      else
-       thisvar = dos_paths_to_unix_paths(*vector);
-
-      if (thisvar) 
-       {
-         if (info_verbose)
-           printf_unfiltered ("Change %s\nto %s\n", *vector, thisvar);
-         free(*vector);
-         *vector = xmalloc(strlen(thisvar) + 1);
-         strcpy(*vector, thisvar);
-       }
-      vector++;
-    }
-}
-
-

 void
 _initialize_inftarg ()
 {
 void
 _initialize_inftarg ()
 {


@@ -1054,15 +922,6 @@ _initialize_inftarg ()
                  &setlist),
      &showlist);
 
                  &setlist),
      &showlist);
 

-  add_show_from_set
-    (c = add_set_cmd ("dos-path-style", class_support, var_boolean,
-                     (char *) &dos_path_style,
-                     "Set whether paths in child's environment are shown in dos style.",
-                 &setlist),
-     &showlist);
-
-  c->function.sfunc = set_pathstyle_dos;
-

   add_show_from_set
     (add_set_cmd ("debugexec", class_support, var_boolean,
                  (char *) &debug_exec,
   add_show_from_set
     (add_set_cmd ("debugexec", class_support, var_boolean,
                  (char *) &debug_exec,