-/* rename.c -- BSD compatible directory function for System V
+/* BSD compatible rename and directory rename function for System V.
Copyright (C) 1988, 1990 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
#endif
#include <sys/types.h>
extern int errno;
#endif
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN. */
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif
#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
/* Rename file FROM to file TO.
Return 0 if successful, -1 if not. */
int
-rename (from, to)
- char *from;
- char *to;
+rename (char *from, char *to)
{
struct stat from_stats, to_stats;
- int pid, status;
if (stat (from, &from_stats))
return -1;
return -1;
}
+#ifdef MVDIR
+
+/* If MVDIR is defined, it should be the full filename of a setuid root
+ program able to link and unlink directories. If MVDIR is not defined,
+ then the capability of renaming directories may be missing. */
+
if (S_ISDIR (from_stats.st_mode))
{
/* Need a setuid root process to link and unlink directories. */
- pid = fork ();
+ int status;
+ pid_t pid = fork ();
switch (pid)
{
case -1: /* Error. */
- error (1, errno, "cannot fork");
+ return -1; /* errno already set */
case 0: /* Child. */
execl (MVDIR, "mvdir", from, to, (char *) 0);
- error (255, errno, "cannot run `%s'", MVDIR);
+ _exit (1);
default: /* Parent. */
while (wait (&status) != pid)
/* Do nothing. */ ;
- errno = 0; /* mvdir printed the system error message. */
if (status)
- return -1;
+ {
+ /* MVDIR failed. */
+ errno = EIO;
+ return -1;
+ }
}
}
else
+
+#endif /* MVDIR */
+
{
if (link (from, to))
return -1;