projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
secure_getenv: new module
[gnulib.git]
/
lib
/
lstat.c
diff --git
a/lib/lstat.c
b/lib/lstat.c
index
a05f674
..
1a613a8
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-1999, 2000-2006, 2008-2009 Free Software
- Foundation, Inc.
+ Copyright (C) 1997-2006, 2008-2013 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
@@
-18,32
+17,45
@@
/* written by Jim Meyering */
/* written by Jim Meyering */
+/* If the user's config.h happens to include <sys/stat.h>, let it include only
+ the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
+ rpl_lstat. */
+#define __need_system_sys_stat_h
#include <config.h>
#include <config.h>
+#if !HAVE_LSTAT
+/* On systems that lack symlinks, our replacement <sys/stat.h> already
+ defined lstat as stat, so there is nothing further to do other than
+ avoid an empty file. */
+typedef int dummy;
+#else /* HAVE_LSTAT */
+
/* Get the original definition of lstat. It might be defined as a macro. */
/* Get the original definition of lstat. It might be defined as a macro. */
-#define __need_system_sys_stat_h
-#include <sys/types.h>
-#include <sys/stat.h>
-#undef __need_system_sys_stat_h
+# include <sys/types.h>
+# include <sys/stat.h>
+# undef __need_system_sys_stat_h
-static in
line in
t
+static int
orig_lstat (const char *filename, struct stat *buf)
{
return lstat (filename, buf);
}
/* Specification. */
orig_lstat (const char *filename, struct stat *buf)
{
return lstat (filename, buf);
}
/* Specification. */
-#include <sys/stat.h>
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+ eliminates this include because of the preliminary #include <sys/stat.h>
+ above. */
+# include "sys/stat.h"
-#include <string.h>
-#include <errno.h>
+#
include <string.h>
+#
include <errno.h>
/* lstat works differently on Linux and Solaris systems. POSIX (see
/* lstat works differently on Linux and Solaris systems. POSIX (see
-
`pathname resolution'
in the glossary) requires that programs like
-
`
ls' take into consideration the fact that FILE has a trailing slash
+
"pathname resolution"
in the glossary) requires that programs like
+
'
ls' take into consideration the fact that FILE has a trailing slash
when FILE is a symbolic link. On Linux and Solaris 10 systems, the
lstat function already has the desired semantics (in treating
when FILE is a symbolic link. On Linux and Solaris 10 systems, the
lstat function already has the desired semantics (in treating
-
`lstat ("symlink/", sbuf)' just like `
lstat ("symlink/.", sbuf)',
+
'lstat ("symlink/", sbuf)' just like '
lstat ("symlink/.", sbuf)',
but on Solaris 9 and earlier it does not.
If FILE has a trailing slash and specifies a symbolic link,
but on Solaris 9 and earlier it does not.
If FILE has a trailing slash and specifies a symbolic link,
@@
-81,3
+93,5
@@
rpl_lstat (const char *file, struct stat *sbuf)
}
return stat (file, sbuf);
}
}
return stat (file, sbuf);
}
+
+#endif /* HAVE_LSTAT */