From patchwork Wed Nov 26 05:46:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 3936 Received: (qmail 22534 invoked by alias); 26 Nov 2014 05:47:02 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 22464 invoked by uid 89); 26 Nov 2014 05:47:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 26 Nov 2014 05:46:59 +0000 Received: from svr-orw-fem-05.mgc.mentorg.com ([147.34.97.43]) by relay1.mentorg.com with esmtp id 1XtVRF-0005QK-1d from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Tue, 25 Nov 2014 21:46:53 -0800 Received: from qiyao.dyndns.org.com (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.3.181.6; Tue, 25 Nov 2014 21:46:52 -0800 From: Yao Qi To: Subject: [PATCH 6/7] Use canonicalize_file_name unconditionally Date: Wed, 26 Nov 2014 13:46:39 +0800 Message-ID: <1416980800-21408-7-git-send-email-yao@codesourcery.com> In-Reply-To: <1416980800-21408-1-git-send-email-yao@codesourcery.com> References: <1416980800-21408-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes As gnulib module canonicalize-lgpl is imported, we can use canonicalize_file_name and realpath unconditionally. gdb: 2014-11-26 Yao Qi * 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 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. */