sln: Preprocessor cleanups

diff --git a/ChangeLog b/ChangeLog
index a962c8e8904fbfe39bf70728ae7be6844dfb39ff..2e29b7d2d71fc20bb187ec7578b4d0fc6075ba42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-21  Florian Weimer  <fweimer@redhat.com>
+
+       * elf/sln.c: Remove HAVE_CONFIG_H, S_ISDIR, S_ISLNK preprocessor
+       conditionals.  Do not define PATH_MAX.
+
 2016-09-20  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
        * sysdeps/unix/sysv/linux/spawni.c (__spawnix): Correctly block and unblock

diff --git a/elf/sln.c b/elf/sln.c
index f52cb9f44a85bbeb83933b1b497db85232ef85c8..fa4cceca80aa191522f2d4104f95d791c4d639b6 100644 (file)
--- a/elf/sln.c
+++ b/elf/sln.c
@@ -16,10 +16,6 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <error.h>
 #include <errno.h>
 #include <libintl.h>
@@ -37,10 +33,6 @@
 
 #define PACKAGE _libc_intl_domainname
 
-#if !defined S_ISDIR && defined S_IFDIR
-#define        S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
 static int makesymlink (const char *src, const char *dest);
 static int makesymlinks (const char *file);
 static void usage (void);
@@ -89,9 +81,6 @@ usage (void)
 static int
 makesymlinks (const char *file)
 {
-#ifndef PATH_MAX
-#define PATH_MAX 4095
-#endif
   char *buffer = NULL;
   size_t bufferlen = 0;
   int ret;
@@ -190,11 +179,7 @@ makesymlink (const char *src, const char *dest)
       return -1;
     }
 
-#ifdef S_ISLNK
   if (symlink (src, dest) == 0)
-#else
-  if (link (src, dest) == 0)
-#endif
     {
       /* Destination must exist by now. */
       if (access (dest, F_OK))