X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Frename.c;h=b27fd9100d02a5bb7ac62c75e1a92a03ebc75b69;hb=533b27747fe3d0d67f727d4d7ba6c97f8a5b4060;hp=34cabe7aafac2a646b916acee6686ed753798730;hpb=bea3493f472ff6e99100c15887dff7caca81489e;p=gnulib.git diff --git a/lib/rename.c b/lib/rename.c index 34cabe7aa..b27fd9100 100644 --- a/lib/rename.c +++ b/lib/rename.c @@ -1,10 +1,14 @@ -/* rename.c -- BSD compatible directory function for System V - Copyright (C) 1988, 1990 Free Software Foundation, Inc. +/* Work around rename bugs in some systems. On SunOS 4.1.1_U1 + and mips-dec-ultrix4.4, rename fails when the source file has + a trailing slash. On mingw, rename fails when the destination + exists. - This program is free software; you can redistribute it and/or modify + Copyright (C) 2001, 2002, 2003, 2005, 2006, 2009 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 2, or (at your option) - any later version. + 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, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,101 +16,150 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ + along with this program. If not, see . */ + +/* written by Volker Borchert */ + #include -#else -#include "config.h" -#endif -#endif +#undef rename -#include -#include +#if RENAME_DEST_EXISTS_BUG +/* This replacement must come first, otherwise when cross + * compiling to Windows we will guess that it has the trailing + * slash bug and entirely miss this one. */ #include -#ifndef STDC_HEADERS -extern int errno; -#endif -#ifdef STAT_MACROS_BROKEN -#undef S_ISDIR -#endif /* STAT_MACROS_BROKEN. */ +#define WIN32_LEAN_AND_MEAN +#include + +/* Rename the file SRC to DST. This replacement is necessary on + Windows, on which the system rename function will not replace + an existing DST. */ +int +rpl_rename (char const *src, char const *dst) +{ + int error; + + /* MoveFileEx works if SRC is a directory without any flags, + but fails with MOVEFILE_REPLACE_EXISTING, so try without + flags first. */ + if (MoveFileEx (src, dst, 0)) + return 0; + + /* Retry with MOVEFILE_REPLACE_EXISTING if the move failed + * due to the destination already existing. */ + error = GetLastError (); + if (error == ERROR_FILE_EXISTS || error == ERROR_ALREADY_EXISTS) + { + if (MoveFileEx (src, dst, MOVEFILE_REPLACE_EXISTING)) + return 0; -#if !defined(S_ISDIR) && defined(S_IFDIR) -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) + error = GetLastError (); + } + + switch (error) + { + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + case ERROR_BAD_PATHNAME: + case ERROR_DIRECTORY: + errno = ENOENT; + break; + + case ERROR_ACCESS_DENIED: + case ERROR_SHARING_VIOLATION: + errno = EACCES; + break; + + case ERROR_OUTOFMEMORY: + errno = ENOMEM; + break; + + case ERROR_CURRENT_DIRECTORY: + errno = EBUSY; + break; + + case ERROR_NOT_SAME_DEVICE: + errno = EXDEV; + break; + + case ERROR_WRITE_PROTECT: + errno = EROFS; + break; + + case ERROR_WRITE_FAULT: + case ERROR_READ_FAULT: + case ERROR_GEN_FAILURE: + errno = EIO; + break; + + case ERROR_HANDLE_DISK_FULL: + case ERROR_DISK_FULL: + case ERROR_DISK_TOO_FRAGMENTED: + errno = ENOSPC; + break; + + case ERROR_FILE_EXISTS: + case ERROR_ALREADY_EXISTS: + errno = EEXIST; + break; + + case ERROR_BUFFER_OVERFLOW: + case ERROR_FILENAME_EXCED_RANGE: + errno = ENAMETOOLONG; + break; + + case ERROR_INVALID_NAME: + case ERROR_DELETE_PENDING: + errno = EPERM; /* ? */ + break; + +#ifndef ERROR_FILE_TOO_LARGE +/* This value is documented but not defined in all versions of windows.h. */ +#define ERROR_FILE_TOO_LARGE 223 #endif + case ERROR_FILE_TOO_LARGE: + errno = EFBIG; + break; -#include "safe-stat.h" + default: + errno = EINVAL; + break; + } + + return -1; +} +#elif RENAME_TRAILING_SLASH_BUG +#include +#include +#include + +#include "dirname.h" +#include "xalloc.h" -/* Rename file FROM to file TO. - Return 0 if successful, -1 if not. */ +/* Rename the file SRC to DST, removing any trailing + slashes from SRC. Needed for SunOS 4.1.1_U1. */ int -rename (from, to) - char *from; - char *to; +rpl_rename (char const *src, char const *dst) { - struct stat from_stats, to_stats; - int pid, status; + char *src_temp; + int ret_val; + size_t s_len = strlen (src); - if (SAFE_STAT (from, &from_stats)) - return -1; - - /* Be careful not to unlink `from' if it happens to be equal to `to' or - (on filesystems that silently truncate filenames after 14 characters) - if `from' and `to' share the significant characters. */ - if (SAFE_STAT (to, &to_stats)) + if (s_len && src[s_len - 1] == '/') { - if (errno != ENOENT) - return -1; + src_temp = xstrdup (src); + strip_trailing_slashes (src_temp); } else - { - if ((from_stats.st_dev == to_stats.st_dev) - && (from_stats.st_ino == to_stats.st_dev)) - /* `from' and `to' designate the same file on that filesystem. */ - return 0; + src_temp = (char *) src; - if (unlink (to) && errno != ENOENT) - return -1; - } + ret_val = rename (src_temp, dst); - if (S_ISDIR (from_stats.st_mode)) - { - /* Need a setuid root process to link and unlink directories. */ - pid = fork (); - switch (pid) - { - case -1: /* Error. */ - error (1, errno, "cannot fork"); - - case 0: /* Child. */ - execl (MVDIR, "mvdir", from, to, (char *) 0); - error (255, errno, "cannot run `%s'", MVDIR); - - default: /* Parent. */ - while (wait (&status) != pid) - /* Do nothing. */ ; - - errno = 0; /* mvdir printed the system error message. */ - if (status) - return -1; - } - } - else - { - if (link (from, to)) - return -1; - if (unlink (from) && errno != ENOENT) - { - unlink (to); - return -1; - } - } - return 0; + if (src_temp != src) + free (src_temp); + + return ret_val; } +#endif /* RENAME_TRAILING_SLASH_BUG */