X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frename.c;h=9667c39e72c2be57624cb24d1bc1bc1e841c82f2;hb=a6694a282b6d9c86beacd77b65a30626af293ba1;hp=d3ba5e16d0f782ddbd5ed42362acc4695be0fccc;hpb=acf23bc3d2b6060b03d9592bdc803719bddde0d2;p=gnulib.git

diff --git a/lib/rename.c b/lib/rename.c
index d3ba5e16d..9667c39e7 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,13 +1,13 @@
-/* @IGNORE@ -*- c -*- */
-/* 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.
+/* 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.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,45 +15,42 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* written by Volker Borchert */
 
 #include <config.h>
+#undef rename
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#ifndef HAVE_DECL_FREE
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_FREE
-void free ();
-#endif
+#include "dirname.h"
+#include "xalloc.h"
 
-/* Rename the file SRC_PATH to the file DST_PATH, removing any trailing
-   slashes from SRC_PATH. Needed for SunOS 4.1.1_U1.  */
+/* Rename the file SRC to DST, removing any trailing
+   slashes from SRC.  Needed for SunOS 4.1.1_U1.  */
 
 int
-rpl_rename (const char *src_path, const char *dst_path)
+rpl_rename (char const *src, char const *dst)
 {
   char *src_temp;
-  int i;
-  int t;
+  int ret_val;
+  size_t s_len = strlen (src);
 
-  i = strlen (src_path) - 1;
-  if (src_path[i] == '/')
+  if (s_len && src[s_len - 1] == '/')
     {
-      src_temp = xstrdup (src_path);
-      for ( ; i > 0 && src_path[i] == '/'; i--)
-	src_temp[i] = '\0';
+      src_temp = xstrdup (src);
+      strip_trailing_slashes (src_temp);
     }
   else
-    src_temp = (char *) src_path;
+    src_temp = (char *) src;
 
-  t = rename (src_temp, dst_path);
+  ret_val = rename (src_temp, dst);
 
-  if (src_temp != src_path)
+  if (src_temp != src)
     free (src_temp);
 
-  return t;
+  return ret_val;
 }