Include <stdlib.h> and <string.h> unconditionally,

as we're now assuming that part of hosted C89.
(free) [!HAVE_DECL_FREE]: Remove decl; no longer needed.
(same_name): Invoke pathconf on destination, not source, as
that's a bit clearer even if they are the same dir.

diff --git a/lib/same.c b/lib/same.c
index c0b92447e5fbe93b277e37e9357517c96c069ae3..aa1a2318fc44250c879c38a0759e53d9c6709730 100644 (file)
--- a/lib/same.c
+++ b/lib/same.c
@@ -26,9 +26,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -37,11 +35,7 @@
 extern int errno;
 #endif
 
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #include <limits.h>
 #ifndef _POSIX_NAME_MAX
@@ -53,13 +47,6 @@ extern int errno;
 #include "error.h"
 #include "xalloc.h"
 
-#ifndef HAVE_DECL_FREE
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_FREE
-void free ();
-#endif
-
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 #define SAME_INODE(Stat_buf_1, Stat_buf_2) \
@@ -121,13 +108,13 @@ same_name (const char *source, const char *dest)
 #if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX
       if (same && ! identical_basenames)
        {
-         long name_max = (errno = 0, pathconf (source_dirname, _PC_NAME_MAX));
+         long name_max = (errno = 0, pathconf (dest_dirname, _PC_NAME_MAX));
          if (name_max < 0)
            {
              if (errno)
                {
                  /* Shouldn't happen.  */
-                 error (1, errno, "%s", source_dirname);
+                 error (1, errno, "%s", dest_dirname);
                }
              same = false;
            }