Attachment 599791 Details for Bug 755508 – Proposed patch

[patch] Proposed patch

coreutils-cp-tristate.patch (text/plain), 1.76 KB, created by Ondrej Oprala on 2012-07-23 14:20:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ondrej Oprala

Created: 2012-07-23 14:20:33 UTC

Size: 1.76 KB

patch

obsolete

>diff -up coreutils-8.17/src/copy.c.tristate coreutils-8.17/src/copy.c
>--- coreutils-8.17/src/copy.c.tristate	2012-07-23 16:03:10.465852350 +0200
>+++ coreutils-8.17/src/copy.c	2012-07-23 16:13:33.570796509 +0200
>@@ -1151,6 +1151,11 @@ preserve_metadata:
>       if (set_acl (dst_name, dest_desc, x->mode) != 0)
>         return_val = false;
>     }
>+  else if (x->explicit_no_preserve)
>+    {
>+      set_acl(dst_name, dest_desc, 0666 & ~cached_umask ());
>+      return_val = false;
>+    }
>   else if (omitted_permissions)
>     {
>       omitted_permissions &= ~ cached_umask ();
>diff -up coreutils-8.17/src/copy.h.tristate coreutils-8.17/src/copy.h
>--- coreutils-8.17/src/copy.h.tristate	2012-07-23 16:04:31.434435679 +0200
>+++ coreutils-8.17/src/copy.h	2012-07-23 16:05:09.784240710 +0200
>@@ -157,6 +157,7 @@ struct cp_options
>   bool preserve_ownership;
>   bool preserve_mode;
>   bool preserve_timestamps;
>+  bool explicit_no_preserve;
> 
>   /* Enabled for mv, and for cp by the --preserve=links option.
>      If true, attempt to preserve in the destination files any
>diff -up coreutils-8.17/src/cp.c.tristate coreutils-8.17/src/cp.c
>--- coreutils-8.17/src/cp.c.tristate	2012-07-23 16:06:53.496720483 +0200
>+++ coreutils-8.17/src/cp.c	2012-07-23 16:08:38.726202542 +0200
>@@ -783,6 +783,7 @@ cp_option_init (struct cp_options *x)
>   x->preserve_links = false;
>   x->preserve_mode = false;
>   x->preserve_timestamps = false;
>+  x->explicit_no_preserve = false;
>   x->preserve_security_context = false;
>   x->require_preserve_context = false;
>   x->preserve_xattr = false;
>@@ -860,6 +861,7 @@ decode_preserve_arg (char const *arg, st
>         {
>         case PRESERVE_MODE:
>           x->preserve_mode = on_off;
>+          x->explicit_no_preserve = ~on_off;
>           break;
> 
>         case PRESERVE_TIMESTAMPS:

Actions: View | Diff

Attachments on bug 755508: 599791