X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frename.c;h=44821c94fc18e73977276317ed8baaff51c1b5ba;hb=6aae241f16ed2dbe57475cb4c8b3a5b1ca1e9699;hp=3788e900eb482cc36b701d0e20885c81ead7cac6;hpb=2516905b58eead5c5285af06e09d350343b9f5fb;p=gnulib.git diff --git a/lib/rename.c b/lib/rename.c index 3788e900e..44821c94f 100644 --- a/lib/rename.c +++ b/lib/rename.c @@ -34,8 +34,6 @@ extern int errno; #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. */ @@ -47,13 +45,13 @@ rename (from, to) struct stat from_stats, to_stats; int pid, status; - if (SAFE_STAT (from, &from_stats)) + if (stat (from, &from_stats)) 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 (stat (to, &to_stats)) { if (errno != ENOENT) return -1; @@ -61,7 +59,7 @@ rename (from, to) else { if ((from_stats.st_dev == to_stats.st_dev) - && (from_stats.st_ino == to_stats.st_dev)) + && (from_stats.st_ino == to_stats.st_ino)) /* `from' and `to' designate the same file on that filesystem. */ return 0;