projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fchdir: avoid extra chdir and fix test
[gnulib.git]
/
lib
/
copy-file.c
diff --git
a/lib/copy-file.c
b/lib/copy-file.c
index
198a014
..
f9cd9c0
100644
(file)
--- a/
lib/copy-file.c
+++ b/
lib/copy-file.c
@@
-1,11
+1,11
@@
/* Copying of files.
/* Copying of files.
- Copyright (C) 2001-2003 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003
, 2006-2007, 2009-2011
Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
- This program is free software
;
you can redistribute it and/or modify
+ 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,13
+13,10
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
/* Specification. */
#include "copy-file.h"
/* Specification. */
#include "copy-file.h"
@@
-27,11
+24,9
@@
#include <errno.h>
#include <fcntl.h>
#include <stddef.h>
#include <errno.h>
#include <fcntl.h>
#include <stddef.h>
+#include <stdlib.h>
#include <sys/stat.h>
#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#if HAVE_UTIME || HAVE_UTIMES
# if HAVE_UTIME_H
#if HAVE_UTIME || HAVE_UTIMES
# if HAVE_UTIME_H
@@
-44,12
+39,20
@@
#include "error.h"
#include "safe-read.h"
#include "full-write.h"
#include "error.h"
#include "safe-read.h"
#include "full-write.h"
+#include "acl.h"
#include "binary-io.h"
#include "binary-io.h"
-#include "exit.h"
#include "gettext.h"
#include "gettext.h"
+#include "xalloc.h"
#define _(str) gettext (str)
#define _(str) gettext (str)
+/* The results of open() in this file are not used with fchdir,
+ therefore save some unnecessary work in fchdir.c. */
+#undef open
+#undef close
+
+enum { IO_SIZE = 32 * 1024 };
+
void
copy_file_preserving (const char *src_filename, const char *dest_filename)
{
void
copy_file_preserving (const char *src_filename, const char *dest_filename)
{
@@
-57,38
+60,41
@@
copy_file_preserving (const char *src_filename, const char *dest_filename)
struct stat statbuf;
int mode;
int dest_fd;
struct stat statbuf;
int mode;
int dest_fd;
- char buf[4096];
- const size_t buf_size = sizeof (buf);
+ char *buf = xmalloc (IO_SIZE);
src_fd = open (src_filename, O_RDONLY | O_BINARY);
if (src_fd < 0 || fstat (src_fd, &statbuf) < 0)
error (EXIT_FAILURE, errno, _("error while opening \"%s\" for reading"),
src_fd = open (src_filename, O_RDONLY | O_BINARY);
if (src_fd < 0 || fstat (src_fd, &statbuf) < 0)
error (EXIT_FAILURE, errno, _("error while opening \"%s\" for reading"),
- src_filename);
+
src_filename);
mode = statbuf.st_mode & 07777;
dest_fd = open (dest_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600);
if (dest_fd < 0)
error (EXIT_FAILURE, errno, _("cannot open backup file \"%s\" for writing"),
mode = statbuf.st_mode & 07777;
dest_fd = open (dest_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600);
if (dest_fd < 0)
error (EXIT_FAILURE, errno, _("cannot open backup file \"%s\" for writing"),
- dest_filename);
+
dest_filename);
/* Copy the file contents. */
for (;;)
{
/* Copy the file contents. */
for (;;)
{
- size_t n_read = safe_read (src_fd, buf,
buf_size
);
+ size_t n_read = safe_read (src_fd, buf,
IO_SIZE
);
if (n_read == SAFE_READ_ERROR)
if (n_read == SAFE_READ_ERROR)
- error (EXIT_FAILURE, errno, _("error reading \"%s\""), src_filename);
+
error (EXIT_FAILURE, errno, _("error reading \"%s\""), src_filename);
if (n_read == 0)
if (n_read == 0)
- break;
+
break;
if (full_write (dest_fd, buf, n_read) < n_read)
if (full_write (dest_fd, buf, n_read) < n_read)
- error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
+
error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
}
}
+ free (buf);
+
+#if !USE_ACL
if (close (dest_fd) < 0)
error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
if (close (src_fd) < 0)
error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
if (close (dest_fd) < 0)
error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
if (close (src_fd) < 0)
error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
+#endif
/* Preserve the access and modification times. */
#if HAVE_UTIME
/* Preserve the access and modification times. */
#if HAVE_UTIME
@@
-115,5
+121,17
@@
copy_file_preserving (const char *src_filename, const char *dest_filename)
#endif
/* Preserve the access permissions. */
#endif
/* Preserve the access permissions. */
+#if USE_ACL
+ if (copy_acl (src_filename, src_fd, dest_filename, dest_fd, mode))
+ exit (EXIT_FAILURE);
+#else
chmod (dest_filename, mode);
chmod (dest_filename, mode);
+#endif
+
+#if USE_ACL
+ if (close (dest_fd) < 0)
+ error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
+ if (close (src_fd) < 0)
+ error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
+#endif
}
}