projects
/
platform
/
upstream
/
gettext.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.19.7
[platform/upstream/gettext.git]
/
gettext-runtime
/
gnulib-lib
/
lstat.c
diff --git
a/gettext-runtime/gnulib-lib/lstat.c
b/gettext-runtime/gnulib-lib/lstat.c
index
586ab16
..
31dee13
100644
(file)
--- a/
gettext-runtime/gnulib-lib/lstat.c
+++ b/
gettext-runtime/gnulib-lib/lstat.c
@@
-1,6
+1,6
@@
/* Work around a bug of lstat on some systems
/* Work around a bug of lstat on some systems
- Copyright (C) 1997-2006, 2008-201
0
Free Software Foundation, Inc.
+ Copyright (C) 1997-2006, 2008-201
5
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
@@
-17,6
+17,10
@@
/* 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>
#if !HAVE_LSTAT
#include <config.h>
#if !HAVE_LSTAT
@@
-27,29
+31,31
@@
typedef int dummy;
#else /* HAVE_LSTAT */
/* Get the original definition of lstat. It might be defined as a macro. */
#else /* HAVE_LSTAT */
/* 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>
/* lstat works differently on Linux and Solaris systems. POSIX (see
# include <string.h>
# include <errno.h>
/* 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,