aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-09-21 10:42:52 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-09-21 10:42:52 +0200
commit1d2ea31ca95adcd68085f487629e0a1b569c7d63 (patch)
treef202d32c2e4e067df4cc8ff29df65d2877ce6caf
parente299076fefd9649f78f853865d4745043e50813c (diff)
downloadglibc-1d2ea31ca95adcd68085f487629e0a1b569c7d63.tar
glibc-1d2ea31ca95adcd68085f487629e0a1b569c7d63.tar.gz
glibc-1d2ea31ca95adcd68085f487629e0a1b569c7d63.tar.bz2
glibc-1d2ea31ca95adcd68085f487629e0a1b569c7d63.zip
sln: Preprocessor cleanups
-rw-r--r--ChangeLog5
-rw-r--r--elf/sln.c15
2 files changed, 5 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index a962c8e890..2e29b7d2d7 100644
--- 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 f52cb9f44a..fa4cceca80 100644
--- 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))