Re: [coreutils] cp/reflink-perm fails on btrfs (and probably on ocfs2, too)

[Jim Meyering]

Jim Meyering wrote:
...
> Subject: [PATCH] copy: correct misuse of quote in diagnostic
>
> * src/copy.c (copy_reg): Multiple uses of quote (s) in an
> argument list is erroneous.  Use quote_n, instead.
> ---
>  src/copy.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/copy.c b/src/copy.c
> index 65566a0..186086e 100644
> --- a/src/copy.c
> +++ b/src/copy.c
> @@ -975,7 +975,7 @@ copy_reg (char const *src_name, char const *dst_name,
>            if (!clone_ok)
>              {
>                error (0, errno, _("failed to clone %s from %s"),
> -                     quote (dst_name), quote (src_name));
> +                     quote_n (0, dst_name), quote_1 (1, src_name));

My bad.
I pushed the above in your name.  Sorry about that, Jeff.
Days like this I really hate the write-once approach we impose on master.
Here's the fix:


>From 47ef7504dab60f04b79e1c50f533ecd689d28598 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 3 May 2011 10:23:12 +0200
Subject: [PATCH] copy: fix my typo

* src/copy.c (copy_reg): Fix my typo (mis-applied patch).
The patch by Jeff Liu was fine, but I mis-applied it
and introduced a compilation error in commit efa479c1.

2011-05-03  Jim Meyering  <address@hidden>
---
 src/copy.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/copy.c b/src/copy.c
index 186086e..801a474 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -975,7 +975,7 @@ copy_reg (char const *src_name, char const *dst_name,
           if (!clone_ok)
             {
               error (0, errno, _("failed to clone %s from %s"),
-                     quote_n (0, dst_name), quote_1 (1, src_name));
+                     quote_n (0, dst_name), quote_n (1, src_name));
               return_val = false;
               goto close_src_and_dst_desc;
             }
--
1.7.5.141.g791a