Re: [rfc] Remote file transfer support

['Daniel Jacobowitz' <drow at false dot org>]

On Mon, Dec 03, 2007 at 10:51:08AM +0100, Pierre Muller wrote:
>   Daniel,
> 
>   your patch breaks compilation of gdbserver on mingw32
> host.
>   The problem is that pread and pwrite do not seem
> to be implemented:
> gcc -Wall -g -O2    -I. -I../../../purecvs/gdb/gdbserver
> -I../../../purecvs/gdb/gdbserver/../regformats
> -I../../../purecvs/gdb/gdbserver/../../include -I../../bfd
> -I../../../purecvs/gdb/gdbserver/../../bfd   -o gdbserver.exe inferiors.o
> regcache.o remote-utils.o server.o signals.o target.o utils.o version.o
> mem-break.o hostio.o  reg-i386.o win32-low.o win32-i386-low.o  \
>            -lwsock32
> hostio.o: In function
> `handle_vFile':c:/cygwin/usr/local/src/cvs/build-mingw/gdb/gdbserver/../../.
> ./purecvs/gdb/gdbserver/hostio.c:380: undefined reference to `pread'
> :c:/cygwin/usr/local/src/cvs/build-mingw/gdb/gdbserver/../../../purecvs/gdb/
> gdbserver/hostio.c:422: undefined reference to `pwrite'
> collect2: ld returned 1 exit status
> make[2]: *** [gdbserver.exe] Error 1
> 
>   Can this be fixed?

Sorry, I should have remembered that.  Does this patch work?

-- 
Daniel Jacobowitz
CodeSourcery

2007-12-03  Daniel Jacobowitz  <dan@codesourcery.com>

	* config.in, configure: Regenerated.
	* configure.ac: Check for pread and pwrite.
	* hostio.c (handle_pread): Fall back to lseek and read.
	(handle_pwrite): Fall back to lseek and write.

Index: config.in
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/config.in,v
retrieving revision 1.19
diff -u -p -r1.19 config.in
--- config.in	19 Sep 2007 14:41:50 -0000	1.19
+++ config.in	3 Dec 2007 12:55:11 -0000
@@ -53,6 +53,9 @@
 /* Define to 1 if you have the <netinet/tcp.h> header file. */
 #undef HAVE_NETINET_TCP_H
 
+/* Define to 1 if you have the `pread' function. */
+#undef HAVE_PREAD
+
 /* Define to 1 if you have the `pread64' function. */
 #undef HAVE_PREAD64
 
@@ -72,6 +75,9 @@
 /* Define if the target supports PTRACE_GETREGS for register access. */
 #undef HAVE_PTRACE_GETREGS
 
+/* Define to 1 if you have the `pwrite' function. */
+#undef HAVE_PWRITE
+
 /* Define to 1 if you have the <sgtty.h> header file. */
 #undef HAVE_SGTTY_H
 
Index: configure
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/configure,v
retrieving revision 1.30
diff -u -p -r1.30 configure
--- configure	15 Oct 2007 19:58:17 -0000	1.30
+++ configure	3 Dec 2007 12:55:11 -0000
@@ -3099,7 +3099,9 @@ fi
 done
 
 
-for ac_func in pread64
+
+
+for ac_func in pread pwrite pread64
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: configure.ac
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/configure.ac,v
retrieving revision 1.18
diff -u -p -r1.18 configure.ac
--- configure.ac	15 Oct 2007 19:58:17 -0000	1.18
+++ configure.ac	3 Dec 2007 12:55:11 -0000
@@ -41,7 +41,7 @@ AC_CHECK_HEADERS(sgtty.h termio.h termio
  		 errno.h fcntl.h signal.h sys/file.h malloc.h dnl
 		 sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl
 		 netinet/tcp.h arpa/inet.h sys/wait.h)
-AC_CHECK_FUNCS(pread64)
+AC_CHECK_FUNCS(pread pwrite pread64)
 
 have_errno=no
 AC_MSG_CHECKING(for errno)
Index: hostio.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/hostio.c,v
retrieving revision 1.3
diff -u -p -r1.3 hostio.c
--- hostio.c	1 Dec 2007 05:00:04 -0000	1.3
+++ hostio.c	3 Dec 2007 12:55:11 -0000
@@ -377,7 +377,13 @@ handle_pread (char *own_buf, int *new_pa
     }
 
   data = malloc (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);
+#endif
 
   if (ret == -1)
     {
@@ -419,7 +425,13 @@ handle_pwrite (char *own_buf, int packet
       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);
+#endif
 
   if (ret == -1)
     {