Use readlink unconditionally

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-28  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-28  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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 66711f66d00cdcfcb863a72ebc722d68ed08723f..075abc5646077c96e9f2ec649903420d1e8769af 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-28  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.
+
 2014-11-28  Yao Qi  <yao@codesourcery.com>
 
        * gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add readlink.

diff --git a/gdb/config.in b/gdb/config.in
index f1593bd656074ed61160fd4a6b1079ddb697f981..80b988b05a9a792c8179cceafbbef1662f7e1024 100644 (file)
--- 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 ade175503006e490e3d418ac1a3093219d49e16d..e1c0a108dfce7bfbd0133e049951b122a2744689 100755 (executable)
--- 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 98eb57b5b53a05a3cf002aad2bbfdd083d27c38d..bcf1ef2ea9bbf33b9535ea1576207e5ca5391652 100644 (file)
--- 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/ChangeLog b/gdb/gdbserver/ChangeLog
index 141947089ff5cc7c49dbef53a673c33759973aa9..e378a5f5b861075ced235cc9a03e74b099ba795c 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-28  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.
+
 2014-11-21  Yao Qi  <yao@codesourcery.com>
 
        * configure.ac: Don't invoke AC_FUNC_ALLOCA.

diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
index 8cac20538ef1cbcaf463f5de8648fb5d397f8d32..fd80adc9542038c6aaf3a0edb42273ca43d479a1 100644 (file)
--- 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 22666178a013f8d6ee19aeb41928f3af1658cbdc..45838f5385609f3e7584800d61955ddd3d297e24 100755 (executable)
--- 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 3864ff469dfac32293c548ed49b8bbf7b2556bbc..f59e65b579f0274290be0003c73f0546ab0c1239 100644 (file)
--- 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 1d7a0922e3cf5183e8ba4932defc57f965ea32b6..8435ecb9f096d34776221951ee4240d1223d7dfa 100644 (file)
--- 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 9867ee6651a0004dcd8d6bd9b3df5ee31883c8a4..3166c4d4e7e325636b96f9487a59569ae73541a4 100644 (file)
--- 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;