diff mbox

[2/7] Use readlink unconditionally

Message ID 1416980800-21408-3-git-send-email-yao@codesourcery.com
State New
Headers show

Commit Message

Yao Qi Nov. 26, 2014, 5:46 a.m. UTC
Since readlink module is imported, we can use it unconditionally.
This patch is to remove configure checks and HAVE_READLINK checks in
code.  It was mentioned in the patch below

  [RFA/commit] gdbserver: return ENOSYS if readlink not supported.
  https://sourceware.org/ml/gdb-patches/2012-02/msg00148.html

to use readlink in gdbserver, but we chose something simple at that
moment.

gdb:

2014-11-26  Yao Qi  <yao@codesourcery.com>

	* configure.ac (AC_CHECK_FUNCS): Remove readlink.
	* config.in, configure: Re-generate.
	* inf-child.c (inf_child_fileio_readlink): Don't check
	HAVE_READLINK is defined.

gdb/gdbserver:

2014-11-26  Yao Qi  <yao@codesourcery.com>

	* configure.ac(AC_CHECK_FUNCS): Remove readlink.
	* config.in, configure: Re-generate.
	* hostio.c (handle_unlink): Remove code checking HAVE_READLINK
	is defined.
---
 gdb/config.in              | 3 ---
 gdb/configure              | 2 +-
 gdb/configure.ac           | 2 +-
 gdb/gdbserver/config.in    | 3 ---
 gdb/gdbserver/configure    | 2 +-
 gdb/gdbserver/configure.ac | 2 +-
 gdb/gdbserver/hostio.c     | 4 ----
 gdb/inf-child.c            | 2 +-
 8 files changed, 5 insertions(+), 15 deletions(-)
diff mbox

Patch

diff --git a/gdb/config.in b/gdb/config.in
index f1593bd..80b988b 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -330,9 +330,6 @@ 
 /* Define if Python interpreter is being linked in. */
 #undef HAVE_PYTHON
 
-/* Define to 1 if you have the `readlink' function. */
-#undef HAVE_READLINK
-
 /* Define to 1 if you have the `realpath' function. */
 #undef HAVE_REALPATH
 
diff --git a/gdb/configure b/gdb/configure
index ade1755..e1c0a10 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -10479,7 +10479,7 @@  $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
 fi
 
 for ac_func in canonicalize_file_name realpath getrusage getuid getgid \
-		pipe poll pread pread64 pwrite readlink resize_term \
+		pipe poll pread pread64 pwrite resize_term \
 		sbrk setpgid setpgrp setsid \
 		sigaction sigprocmask sigsetmask socketpair \
 		ttrace wborder wresize setlocale iconvlist libiconvlist btowc \
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 98eb57b..bcf1ef2 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1305,7 +1305,7 @@  AC_C_BIGENDIAN
 AC_FUNC_MMAP
 AC_FUNC_VFORK
 AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid getgid \
-		pipe poll pread pread64 pwrite readlink resize_term \
+		pipe poll pread pread64 pwrite resize_term \
 		sbrk setpgid setpgrp setsid \
 		sigaction sigprocmask sigsetmask socketpair \
 		ttrace wborder wresize setlocale iconvlist libiconvlist btowc \
diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
index 8cac205..fd80adc 100644
--- a/gdb/gdbserver/config.in
+++ b/gdb/gdbserver/config.in
@@ -142,9 +142,6 @@ 
 /* Define to 1 if you have the `pwrite' function. */
 #undef HAVE_PWRITE
 
-/* Define to 1 if you have the `readlink' function. */
-#undef HAVE_READLINK
-
 /* Define to 1 if you have the <sgtty.h> header file. */
 #undef HAVE_SGTTY_H
 
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 2266617..45838f5 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -4727,7 +4727,7 @@  fi
 
 done
 
-for ac_func in pread pwrite pread64 readlink
+for ac_func in pread pwrite pread64
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 3864ff4..f59e65b 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -83,7 +83,7 @@  AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl
 		 fcntl.h signal.h sys/file.h dnl
 		 sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl
 		 netinet/tcp.h arpa/inet.h)
-AC_CHECK_FUNCS(pread pwrite pread64 readlink)
+AC_CHECK_FUNCS(pread pwrite pread64)
 
 GDB_AC_COMMON
 
diff --git a/gdb/gdbserver/hostio.c b/gdb/gdbserver/hostio.c
index 1d7a092..8435ecb 100644
--- a/gdb/gdbserver/hostio.c
+++ b/gdb/gdbserver/hostio.c
@@ -478,7 +478,6 @@  handle_unlink (char *own_buf)
 static void
 handle_readlink (char *own_buf, int *new_packet_len)
 {
-#if defined (HAVE_READLINK)
   char filename[HOSTIO_PATH_MAX], linkname[HOSTIO_PATH_MAX];
   char *p;
   int ret, bytes_sent;
@@ -505,9 +504,6 @@  handle_readlink (char *own_buf, int *new_packet_len)
      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.  */
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index 9867ee6..3166c4d 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -412,7 +412,7 @@  inf_child_fileio_readlink (struct target_ops *self,
 {
   /* We support readlink only on systems that also provide a compile-time
      maximum path length (PATH_MAX), at least for now.  */
-#if defined (HAVE_READLINK) && defined (PATH_MAX)
+#if defined (PATH_MAX)
   char buf[PATH_MAX];
   int len;
   char *ret;