OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sln: Preprocessor cleanups

This commit is contained in:
Florian Weimer 2016-09-21 10:42:52 +02:00
parent e299076fef
commit 1d2ea31ca9
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

15
elf/sln.c
View File

@ -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))