Use scoped_value_mark in dwarf2_evaluate_loc_desc_full

[binutils-gdb.git] / binutils / rename.c

diff --git a/binutils/rename.c b/binutils/rename.c
index 25329d140508d424d64656cbc31c50a1885524c1..2dbc86cfd0316ec44b3594841269de58b5ea3e19 100644 (file)
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -1,11 +1,11 @@
 /* rename.c -- rename a file, preserving symlinks.
 /* 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.
 
    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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -22,8 +22,6 @@
 #include "bfd.h"
 #include "bucomm.h"
 
 #include "bfd.h"
 #include "bucomm.h"
 

-#include <sys/stat.h>
-

 #ifdef HAVE_GOOD_UTIME_H
 #include <utime.h>
 #else /* ! HAVE_GOOD_UTIME_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 */
 
 #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 *);
 
 #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.  */
   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
       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.  */
       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);
        }
     }
          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)
     {
       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);
 
       if (preserve_dates)
        set_times (to, &s);