sln: Preprocessor cleanups
Commit Message
2016-07-13 Florian Weimer <fweimer@redhat.com>
* elf/sln.c: Remove HAV_CONFIG_H, S_ISDIR, S_ISLNK preprocessor
conditionals. Do not define PATH_MAX.
Comments
On 13 Jul 2016 14:17, Florian Weimer wrote:
> 2016-07-13 Florian Weimer <fweimer@redhat.com>
>
> * elf/sln.c: Remove HAV_CONFIG_H, S_ISDIR, S_ISLNK preprocessor
"HAVE"
lgtm otherwise
-mike
On 08/04/2016 03:48 PM, Mike Frysinger wrote:
> On 13 Jul 2016 14:17, Florian Weimer wrote:
>> 2016-07-13 Florian Weimer <fweimer@redhat.com>
>>
>> * elf/sln.c: Remove HAV_CONFIG_H, S_ISDIR, S_ISLNK preprocessor
>
> "HAVE"
Thanks, committed with this change.
Florian
@@ -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))