Re: bin/42031: mtree(8) -M (merge) option broken

[Alan Barrett <apb%cequrux.com@localhost>]

The following reply was made to PR bin/42031; it has been noted by GNATS.

From: Alan Barrett <apb%cequrux.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: bin/42031: mtree(8) -M (merge) option broken
Date: Fri, 11 Sep 2009 09:12:26 +0200

 On Thu, 10 Sep 2009, gcw%primenet.com.au@localhost wrote:
 > >Synopsis:       mtree(8) merge option broken with spec.c:1.69
 
 I am working on a proper fix, but as a quick workaround you can try
 this patch, which should allow "-M" to work again, but which will make
 "-S" sort purely by name instead of by the documented criteria.
 
 --- spec.c     11 Apr 2009 14:32:51 -0000      1.75
 +++ spec.c     11 Sep 2009 07:07:37 -0000
 @@ -739,10 +739,12 @@ static int
  nodecmp(const NODE *a, const NODE *b)
  {
  
 +#if 0 /* XXX temporarily disabled as a workaround for PR 42031 */
        if ((a->type & F_DIR) != 0) {
                if ((b->type & F_DIR) == 0)
                        return 1;
        } else if ((b->type & F_DIR) != 0)
                return -1;
 +#endif
        return strcmp(a->name, b->name);
  }