Fix the cwdrepl auxiliary tool.

Make sure the longest possible match is replaced.

* testsuite/cwdrepl.c: Sort the translist by directory
length, in descending order.
* mail/tests/atlocal.in: Add $testsuitedir to $PATH
* mail/tests/hold.at (MAIL_TEST): Use cwdrepl instead
of sed rules.  Correct expected outputs accordingly.

3 files changed, 26 insertions, 18 deletions

diff --git a/mail/tests/atlocal.in b/mail/tests/atlocal.in
index 80e3ea021..9bed5ac56 100644
--- a/mail/tests/atlocal.in
+++ b/mail/tests/atlocal.in
@@ -1,11 +1,11 @@
 # @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for Mailutils test suite.
 # Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
-PATH=@abs_builddir@:@abs_top_builddir@/mail:$top_srcdir:$srcdir:$PATH
+PATH=@abs_top_builddir@/testsuite:@abs_builddir@:@abs_top_builddir@/mail:$top_srcdir:$srcdir:$PATH
 testsuitedir=@abs_top_srcdir@/testsuite
 MALLOC_CHECK_=2
 export MALLOC_CHECK_
 catmbox() {
     sed -e /^X-IMAPbase:/d -e /^X-UID:/d $1
 }
diff --git a/mail/tests/hold.at b/mail/tests/hold.at
index 1bf2531e8..dcd9befe3 100644
--- a/mail/tests/hold.at
+++ b/mail/tests/hold.at
@@ -22,13 +22,13 @@ AT_CHECK(
  [AT_DATA([inbox],[$2])
 AT_DATA([rc],[$4])
 export MAIL=inbox
 export MBOX=mbox
 > $MBOX
 CWD=$(pwd)
-MUT_MAIL_CMD -N -E "set folder=$CWD" < rc | sed -e 's/  *$//' -e "s|$CWD/||"
+MUT_MAIL_CMD -N -E "set folder=$CWD" < rc | cwdrepl | sed -e 's/  *$//' 
 $3
 ],
 [0],
 [$5])
 AT_CLEANUP])
 
@@ -64,14 +64,14 @@ quit
 ],
 [From: March Hare  <hare@wonder.land>
 To: Alice  <alice@wonder.land>
 Subject: Invitation
 
 Have some wine
-Saved 1 message in mbox
-Held 1 message in inbox
+Saved 1 message in ./mbox
+Held 1 message in ./inbox
 == inbox ==
 From alice@wonder.land Mon Jul 29 22:00:09 2002
 From: Alice  <alice@wonder.land>
 To: March Hare  <hare@wonder.land>
 Subject: Re: Invitation
 Status: O
@@ -101,13 +101,13 @@ quit
 ],
 [From: March Hare  <hare@wonder.land>
 To: Alice  <alice@wonder.land>
 Subject: Invitation
 
 Have some wine
-Held 2 messages in inbox
+Held 2 messages in ./inbox
 == inbox ==
 From hare@wonder.land Mon Jul 29 22:00:08 2002
 From: March Hare  <hare@wonder.land>
 To: Alice  <alice@wonder.land>
 Subject: Invitation
 Status: OR
@@ -133,14 +133,14 @@ echo == mbox ==
 catmbox mbox
 ],
 [set nohold
 touch 1
 quit
 ],
-[Saved 1 message in mbox
-Held 1 message in inbox
+[Saved 1 message in ./mbox
+Held 1 message in ./inbox
 == inbox ==
 From alice@wonder.land Mon Jul 29 22:00:09 2002
 From: Alice  <alice@wonder.land>
 To: March Hare  <hare@wonder.land>
 Subject: Re: Invitation
 Status: O
@@ -165,13 +165,13 @@ echo == mbox ==
 catmbox mbox
 ],
 [set hold
 touch 1
 quit
 ],
-[Held 2 messages in inbox
+[Held 2 messages in ./inbox
 == inbox ==
 From hare@wonder.land Mon Jul 29 22:00:08 2002
 From: March Hare  <hare@wonder.land>
 To: Alice  <alice@wonder.land>
 Subject: Invitation
 Status: O
@@ -199,14 +199,14 @@ echo == dest ==
 catmbox dest
 ],
 [set nohold nokeepsave
 save 1 +dest
 quit
 ],
-["dest"   7/152
-Held 1 message in inbox
+["./dest"   7/152
+Held 1 message in ./inbox
 == inbox ==
 From alice@wonder.land Mon Jul 29 22:00:09 2002
 From: Alice  <alice@wonder.land>
 To: March Hare  <hare@wonder.land>
 Subject: Re: Invitation
 Status: O
@@ -234,15 +234,15 @@ echo == dest ==
 catmbox dest
 ],
 [set nohold keepsave
 save 1 +dest
 quit
 ],
-["dest"   7/152
-Saved 1 message in mbox
-Held 1 message in inbox
+["./dest"   7/152
+Saved 1 message in ./mbox
+Held 1 message in ./inbox
 == inbox ==
 From alice@wonder.land Mon Jul 29 22:00:09 2002
 From: Alice  <alice@wonder.land>
 To: March Hare  <hare@wonder.land>
 Subject: Re: Invitation
 Status: O
@@ -277,14 +277,14 @@ echo == dest ==
 catmbox dest
 ],
 [set hold keepsave
 save 1 +dest
 quit
 ],
-["dest"   7/152
-Held 2 messages in inbox
+["./dest"   7/152
+Held 2 messages in ./inbox
 == inbox ==
 From hare@wonder.land Mon Jul 29 22:00:08 2002
 From: March Hare  <hare@wonder.land>
 To: Alice  <alice@wonder.land>
 Subject: Invitation
 Status: O
@@ -320,14 +320,14 @@ echo == dest ==
 catmbox dest
 ],
 [set hold nokeepsave
 save 1 +dest
 quit
 ],
-["dest"   7/152
-Held 1 message in inbox
+["./dest"   7/152
+Held 1 message in ./inbox
 == inbox ==
 From alice@wonder.land Mon Jul 29 22:00:09 2002
 From: Alice  <alice@wonder.land>
 To: March Hare  <hare@wonder.land>
 Subject: Re: Invitation
 Status: O
diff --git a/testsuite/cwdrepl.c b/testsuite/cwdrepl.c
index 44fcfd768..31de06bef 100644
--- a/testsuite/cwdrepl.c
+++ b/testsuite/cwdrepl.c
@@ -63,13 +63,19 @@ mu_list_t translist;
 
 static int
 transcmp (const void *a, const void *b)
 {
   struct dirtrans const *trans1 = a;
   struct dirtrans const *trans2 = b;
-  return strcmp (trans1->dir, trans2->dir);
+  size_t l1 = strlen (trans1->dir);
+  size_t l2 = strlen (trans2->dir);
+  if (l1 < l2)
+    return 1;
+  else if (l1 > l2)
+    return -1;
+  return strcmp (trans2->dir, trans1->dir);
 }