aboutsummaryrefslogtreecommitdiff
path: root/gnulib/import/rename.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2022-04-18 09:44:18 -0600
committerTom Tromey <tromey@adacore.com>2022-04-18 10:14:04 -0600
commitdc6c21dabfbd242616b9e6266b459eded2d0762b (patch)
treeb2fbadbdbcd20dfa3f9dfe179db1c348e2aa5901 /gnulib/import/rename.c
parent2390419d1cb72882110538e01e5586372df19657 (diff)
downloadbinutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.zip
binutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.gz
binutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.bz2
Update gnulib
This updates gnulib to a relatively recent commit. Most of this was done by the gnulib import script; the only change I made was to update-gnulib.sh. Tested on x86-64 Fedora 34. I also did a mingw cross build.
Diffstat (limited to 'gnulib/import/rename.c')
-rw-r--r--gnulib/import/rename.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/gnulib/import/rename.c b/gnulib/import/rename.c
index e0f417d..119abe5 100644
--- a/gnulib/import/rename.c
+++ b/gnulib/import/rename.c
@@ -1,18 +1,18 @@
/* Work around rename bugs in some systems.
- Copyright (C) 2001-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2006, 2009-2022 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
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
+ This file is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ GNU Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* Written by Volker Borchert, Eric Blake. */
@@ -165,10 +165,8 @@ rpl_rename (char const *src, char const *dst)
}
if (rmdir (dst))
{
- error = errno;
free (src_temp);
free (dst_temp);
- errno = error;
return -1;
}
free (src_temp);
@@ -289,7 +287,7 @@ rpl_rename (char const *src, char const *dst)
char *dst_temp = (char *) dst;
bool src_slash;
bool dst_slash;
- bool dst_exists _GL_UNUSED;
+ _GL_UNUSED bool dst_exists;
int ret_val = -1;
int rename_errno = ENOTDIR;
struct stat src_st;