Merge GDB 7.5.1

gdb/gdbserver/hostio.c

 /* Host file transfer support for gdbserver.
    Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    Contributed by CodeSourcery.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 310 matching lines @@
       || require_end (p))
     {
       hostio_packet_error (own_buf);
       return;
     }
 
   data = xmalloc (len);
 #ifdef HAVE_PREAD
   ret = pread (fd, data, len, offset);
 #else
-  ret = lseek (fd, offset, SEEK_SET);
-  if (ret != -1)
-    ret = read (fd, data, len);
+  ret = -1;
 #endif
+  /* If we have no pread or it failed for this file, use lseek/read.  */
+  if (ret == -1)
+    {
+      ret = lseek (fd, offset, SEEK_SET);
+      if (ret != -1)
+        ret = read (fd, data, len);
+    }
 
   if (ret == -1)
     {
       hostio_error (own_buf);
       free (data);
       return;
     }
 
   bytes_sent = hostio_reply_with_data (own_buf, data, ret, new_packet_len);
 
@@ skipping 24 matching lines @@
       || require_comma (&p)
       || require_data (p, packet_len - (p - own_buf), &data, &len))
     {
       hostio_packet_error (own_buf);
       return;
     }
 
 #ifdef HAVE_PWRITE
   ret = pwrite (fd, data, len, offset);
 #else
-  ret = lseek (fd, offset, SEEK_SET);
-  if (ret != -1)
-    ret = write (fd, data, len);
+  ret = -1;
 #endif
+  /* If we have no pwrite or it failed for this file, use lseek/write.  */
+  if (ret == -1)
+    {
+      ret = lseek (fd, offset, SEEK_SET);
+      if (ret != -1)
+        ret = write (fd, data, len);
+    }
 
   if (ret == -1)
     {
       hostio_error (own_buf);
       free (data);
       return;
     }
 
   hostio_reply (own_buf, ret);
   free (data);
@@ skipping 56 matching lines @@
 
   if (ret == -1)
     {
       hostio_error (own_buf);
       return;
     }
 
   hostio_reply (own_buf, ret);
 }
 
+static void
+handle_readlink (char *own_buf, int *new_packet_len)
+{
+#if defined (HAVE_READLINK)
+  char filename[PATH_MAX], linkname[PATH_MAX];
+  char *p;
+  int ret, bytes_sent;
+
+  p = own_buf + strlen ("vFile:readlink:");
+
+  if (require_filename (&p, filename)
+      || require_end (p))
+    {
+      hostio_packet_error (own_buf);
+      return;
+    }
+
+  ret = readlink (filename, linkname, sizeof linkname);
+  if (ret == -1)
+    {
+      hostio_error (own_buf);
+      return;
+    }
+
+  bytes_sent = hostio_reply_with_data (own_buf, linkname, ret, new_packet_len);
+
+  /* If the response does not fit into a single packet, do not attempt
+     to return a partial response, but simply fail.  */
+  if (bytes_sent < ret)
+    sprintf (own_buf, "F-1,%x", FILEIO_ENAMETOOLONG);
+#else /* ! HAVE_READLINK */
+    sprintf (own_buf, "F-1,%x", FILEIO_ENOSYS);
+#endif
+}
+
 /* Handle all the 'F' file transfer packets.  */
 
 int
 handle_vFile (char *own_buf, int packet_len, int *new_packet_len)
 {
   if (strncmp (own_buf, "vFile:open:", 11) == 0)
     handle_open (own_buf);
   else if (strncmp (own_buf, "vFile:pread:", 11) == 0)
     handle_pread (own_buf, new_packet_len);
   else if (strncmp (own_buf, "vFile:pwrite:", 12) == 0)
     handle_pwrite (own_buf, packet_len);
   else if (strncmp (own_buf, "vFile:close:", 12) == 0)
     handle_close (own_buf);
   else if (strncmp (own_buf, "vFile:unlink:", 13) == 0)
     handle_unlink (own_buf);
+  else if (strncmp (own_buf, "vFile:readlink:", 15) == 0)
+    handle_readlink (own_buf, new_packet_len);
   else
     return 0;
 
   return 1;
 }