projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'cworth/master' into dfsg-debian
[debian/tar]
/
lib
/
lstat.c
diff --git
a/lib/lstat.c
b/lib/lstat.c
index 9dcb4cdc5bfce3d0b05c15e6a0e83dde19b5c195..3e07270801a9a019c747ca8c83d36136ee0116ca 100644
(file)
--- a/
lib/lstat.c
+++ b/
lib/lstat.c
@@
-1,7
+1,6
@@
/* Work around a bug of lstat on some systems
/* Work around a bug of lstat on some systems
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
- Software Foundation, Inc.
+ Copyright (C) 1997-1999, 2000-2006, 2008 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-20,13
+19,21
@@
#include <config.h>
#include <config.h>
-/* The specification of these functions is in sys_stat.h. But we cannot
- include this include file here, because on some systems, a
- "#define lstat lstat64" is being used, and sys_stat.h deletes this
- definition. */
-
+/* Get the original definition of open. It might be defined as a macro. */
+#define __need_system_sys_stat_h
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
+#undef __need_system_sys_stat_h
+
+static inline int
+orig_lstat (const char *filename, struct stat *buf)
+{
+ return lstat (filename, buf);
+}
+
+/* Specification. */
+#include <sys/stat.h>
+
#include <string.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
@@
-47,7
+54,7
@@
int
rpl_lstat (const char *file, struct stat *sbuf)
{
size_t len;
rpl_lstat (const char *file, struct stat *sbuf)
{
size_t len;
- int lstat_result = lstat (file, sbuf);
+ int lstat_result =
orig_
lstat (file, sbuf);
if (lstat_result != 0 || !S_ISLNK (sbuf->st_mode))
return lstat_result;
if (lstat_result != 0 || !S_ISLNK (sbuf->st_mode))
return lstat_result;