Re: declare canonicalize_file_name

[rth at redhat dot com]

On Thu, Mar 14, 2002 at 06:43:55PM -0500, Andrew Cagney wrote:
> Oops, ulgh! if RichardE tweeks to code (as I suggested) to simply prefer 
> realpath() it will break the hurd again.  I think prefering realpath() 
> is correct (only use an obscure function when forced too) but that logic 
> is going to need to be scrambled a bit more :-(.

What about something like this?


r~


Index: utils.c
===================================================================
RCS file: /cvs/src/src/gdb/utils.c,v
retrieving revision 1.68
diff -c -p -d -r1.68 utils.c
*** utils.c	2002/03/01 06:19:24	1.68
--- utils.c	2002/03/15 00:06:43
*************** extern PTR realloc ();
*** 81,86 ****
--- 81,91 ----
  #ifdef NEED_DECLARATION_FREE
  extern void free ();
  #endif
+ /* Actually, we'll never have the decl, since we don't define _GNU_SOURCE.  */
+ #if defined(HAVE_CANONICALIZE_FILE_NAME) \
+     && defined(NEED_DECLARATION_CANONICALIZE_FILE_NAME)
+ extern char *canonicalize_file_name (const char *);
+ #endif
  
  #undef XMALLOC
  #define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE)))
*************** string_to_core_addr (const char *my_stri
*** 2532,2551 ****
  char *
  gdb_realpath (const char *filename)
  {
! #ifdef HAVE_CANONICALIZE_FILE_NAME
!   return canonicalize_file_name (filename);
! #elif defined (HAVE_REALPATH)
! #if defined (PATH_MAX)
    char buf[PATH_MAX];
! #elif defined (MAXPATHLEN)
    char buf[MAXPATHLEN];
! #elif defined (HAVE_UNISTD_H) && defined(HAVE_ALLOCA)
    char *buf = alloca ((size_t)pathconf ("/", _PC_PATH_MAX));
! #else
! #error "Neither PATH_MAX nor MAXPATHLEN defined"
! #endif
    char *rp = realpath (filename, buf);
    return xstrdup (rp ? rp : filename);
  #else
    return xstrdup (filename);
  #endif
--- 2537,2560 ----
  char *
  gdb_realpath (const char *filename)
  {
! #if defined(HAVE_REALPATH)
! # if defined (PATH_MAX)
    char buf[PATH_MAX];
! #  define USE_REALPATH
! # elif defined (MAXPATHLEN)
    char buf[MAXPATHLEN];
! #  define USE_REALPATH
! # elif defined (HAVE_UNISTD_H) && defined(HAVE_ALLOCA)
    char *buf = alloca ((size_t)pathconf ("/", _PC_PATH_MAX));
! #  define USE_REALPATH
! # endif
! #endif /* HAVE_REALPATH */
! 
! #if defined(USE_REALPATH)
    char *rp = realpath (filename, buf);
    return xstrdup (rp ? rp : filename);
+ #elif defined(HAVE_CANONICALIZE_FILE_NAME)
+   return canonicalize_file_name (filename);
  #else
    return xstrdup (filename);
  #endif