mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
Remove xstat function pointer member. The way it was used was not
portable, since some systems (OSF V5.1, Solaris 2.5.1) provide static inline `stat' and `lstat' functions, thus making the tests of `xstat == lstat' in copy.c always fail. (struct cp_options) [xstat]: Remove member. (XSTAT): New macro.
This commit is contained in:
1 parent
c9736bdff0
commit
e80f7332e2
1 file changed
+5
-4
+5
-4
@@ -153,10 +153,6 @@ struct cp_options
|
||||
/* If nonzero, display the names of the files before copying them. */
|
||||
int verbose;
|
||||
|
||||
/* A pointer to either lstat or stat, depending on
|
||||
whether the copy should dereference symlinks. */
|
||||
int (*xstat) ();
|
||||
|
||||
/* If nonzero, stdin is a tty. */
|
||||
int stdin_tty;
|
||||
|
||||
@@ -178,6 +174,11 @@ struct cp_options
|
||||
int stat ();
|
||||
int lstat ();
|
||||
|
||||
# define XSTAT(X, Src_path, Src_sb) \
|
||||
((X)->dereference == DEREF_NEVER \
|
||||
? lstat (Src_path, Src_sb) \
|
||||
: stat (Src_path, Src_sb))
|
||||
|
||||
/* Arrange to make lstat calls go through the wrapper function
|
||||
on systems with an lstat function that does not dereference symlinks
|
||||
that are specified with a trailing slash. */
|
||||
|
||||
Reference in new issue
Block a user