X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frename.c;h=13b86d043154f6a260f94d2df9e6c359b8fd936a;hb=94ce07b03b34361c3e8ce68867af8bd224e72f07;hp=63193973b6f30116c14bffdd1489fe7b0acd616c;hpb=300424a2d37b17d304be2783ed40f2efa4d950c0;p=gnulib.git

diff --git a/lib/rename.c b/lib/rename.c
index 63193973b..13b86d043 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,5 +1,6 @@
-/* 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
+   path has a trailing slash.  The rename from SunOS 4.1.1_U1 has this bug.
+   Copyright (C) 2001 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
@@ -12,94 +13,55 @@
    GNU General Public License for more details.
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* written by Volker Borchert */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
+#include <stdio.h>
+#if HAVE_STDLIB_H
+# include <stdlib.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#ifndef STDC_HEADERS
-extern int errno;
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
 #endif
 
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN.  */
+#include "dirname.h"
+#include "xalloc.h"
 
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#ifndef HAVE_DECL_FREE
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_FREE
+void free ();
 #endif
 
-#include "safe-stat.h"
-
-/* Rename file FROM to file TO.
-   Return 0 if successful, -1 if not. */
+/* Rename the file SRC_PATH to DST_PATH, removing any trailing
+   slashes from SRC_PATH.  Needed for SunOS 4.1.1_U1.  */
 
 int
-rename (from, to)
-     char *from;
-     char *to;
+rpl_rename (const char *src_path, const char *dst_path)
 {
-  struct stat from_stats, to_stats;
-  int pid, status;
-
-  if (SAFE_STAT (from, &from_stats))
-    return -1;
+  char *src_temp;
+  int ret_val;
+  size_t s_len = strlen (src_path);
 
-  /* 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 (s_len && src_path[s_len - 1] == '/')
     {
-      if (errno != ENOENT)
-        return -1;
+      src_temp = xstrdup (src_path);
+      strip_trailing_slashes (src_temp);
     }
   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;
+    src_temp = (char *) src_path;
 
-      if (unlink (to) && errno != ENOENT)
-        return -1;
-    }
+  ret_val = rename (src_temp, dst_path);
 
-  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_path)
+    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;
 }