From 68eb0d909e6de636f9af9a621e34eeaafa5fbac9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 30 Jul 1994 13:13:52 +0000 Subject: [PATCH] Use SAFE_STAT instead of stat to avoid unnecessary failure on systems for which stat can return EINTR. --- lib/fsusage.c | 3 ++- lib/isdir.c | 23 +++++++++++++++++++++-- lib/makepath.c | 7 ++++--- lib/rename.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 67 insertions(+), 11 deletions(-) diff --git a/lib/fsusage.c b/lib/fsusage.c index d0d746556..d60a4c6a7 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -28,6 +28,7 @@ #include #include "fsusage.h" +#include "safe-stat.h" int statfs (); @@ -211,7 +212,7 @@ statfs (path, fsb) struct stat stats; struct dustat fsd; - if (stat (path, &stats)) + if (SAFE_STAT (path, &stats)) return -1; if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd))) return -1; diff --git a/lib/isdir.c b/lib/isdir.c index 08388e13f..b1dbc2d70 100644 --- a/lib/isdir.c +++ b/lib/isdir.c @@ -15,11 +15,30 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use instead of "config.h" so that a compilation + using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h + (which it would do because it found this file in $srcdir). */ +#include +#else +#include "config.h" +#endif +#endif + #include #include +#include "safe-stat.h" + +#ifdef STAT_MACROS_BROKEN +#ifdef S_ISDIR +#undef S_ISDIR +#endif +#endif /* STAT_MACROS_BROKEN. */ + #if !defined(S_ISDIR) && defined(S_IFDIR) -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif /* If PATH is an existing directory or symbolic link to a directory, @@ -31,5 +50,5 @@ isdir (path) { struct stat stats; - return stat (path, &stats) == 0 && S_ISDIR (stats.st_mode); + return SAFE_STAT (path, &stats) == 0 && S_ISDIR (stats.st_mode); } diff --git a/lib/makepath.c b/lib/makepath.c index 4d647b5ef..e109865c5 100644 --- a/lib/makepath.c +++ b/lib/makepath.c @@ -86,6 +86,7 @@ typedef int uid_t; typedef int gid_t; #endif +#include "safe-stat.h" void error (); /* Ensure that the directory ARGPATH exists. @@ -121,7 +122,7 @@ make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string) dirpath = (char *) alloca (strlen (argpath) + 1); strcpy (dirpath, argpath); - if (stat (dirpath, &stats)) + if (SAFE_STAT (dirpath, &stats)) { char *slash; int tmp_mode; /* Initial perms for leading dirs. */ @@ -155,7 +156,7 @@ make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string) while ((slash = index (slash, '/'))) { *slash = '\0'; - if (stat (dirpath, &stats)) + if (SAFE_STAT (dirpath, &stats)) { if (mkdir (dirpath, tmp_mode)) { @@ -209,7 +210,7 @@ make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string) /* The path could end in "/." or contain "/..", so test if we really have to create the directory. */ - if (stat (dirpath, &stats) && mkdir (dirpath, mode)) + if (SAFE_STAT (dirpath, &stats) && mkdir (dirpath, mode)) { error (0, errno, "cannot make directory `%s'", dirpath); umask (oldmask); diff --git a/lib/rename.c b/lib/rename.c index a40bbb5ae..cd291b490 100644 --- a/lib/rename.c +++ b/lib/rename.c @@ -15,6 +15,17 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use instead of "config.h" so that a compilation + using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h + (which it would do because it found this file in $srcdir). */ +#include +#else +#include "config.h" +#endif +#endif + #include #include #include @@ -22,10 +33,18 @@ extern int errno; #endif +#ifdef STAT_MACROS_BROKEN +#ifdef S_ISDIR +#undef S_ISDIR +#endif +#endif /* STAT_MACROS_BROKEN. */ + #if !defined(S_ISDIR) && defined(S_IFDIR) -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif +#include "safe-stat.h" + /* Rename file FROM to file TO. Return 0 if successful, -1 if not. */ @@ -34,14 +53,30 @@ rename (from, to) char *from; char *to; { - struct stat from_stats; + struct stat from_stats, to_stats; int pid, status; - if (stat (from, &from_stats)) + if (SAFE_STAT (from, &from_stats)) return -1; - if (unlink (to) && errno != ENOENT) - return -1; + /* Be careful not to unlink `from' if it happens to be equal to `to' or + (on filesystems that silently truncate filenames after 14 characters) + if `from' and `to' share the significant characters. */ + if (SAFE_STAT (to, &to_stats)) + { + if (errno != ENOENT) + return -1; + } + else + { + if ((from_stats.st_dev == to_stats.st_dev) + && (from_stats.st_ino == to_stats.st_dev)) + /* `from' and `to' designate the same file on that filesystem. */ + return 0; + + if (unlink (to) && errno != ENOENT) + return -1; + } if (S_ISDIR (from_stats.st_mode)) { -- 2.11.0