X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frename.c;h=9667c39e72c2be57624cb24d1bc1bc1e841c82f2;hb=be933433b7ad24c4087c187b0107690d6da174ef;hp=a40bbb5ae77d4b0886345a1b5d539d869f49f0c9;hpb=d87c39464604e74f580c7fae835be31a4c125c36;p=gnulib.git
diff --git a/lib/rename.c b/lib/rename.c
index a40bbb5ae..9667c39e7 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,10 +1,13 @@
-/* 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.
- 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
@@ -12,68 +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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ along with this program. If not, see . */
-#include
-#include
-#include
-#ifndef STDC_HEADERS
-extern int errno;
-#endif
+/* written by Volker Borchert */
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
+#include
+#undef rename
-/* Rename file FROM to file TO.
- Return 0 if successful, -1 if not. */
+#include
+#include
+#include
-int
-rename (from, to)
- char *from;
- char *to;
-{
- struct stat from_stats;
- int pid, status;
+#include "dirname.h"
+#include "xalloc.h"
- if (stat (from, &from_stats))
- return -1;
+/* Rename the file SRC to DST, removing any trailing
+ slashes from SRC. Needed for SunOS 4.1.1_U1. */
- if (unlink (to) && errno != ENOENT)
- return -1;
+int
+rpl_rename (char const *src, char const *dst)
+{
+ char *src_temp;
+ int ret_val;
+ size_t s_len = strlen (src);
- if (S_ISDIR (from_stats.st_mode))
+ if (s_len && src[s_len - 1] == '/')
{
- /* Need a setuid root process to link and unlink directories. */
- pid = fork ();
- switch (pid)
- {
- case -1: /* Error. */
- error (1, errno, "cannot fork");
+ src_temp = xstrdup (src);
+ strip_trailing_slashes (src_temp);
+ }
+ else
+ src_temp = (char *) src;
- case 0: /* Child. */
- execl (MVDIR, "mvdir", from, to, (char *) 0);
- error (255, errno, "cannot run `%s'", MVDIR);
+ ret_val = rename (src_temp, dst);
- default: /* Parent. */
- while (wait (&status) != pid)
- /* Do nothing. */ ;
+ if (src_temp != src)
+ free (src_temp);
- 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;
}