From: Yao Qi <yao@codesourcery.com>
To: <gdb-patches@sourceware.org>
Subject: [PATCH 6/7] Use canonicalize_file_name unconditionally
Date: Wed, 26 Nov 2014 05:47:00 -0000 [thread overview]
Message-ID: <1416980800-21408-7-git-send-email-yao@codesourcery.com> (raw)
In-Reply-To: <1416980800-21408-1-git-send-email-yao@codesourcery.com>
As gnulib module canonicalize-lgpl is imported, we can use
canonicalize_file_name and realpath unconditionally.
gdb:
2014-11-26 Yao Qi <yao@codesourcery.com>
* configure.ac (AC_CHECK_FUNCS): Remove canonicalize_file_name
and realpath.
* config.in: Re-generated.
* configure: Re-generated.
* utils.c (gdb_realpath): Remove code calling realpath,
canonicalize_file_name and pathconf.
[!_WIN32]: Call canonicalize_file_name.
---
gdb/config.in | 6 -----
gdb/configure | 2 +-
gdb/configure.ac | 2 +-
gdb/utils.c | 68 ++++++--------------------------------------------------
4 files changed, 9 insertions(+), 69 deletions(-)
diff --git a/gdb/config.in b/gdb/config.in
index 8c5a710..fb3c315 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -75,9 +75,6 @@
/* Define to 1 if you have the `btowc' function. */
#undef HAVE_BTOWC
-/* Define to 1 if you have the `canonicalize_file_name' function. */
-#undef HAVE_CANONICALIZE_FILE_NAME
-
/* Define to 1 if you have the <cursesX.h> header file. */
#undef HAVE_CURSESX_H
@@ -327,9 +324,6 @@
/* Define if Python interpreter is being linked in. */
#undef HAVE_PYTHON
-/* Define to 1 if you have the `realpath' function. */
-#undef HAVE_REALPATH
-
/* Define to 1 if you have the `resize_term' function. */
#undef HAVE_RESIZE_TERM
diff --git a/gdb/configure b/gdb/configure
index 0c04eba..5f52e91 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -10478,7 +10478,7 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
fi
-for ac_func in canonicalize_file_name realpath getrusage getuid getgid \
+for ac_func in getrusage getuid getgid \
pipe poll pread pread64 pwrite resize_term \
sbrk setpgid setpgrp setsid \
sigaction sigprocmask sigsetmask socketpair \
diff --git a/gdb/configure.ac b/gdb/configure.ac
index f8c32ad..84232f2 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1304,7 +1304,7 @@ AC_C_BIGENDIAN
AC_FUNC_MMAP
AC_FUNC_VFORK
-AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid getgid \
+AC_CHECK_FUNCS([getrusage getuid getgid \
pipe poll pread pread64 pwrite resize_term \
sbrk setpgid setpgrp setsid \
sigaction sigprocmask sigsetmask socketpair \
diff --git a/gdb/utils.c b/gdb/utils.c
index ff5c00d..b3720f6 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2868,67 +2868,6 @@ string_to_core_addr (const char *my_string)
char *
gdb_realpath (const char *filename)
{
- /* Method 1: The system has a compile time upper bound on a filename
- path. Use that and realpath() to canonicalize the name. This is
- the most common case. Note that, if there isn't a compile time
- upper bound, you want to avoid realpath() at all costs. */
-#if defined (HAVE_REALPATH) && defined (PATH_MAX)
- {
- char buf[PATH_MAX];
- const char *rp = realpath (filename, buf);
-
- if (rp == NULL)
- rp = filename;
- return xstrdup (rp);
- }
-#endif /* HAVE_REALPATH */
-
- /* Method 2: The host system (i.e., GNU) has the function
- canonicalize_file_name() which malloc's a chunk of memory and
- returns that, use that. */
-#if defined(HAVE_CANONICALIZE_FILE_NAME)
- {
- char *rp = canonicalize_file_name (filename);
-
- if (rp == NULL)
- return xstrdup (filename);
- else
- return rp;
- }
-#endif
-
- /* FIXME: cagney/2002-11-13:
-
- Method 2a: Use realpath() with a NULL buffer. Some systems, due
- to the problems described in method 3, have modified their
- realpath() implementation so that it will allocate a buffer when
- NULL is passed in. Before this can be used, though, some sort of
- configure time test would need to be added. Otherwize the code
- will likely core dump. */
-
- /* Method 3: Now we're getting desperate! The system doesn't have a
- compile time buffer size and no alternative function. Query the
- OS, using pathconf(), for the buffer limit. Care is needed
- though, some systems do not limit PATH_MAX (return -1 for
- pathconf()) making it impossible to pass a correctly sized buffer
- to realpath() (it could always overflow). On those systems, we
- skip this. */
-#if defined (HAVE_REALPATH) && defined (_PC_PATH_MAX)
- {
- /* Find out the max path size. */
- long path_max = pathconf ("/", _PC_PATH_MAX);
-
- if (path_max > 0)
- {
- /* PATH_MAX is bounded. */
- char *buf = alloca (path_max);
- char *rp = realpath (filename, buf);
-
- return xstrdup (rp ? rp : filename);
- }
- }
-#endif
-
/* The MS Windows method. If we don't have realpath, we assume we
don't have symlinks and just canonicalize to a Windows absolute
path. GetFullPath converts ../ and ./ in relative paths to
@@ -2946,6 +2885,13 @@ gdb_realpath (const char *filename)
if (len > 0 && len < MAX_PATH)
return xstrdup (buf);
}
+#else
+ {
+ char *rp = canonicalize_file_name (filename);
+
+ if (rp != NULL)
+ return rp;
+ }
#endif
/* This system is a lost cause, just dup the buffer. */
--
1.9.3
next prev parent reply other threads:[~2014-11-26 5:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 5:46 [PATCH 0/7 V2] Import the rename gnulib module Yao Qi
2014-11-26 5:46 ` [PATCH 1/7] Import readlink Yao Qi
2014-12-03 10:48 ` Joel Brobecker
2014-12-03 12:08 ` [RFA] configure gdb/gnulib with --disable-largefile if largefile support disabled Joel Brobecker
2014-12-03 17:59 ` Eli Zaretskii
2014-12-04 3:18 ` Joel Brobecker
2014-12-04 6:47 ` Eli Zaretskii
2014-12-13 16:29 ` Joel Brobecker
2014-12-04 2:17 ` Yao Qi
2014-12-13 14:46 ` pushed: " Joel Brobecker
2014-11-26 5:46 ` [PATCH 2/7] Use readlink unconditionally Yao Qi
2014-11-26 5:47 ` [PATCH 4/7] Use lstat unconditionally Yao Qi
2014-11-26 5:47 ` [PATCH 7/7] Import rename module Yao Qi
2014-11-26 5:47 ` [PATCH 5/7] Import canonicalize-lgpl Yao Qi
2014-11-26 5:47 ` [PATCH 3/7] Import lstat Yao Qi
2014-12-02 17:01 ` Joel Brobecker
2014-12-03 9:48 ` [pushed] callback.h:struct host_callback_struct compilation error on Windows hosts Joel Brobecker
2014-12-04 1:09 ` Yao Qi
2014-12-04 5:42 ` Joel Brobecker
2014-11-26 5:47 ` Yao Qi [this message]
2014-11-27 7:36 ` [PATCH 6/7] Use canonicalize_file_name unconditionally Joel Brobecker
2014-11-28 3:07 ` Yao Qi
2014-11-28 3:43 ` Joel Brobecker
2014-11-28 10:43 ` Yao Qi
2014-11-28 14:46 ` Joel Brobecker
2014-11-26 15:40 ` [PATCH 0/7 V2] Import the rename gnulib module Eli Zaretskii
2014-11-27 3:48 ` Yao Qi
2014-11-27 7:41 ` Joel Brobecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416980800-21408-7-git-send-email-yao@codesourcery.com \
--to=yao@codesourcery.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).