projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include <stdlib.h>, for malloc().
[gnulib.git]
/
lib
/
copy-file.c
diff --git
a/lib/copy-file.c
b/lib/copy-file.c
index
ca620dc
..
5416c76
100644
(file)
--- a/
lib/copy-file.c
+++ b/
lib/copy-file.c
@@
-1,5
+1,5
@@
/* Copying of files.
/* Copying of files.
- Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2006
-2007
Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
@@
-25,6
+25,7
@@
#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 <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
@@
-39,12
+40,18
@@
#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"
#define _(str) gettext (str)
#include "gettext.h"
#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
+
+
void
copy_file_preserving (const char *src_filename, const char *dest_filename)
{
void
copy_file_preserving (const char *src_filename, const char *dest_filename)
{
@@
-80,10
+87,12
@@
copy_file_preserving (const char *src_filename, const char *dest_filename)
error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
}
error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
}
+#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
@@
-110,5
+119,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
}
}