diff options
| -rw-r--r-- | gnu/usr.bin/binutils/binutils/rename.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/gnu/usr.bin/binutils/binutils/rename.c b/gnu/usr.bin/binutils/binutils/rename.c index 398152e05f1..78ea9fd6b20 100644 --- a/gnu/usr.bin/binutils/binutils/rename.c +++ b/gnu/usr.bin/binutils/binutils/rename.c @@ -1,5 +1,5 @@ /* rename.c -- rename a file, preserving symlinks. - Copyright 1999, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1999 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -37,7 +37,7 @@ #define O_BINARY 0 #endif -static int simple_copy (const char *, const char *); +static int simple_copy PARAMS ((const char *, const char *)); /* The number of bytes to copy at once. */ #define COPY_BUF 8192 @@ -46,7 +46,9 @@ static int simple_copy (const char *, const char *); Return 0 if ok, -1 if error. */ static int -simple_copy (const char *from, const char *to) +simple_copy (from, to) + const char *from; + const char *to; { int fromfd, tofd, nread; int saved; @@ -93,7 +95,9 @@ simple_copy (const char *from, const char *to) STATBUF. */ void -set_times (const char *destination, const struct stat *statbuf) +set_times (destination, statbuf) + const char *destination; + const struct stat *statbuf; { int result; @@ -140,9 +144,12 @@ 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 (from, to, preserve_dates) + const char *from; + const char *to; + int preserve_dates; { - bfd_boolean exists; + boolean exists; struct stat s; int ret = 0; @@ -158,19 +165,15 @@ smart_rename (const char *from, const char *to, int preserve_dates) ret = rename (from, to); if (ret != 0) { - /* We have to clean up here. */ - non_fatal (_("unable to rename '%s' reason: %s"), to, strerror (errno)); + /* We have to clean up here. */ + + non_fatal (_("%s: rename: %s"), to, strerror (errno)); unlink (from); } #else /* Use rename only if TO is not a symbolic link and has - only one hard link, and we have permission to write to it. */ - if (! exists - || (!S_ISLNK (s.st_mode) - && S_ISREG (s.st_mode) - && (s.st_mode & S_IWUSR) - && s.st_nlink == 1) - ) + only one hard link. */ + if (! exists || (!S_ISLNK (s.st_mode) && s.st_nlink == 1)) { ret = rename (from, to); if (ret == 0) @@ -196,8 +199,8 @@ 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)); + /* We have to clean up here. */ + non_fatal (_("%s: rename: %s"), to, strerror (errno)); unlink (from); } } @@ -205,7 +208,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 (_("%s: simple_copy: %s"), to, strerror (errno)); if (preserve_dates) set_times (to, &s); |