add xfail for "print u_var" test in gdb.ada/packed_array.exp

[deliverable/binutils-gdb.git] / gdb / ser-mingw.c

diff --git a/gdb/ser-mingw.c b/gdb/ser-mingw.c
index af68c2bdcdf133114ad6e34edc20c2068f724137..6d8edcc79809c99794360bb18190f9f34cf7b347 100644 (file)
--- a/gdb/ser-mingw.c
+++ b/gdb/ser-mingw.c
@@ -1,6 +1,7 @@
 /* Serial interface for local (hardwired) serial ports on Windows systems
 
-   Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -379,7 +380,7 @@ struct ser_console_state
      the started state.  */
   HANDLE start_select;
   /* Signaled by the main program to tell the select thread to enter
-     the stopped state. */
+     the stopped state.  */
   HANDLE stop_select;
   /* Signaled by the main program to tell the select thread to
      exit.  */
@@ -516,7 +517,8 @@ console_select_thread (void *arg)
          wait_events[0] = state->stop_select;
          wait_events[1] = h;
 
-         event_index = WaitForMultipleObjects (2, wait_events, FALSE, INFINITE);
+         event_index = WaitForMultipleObjects (2, wait_events,
+                                               FALSE, INFINITE);
 
          if (event_index == WAIT_OBJECT_0
              || WaitForSingleObject (state->stop_select, 0) == WAIT_OBJECT_0)
@@ -652,7 +654,8 @@ file_select_thread (void *arg)
     {
       select_thread_wait (state);
 
-      if (SetFilePointer (h, 0, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER)
+      if (SetFilePointer (h, 0, NULL, FILE_CURRENT)
+         == INVALID_SET_FILE_POINTER)
        SetEvent (state->except_event);
       else
        SetEvent (state->read_event);
@@ -751,6 +754,7 @@ ser_console_get_tty_state (struct serial *scb)
   if (isatty (scb->fd))
     {
       struct ser_console_ttystate *state;
+
       state = (struct ser_console_ttystate *) xmalloc (sizeof *state);
       state->is_a_tty = 1;
       return state;
@@ -801,8 +805,12 @@ free_pipe_state (struct pipe_state *ps)
   if (ps->input)
     fclose (ps->input);
   if (ps->pex)
-    pex_free (ps->pex);
-  /* pex_free closes ps->output.  */
+    {
+      pex_free (ps->pex);
+      /* pex_free closes ps->output.  */
+    }
+  else if (ps->output)
+    fclose (ps->output);
 
   xfree (ps);
 
@@ -832,7 +840,7 @@ pipe_windows_open (struct serial *scb, const char *name)
   back_to = make_cleanup_freeargv (argv);
 
   if (! argv[0] || argv[0][0] == '\0')
-    error ("missing child command");
+    error (_("missing child command"));
 
   ps = make_pipe_state ();
   make_cleanup (cleanup_pipe_state, ps);
@@ -859,10 +867,10 @@ pipe_windows_open (struct serial *scb, const char *name)
            all the same information here, plus err_msg provided by
            pex_run, so we just raise the error here.  */
         if (err)
-          error ("error starting child process '%s': %s: %s",
+          error (_("error starting child process '%s': %s: %s"),
                  name, err_msg, safe_strerror (err));
         else
-          error ("error starting child process '%s': %s",
+          error (_("error starting child process '%s': %s"),
                  name, err_msg);
       }
   }
@@ -887,6 +895,30 @@ pipe_windows_open (struct serial *scb, const char *name)
   return -1;
 }
 
+static int
+pipe_windows_fdopen (struct serial *scb, int fd)
+{
+  struct pipe_state *ps;
+
+  ps = make_pipe_state ();
+
+  ps->input = fdopen (fd, "r+");
+  if (! ps->input)
+    goto fail;
+
+  ps->output = fdopen (fd, "r+");
+  if (! ps->output)
+    goto fail;
+
+  scb->fd = fd;
+  scb->state = (void *) ps;
+
+  return 0;
+
+ fail:
+  free_pipe_state (ps);
+  return -1;
+}
 
 static void
 pipe_windows_close (struct serial *scb)
@@ -985,11 +1017,20 @@ pipe_avail (struct serial *scb, int fd)
   HANDLE h = (HANDLE) _get_osfhandle (fd);
   DWORD numBytes;
   BOOL r = PeekNamedPipe (h, NULL, 0, NULL, &numBytes, NULL);
+
   if (r == FALSE)
     numBytes = 0;
   return numBytes;
 }
 
+int
+gdb_pipe (int pdes[2])
+{
+  if (_pipe (pdes, 512, _O_BINARY | _O_NOINHERIT) == -1)
+    return -1;
+  return 0;
+}
+
 struct net_windows_state
 {
   struct ser_console_state base;
@@ -1228,6 +1269,7 @@ _initialize_ser_windows (void)
   ops->next = 0;
   ops->open = pipe_windows_open;
   ops->close = pipe_windows_close;
+  ops->fdopen = pipe_windows_fdopen;
   ops->readchar = ser_base_readchar;
   ops->write = ser_base_write;
   ops->flush_output = ser_base_flush_output;