projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(INCLUDE, COMPILE): New variables.
[gnulib.git]
/
lib
/
rename.c
diff --git
a/lib/rename.c
b/lib/rename.c
index
34cabe7
..
44821c9
100644
(file)
--- a/
lib/rename.c
+++ b/
lib/rename.c
@@
-16,33
+16,24
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
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>
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
-#ifndef
STDC_HEADERS
+#ifndef
errno
extern int errno;
#endif
extern int errno;
#endif
-#ifdef STAT_MACROS_BROKEN
+#ifdef STAT_MACROS_BROKEN
#undef S_ISDIR
#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN. */
+#endif /* STAT_MACROS_BROKEN. */
#if !defined(S_ISDIR) && defined(S_IFDIR)
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
#if !defined(S_ISDIR) && defined(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. */
/* Rename file FROM to file TO.
Return 0 if successful, -1 if not. */
@@
-54,13
+45,13
@@
rename (from, to)
struct stat from_stats, to_stats;
int pid, status;
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. */
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;
{
if (errno != ENOENT)
return -1;
@@
-68,7
+59,7
@@
rename (from, to)
else
{
if ((from_stats.st_dev == to_stats.st_dev)
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;
/* `from' and `to' designate the same file on that filesystem. */
return 0;