X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Frename.c;h=21ce6713e14900f0df90b21406cda47115b797f8;hb=b53e4c0e7c0832a1779d5000a71a9de51dae699b;hp=74d04d428202731bf0d9bd0cd3c75bc569a28045;hpb=b43b5d5f768ed7a7a150d78c9fda0c194a11497d;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/rename.c b/binutils/rename.c
index 74d04d4282..21ce6713e1 100644
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -1,11 +1,11 @@
 /* rename.c -- rename a file, preserving symlinks.
-   Copyright 1999, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
    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 of the License, or
+   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,
@@ -18,11 +18,10 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+#include "sysdep.h"
 #include "bfd.h"
 #include "bucomm.h"
 
-#include <sys/stat.h>
-
 #ifdef HAVE_GOOD_UTIME_H
 #include <utime.h>
 #else /* ! HAVE_GOOD_UTIME_H */
@@ -31,12 +30,7 @@
 #endif /* HAVE_UTIMES */
 #endif /* ! HAVE_GOOD_UTIME_H */
 
-/* We need to open the file in binary modes on system where that makes
-   a difference.  */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
+#if ! defined (_WIN32) || defined (__CYGWIN32__)
 static int simple_copy (const char *, const char *);
 
 /* The number of bytes to copy at once.  */
@@ -88,6 +82,7 @@ simple_copy (const char *from, const char *to)
     }
   return 0;
 }
+#endif /* __CYGWIN32__ or not _WIN32 */
 
 /* Set the times of the file DESTINATION to be the same as those in
    STATBUF.  */
@@ -140,7 +135,7 @@ set_times (const char *destination, const struct stat *statbuf)
    Return 0 if ok, -1 if error.  */
 
 int
-smart_rename (const char *from, const char *to, int preserve_dates)
+smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNUSED)
 {
   bfd_boolean exists;
   struct stat s;
@@ -159,7 +154,7 @@ smart_rename (const char *from, const char *to, int preserve_dates)
   if (ret != 0)
     {
       /* We have to clean up here.  */
-      non_fatal (_("unable to rename '%s' reason: %s"), to, strerror (errno));
+      non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno));
       unlink (from);
     }
 #else
@@ -197,7 +192,7 @@ smart_rename (const char *from, const char *to, int preserve_dates)
       else
 	{
 	  /* We have to clean up here.  */
-	  non_fatal (_("unable to rename '%s' reason: %s"), to, strerror (errno));
+	  non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno));
 	  unlink (from);
 	}
     }
@@ -205,7 +200,7 @@ smart_rename (const char *from, const char *to, int preserve_dates)
     {
       ret = simple_copy (from, to);
       if (ret != 0)
-	non_fatal (_("unable to copy file '%s' reason: %s"), to, strerror (errno));
+	non_fatal (_("unable to copy file '%s'; reason: %s"), to, strerror (errno));
 
       if (preserve_dates)
 	set_times (to, &s);