X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frename.c;h=6ff0705323438851927090b6616fa91730012645;hb=d33e27b00b65fc12a046ca1f1bdb17bc5c1d1585;hp=29a8da44bda175003a35af969db8fe8df229e685;hpb=707c315df7fd9e2c14a14e95879650ae8ed251c4;p=gnulib.git

diff --git a/lib/rename.c b/lib/rename.c
index 29a8da44b..6ff070532 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -1,6 +1,7 @@
 /* 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.
+   path has a trailing slash.  The rename functions of SunOS 4.1.1_U1 and
+   mips-dec-ultrix4.4 have this bug.
+   Copyright (C) 2001-2003 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
@@ -18,28 +19,17 @@
 
 /* written by Volker Borchert */
 
-#include <config.h>
-#include <stdio.h>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
+#undef rename
 
-#include <xalloc.h>
-
-#ifndef HAVE_DECL_FREE
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_FREE
-void free ();
-#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-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.  */