X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frename.c;h=32d2b0131764df0aa209080294e689eb1962993c;hb=9aa4a0e39ea568b5481f100645106e1ac1d46883;hp=5a158e4cfef951f087f02461f8a46220051ff219;hpb=6d8337bfc808cddc275899c03482eceb6aff8547;p=gnulib.git

diff --git a/lib/rename.c b/lib/rename.c
index 5a158e4cf..32d2b0131 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,5 +1,8 @@
-/* rename.c -- BSD compatible directory function for System V
-   Copyright (C) 1988, 1990 Free Software Foundation, Inc.
+/* Work around the bug in some systems whereby rename fails when the source
+   file has a trailing slash.  The rename functions of SunOS 4.1.1_U1 and
+   mips-dec-ultrix4.4 have this bug.
+
+   Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,91 +16,42 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+/* written by Volker Borchert */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
+#include <config.h>
+#undef rename
 
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN.  */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
+#include "dirname.h"
+#include "xalloc.h"
 
-/* Rename file FROM to file TO.
-   Return 0 if successful, -1 if not. */
+/* Rename the file SRC to DST, removing any trailing
+   slashes from SRC.  Needed for SunOS 4.1.1_U1.  */
 
 int
-rename (from, to)
-     char *from;
-     char *to;
+rpl_rename (char const *src, char const *dst)
 {
-  struct stat from_stats, to_stats;
-  int pid, status;
-
-  if (stat (from, &from_stats))
-    return -1;
+  char *src_temp;
+  int ret_val;
+  size_t s_len = strlen (src);
 
-  /* 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 (stat (to, &to_stats))
+  if (s_len && src[s_len - 1] == '/')
     {
-      if (errno != ENOENT)
-        return -1;
+      src_temp = xstrdup (src);
+      strip_trailing_slashes (src_temp);
     }
   else
-    {
-      if ((from_stats.st_dev == to_stats.st_dev)
-          && (from_stats.st_ino == to_stats.st_ino))
-        /* `from' and `to' designate the same file on that filesystem. */
-        return 0;
+    src_temp = (char *) src;
 
-      if (unlink (to) && errno != ENOENT)
-        return -1;
-    }
+  ret_val = rename (src_temp, dst);
 
-  if (S_ISDIR (from_stats.st_mode))
-    {
-      /* Need a setuid root process to link and unlink directories. */
-      pid = fork ();
-      switch (pid)
-	{
-	case -1:		/* Error. */
-	  error (1, errno, "cannot fork");
+  if (src_temp != src)
+    free (src_temp);
 
-	case 0:			/* Child. */
-	  execl (MVDIR, "mvdir", from, to, (char *) 0);
-	  error (255, errno, "cannot run `%s'", MVDIR);
-
-	default:		/* Parent. */
-	  while (wait (&status) != pid)
-	    /* Do nothing. */ ;
-
-	  errno = 0;		/* mvdir printed the system error message. */
-	  if (status)
-	    return -1;
-	}
-    }
-  else
-    {
-      if (link (from, to))
-	return -1;
-      if (unlink (from) && errno != ENOENT)
-	{
-	  unlink (to);
-	  return -1;
-	}
-    }
-  return 0;
+  return ret_val;
 }