X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frename.c;h=9667c39e72c2be57624cb24d1bc1bc1e841c82f2;hb=4565266f776db0d78b2c207a5fe79f929f9806ca;hp=29a8da44bda175003a35af969db8fe8df229e685;hpb=707c315df7fd9e2c14a14e95879650ae8ed251c4;p=gnulib.git
diff --git a/lib/rename.c b/lib/rename.c
index 29a8da44b..9667c39e7 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,11 +1,13 @@
/* 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.
+ 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
@@ -13,55 +15,41 @@
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 . */
/* written by Volker Borchert */
#include
-#include
-#if HAVE_STDLIB_H
-# include
-#endif
-
-#if HAVE_STRING_H
-# include
-#else
-# include
-#endif
+#undef rename
-#include
-
-#ifndef HAVE_DECL_FREE
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_FREE
-void free ();
-#endif
+#include
+#include
+#include
-void strip_trailing_slashes ();
+#include "dirname.h"
+#include "xalloc.h"
-/* Rename the file SRC_PATH to 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 ret_val;
- size_t s_len = strlen (src_path);
+ size_t s_len = strlen (src);
- if (s_len && src_path[s_len - 1] == '/')
+ if (s_len && src[s_len - 1] == '/')
{
- src_temp = xstrdup (src_path);
+ src_temp = xstrdup (src);
strip_trailing_slashes (src_temp);
}
else
- src_temp = (char *) src_path;
+ src_temp = (char *) src;
- ret_val = rename (src_temp, dst_path);
+ ret_val = rename (src_temp, dst);
- if (src_temp != src_path)
+ if (src_temp != src)
free (src_temp);
return ret_val;