X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Frename.c;h=2dbc86cfd0316ec44b3594841269de58b5ea3e19;hb=87c336f60eccc6506ff19369c29575f43fea02ea;hp=6ae4d29c746679f09543f70abf598f9938d20fd8;hpb=32866df75ece22ec1fd88e99e3c5effe9238e072;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/rename.c b/binutils/rename.c
index 6ae4d29c74..2dbc86cfd0 100644
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -1,5 +1,5 @@
 /* rename.c -- rename a file, preserving symlinks.
-   Copyright 1999, 2002, 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -22,8 +22,6 @@
 #include "bfd.h"
 #include "bucomm.h"
 
-#include <sys/stat.h>
-
 #ifdef HAVE_GOOD_UTIME_H
 #include <utime.h>
 #else /* ! HAVE_GOOD_UTIME_H */
@@ -32,12 +30,6 @@
 #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 *);
 
@@ -162,7 +154,7 @@ smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNU
   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
@@ -200,7 +192,7 @@ smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNU
       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);
 	}
     }
@@ -208,7 +200,7 @@ smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNU
     {
       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);