X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcopy-acl.c;h=bc2740a465212f6198e1fbd48cc92f875e8bb60e;hb=0600c3a06dc7495a7649234fe6e1ff813abeac02;hp=780865cef0d1bec80f9847a1645888166a17c688;hpb=3f5a64015c34e525c73ccda17d5e300c58ee7505;p=gnulib.git diff --git a/lib/copy-acl.c b/lib/copy-acl.c index 780865cef..bc2740a46 100644 --- a/lib/copy-acl.c +++ b/lib/copy-acl.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . - Written by Paul Eggert and Andreas Gruenbacher. */ + Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ #include @@ -23,6 +23,9 @@ #include "acl-internal.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* Copy access control lists from one file to another. If SOURCE_DESC is a valid file descriptor, use file descriptor operations, else use @@ -57,7 +60,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (ACL_NOT_WELL_SUPPORTED (errno)) return qset_acl (dst_name, dest_desc, mode); else - return -2; + return -2; } if (HAVE_ACL_SET_FD && dest_desc != -1) @@ -69,7 +72,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, int saved_errno = errno; if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_access_nontrivial (acl)) - { + { acl_free (acl); return chmod_or_fchmod (dst_name, dest_desc, mode); } @@ -108,7 +111,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, return -1; } else - acl_free (acl); + acl_free (acl); } return 0; @@ -144,7 +147,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (ACL_NOT_WELL_SUPPORTED (errno)) return qset_acl (dst_name, dest_desc, mode); else - return -2; + return -2; } if (HAVE_ACL_SET_FD && dest_desc != -1) @@ -156,7 +159,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, int saved_errno = errno; if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_extended_nontrivial (acl)) - { + { acl_free (acl); return chmod_or_fchmod (dst_name, dest_desc, mode); }