diff options
author | Jim Meyering <jim@meyering.net> | 1994-07-30 13:13:52 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1994-07-30 13:13:52 +0000 |
commit | be7d4a230e880a12b89a4c27263048fc8b8c063a (patch) | |
tree | 92ecefb02cc0860ee746931d0d5c329e3031a424 /lib/rename.c | |
parent | a1d3a7aee63a2a6cbeedeea9ff578844a160f122 (diff) | |
download | coreutils-be7d4a230e880a12b89a4c27263048fc8b8c063a.tar.xz |
Use SAFE_STAT instead of stat to avoid unnecessary failure
on systems for which stat can return EINTR.
Diffstat (limited to 'lib/rename.c')
-rw-r--r-- | lib/rename.c | 45 |
1 files changed, 40 insertions, 5 deletions
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 <config.h> 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 <config.h> +#else +#include "config.h" +#endif +#endif + #include <sys/types.h> #include <sys/stat.h> #include <errno.h> @@ -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)) { |