summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-07-18 08:29:54 +0300
committerSergey Poznyakoff <gray@gnu.org>2020-07-19 15:50:28 +0300
commit5f89d649de52c5318ffbd147b6fff74001ef1356 (patch)
tree46d2605644af3c06a4d3146c79f49471e049c74f
parentad80cc3dcb6ff6d23eb7abbc12c7a07d6aaee64d (diff)
downloadmailutils-5f89d649de52c5318ffbd147b6fff74001ef1356.tar.gz
mailutils-5f89d649de52c5318ffbd147b6fff74001ef1356.tar.bz2
Minor changes
* testsuite/Makefile.am (cwdrepl_LDADD): Remove mailutils dependencies * testsuite/cwdrepl.c: Replace with a mu-independent version from wydawca. (http://git.gnu.org.ua/cgit/wydawca.git) * testsuite/mockmail.c: Fix indentation * mh/tests/comp.at: Remove trailing whitespace from the output. * mh/tests/forw.at: Likewise. * mh/tests/repl.at: Likewise.
m---------libmailutils/wordsplit0
-rw-r--r--mh/tests/comp.at4
-rw-r--r--mh/tests/forw.at20
-rw-r--r--mh/tests/repl.at8
-rw-r--r--testsuite/Makefile.am2
-rw-r--r--testsuite/cwdrepl.c366
-rw-r--r--testsuite/mockmail.c2
7 files changed, 264 insertions, 138 deletions
diff --git a/libmailutils/wordsplit b/libmailutils/wordsplit
-Subproject cf2c7c86debce18ab24c038afa6dde580c9706e
+Subproject 6a7581f2e60a600a4915e4f55b74a15c8070197
diff --git a/mh/tests/comp.at b/mh/tests/comp.at
index 7b27cc077..9482d1cbd 100644
--- a/mh/tests/comp.at
+++ b/mh/tests/comp.at
@@ -196,7 +196,7 @@ Seen by mhed
MH_CHECK([use Draft-Folder],[comp07 draftfolder],
[mkdir Mail/drafts
echo "Draft-Folder: +drafts" >> $MH
-echo 'quit' | compcmd | cwdrepl
+echo 'quit' | compcmd | cwdrepl | sed 's/ *$//'
sed 's/ *$//' Mail/drafts/1
],
[0],
@@ -218,7 +218,7 @@ Seen by mhed
MH_CHECK([-nodraftfolder],[comp08 nodraftfolder draftfolder],
[mkdir Mail/drafts
echo "Draft-Folder: +drafts" >> $MH
-echo 'quit' | compcmd -nodraftfolder | cwdrepl
+echo 'quit' | compcmd -nodraftfolder | cwdrepl | sed 's/ *$//'
sed 's/ *$//' Mail/draft
],
[0],
diff --git a/mh/tests/forw.at b/mh/tests/forw.at
index 24a9fd4f3..fff6c75c5 100644
--- a/mh/tests/forw.at
+++ b/mh/tests/forw.at
@@ -27,7 +27,7 @@ Subject: test input
message body
])
-echo quit | forwcmd +inbox 1 | cwdrepl
+echo quit | forwcmd +inbox 1 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
cat Mail/draft
echo == Message ==
@@ -87,7 +87,7 @@ Subject: test input
message body
])
-echo quit | forwcmd -format +inbox 1 | cwdrepl
+echo quit | forwcmd -format +inbox 1 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
cat Mail/draft
echo == Message ==
@@ -153,7 +153,7 @@ Subject: 2nd message
2nd message body
])
-echo quit | forwcmd +inbox 1 2 | cwdrepl
+echo quit | forwcmd +inbox 1 2 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
cat Mail/draft
echo == Message 1 ==
@@ -237,7 +237,7 @@ Subject: test input
message body
])
-forwcmd -build +inbox 1 | cwdrepl
+forwcmd -build +inbox 1 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
cat Mail/draft
echo == Message ==
@@ -282,9 +282,9 @@ Subject: 2nd message
2nd message body
])
-forwcmd -build -mime +inbox 1 2 | cwdrepl
+forwcmd -build -mime +inbox 1 2 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
-cwdrepl < Mail/draft
+cwdrepl < Mail/draft | sed 's/ *$//'
echo == Message 1 ==
sed '/^X-IMAPbase/d' Mail/inbox/1
echo == Message 2 ==
@@ -322,7 +322,7 @@ Subject: test input
message body
])
-echo "quit" | forwcmd -draftfolder drafts 1 | cwdrepl
+echo "quit" | forwcmd -draftfolder drafts 1 | cwdrepl | sed 's/ *$//'
echo == Mail/drafts/1 ==
cat Mail/drafts/1
echo == Message ==
@@ -379,7 +379,7 @@ Subject: test input
message body
])
-echo "quit" | forwcmd -file infile | cwdrepl
+echo "quit" | forwcmd -file infile | cwdrepl | sed 's/ *$//'
],
[0],
[-- Editor invocation: ./Mail/draft
@@ -409,7 +409,7 @@ Subject: test input
message body
])
-echo "quit" | forwcmd 1 | cwdrepl
+echo "quit" | forwcmd 1 | cwdrepl | sed 's/ *$//'
echo == Mail/drafts/1 ==
cat Mail/drafts/1
echo == Message ==
@@ -470,7 +470,7 @@ Subject: test input
message body
])
-echo "quit" | forwcmd -nodraftfolder 1 | cwdrepl
+echo "quit" | forwcmd -nodraftfolder 1 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
cat Mail/draft
echo == Message ==
diff --git a/mh/tests/repl.at b/mh/tests/repl.at
index 2165158e8..3f9b732d6 100644
--- a/mh/tests/repl.at
+++ b/mh/tests/repl.at
@@ -28,7 +28,7 @@ Subject: test input
message body
])
-echo "quit" | replcmd +inbox 1 | cwdrepl
+echo "quit" | replcmd +inbox 1 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
cat Mail/draft
],
@@ -58,7 +58,7 @@ Subject: test input
message body
])
-echo "quit" | replcmd -draftfolder drafts +inbox 1 | cwdrepl
+echo "quit" | replcmd -draftfolder drafts +inbox 1 | cwdrepl | sed 's/ *$//'
echo == Mail/drafts/1 ==
cat Mail/drafts/1
],
@@ -90,7 +90,7 @@ Subject: test input
message body
])
-echo "quit" | replcmd +inbox 1 | cwdrepl
+echo "quit" | replcmd +inbox 1 | cwdrepl | sed 's/ *$//'
echo == Mail/drafts/1 ==
cat Mail/drafts/1
],
@@ -122,7 +122,7 @@ Subject: test input
message body
])
-echo "quit" | replcmd -nodraftfolder +inbox 1 | cwdrepl
+echo "quit" | replcmd -nodraftfolder +inbox 1 | cwdrepl | sed 's/ *$//'
echo == Mail/draft ==
cat Mail/draft
],
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 04df55b1a..51a3b8c5d 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -67,7 +67,7 @@ LDADD = \
$(MU_AUTHLIBS)\
$(MU_LIB_MAILUTILS)
-cwdrepl_LDADD = $(MU_LIB_MAILUTILS)
+cwdrepl_LDADD =
mockmta_LDADD = $(TLS_LIBS)
## ------------ ##
diff --git a/testsuite/cwdrepl.c b/testsuite/cwdrepl.c
index 2a52342a6..85ee4ad07 100644
--- a/testsuite/cwdrepl.c
+++ b/testsuite/cwdrepl.c
@@ -1,19 +1,3 @@
-/* This file is part of GNU Mailutils testsuite.
- Copyright (C) 2017-2020 Free Software Foundation, Inc.
-
- GNU Mailutils is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- GNU Mailutils is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
-
/*
NAME
@@ -29,7 +13,7 @@ DESCRIPTION
Some testcases operate programs that produce full file names as part
of their output. To make this output independent of the actual file
location, this tool replaces every occurrence of the current working
- directory with dot. Both logical (as given by the PWD environment
+ directory with a dot. Both logical (as given by the PWD environment
variable) and physical (as returned by getcwd(3)) locations are replaced.
The same effect could have been achieved by using "pwd -P", "pwd -L"
@@ -42,143 +26,285 @@ DESCRIPTION
of the logical current working directory name with the string PWD, instead
of the default dot.
+LICENSE
+ Copyright (C) 2017-2020 Sergey Poznyakoff
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+
+HISTORY
+
+ 2017-06-07 The program appeared in the GNU mailutils testsuite (see
+ commit 453cd17f7a4be5ceaa8411a8a3ebd9fddd88df8e).
+ 2019-11-29 Make sure the longest possible match is replaced.
+ (ibid., commit 5ccef4cfd1eb3252430f04fa8418268a93ff8b08).
+ 2020-03-13 Port to standard libc for use in other projects.
+
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <mailutils/mailutils.h>
+#include <assert.h>
+#include <errno.h>
+#include <unistd.h>
+#include <ctype.h>
-struct dirtrans
-{
- char *dir;
- size_t dirlen;
- char const *trans;
- ssize_t translen;
+struct dirtrans {
+ char *dir;
+ size_t dirlen;
+ char const *trans;
+ ssize_t translen;
+ struct dirtrans *next;
};
-mu_list_t translist;
+struct dirtrans *dir_head, *dir_tail;
+size_t dir_count;
static int
-transcmp (const void *a, const void *b)
+dirtranscmp(struct dirtrans const *trans1, struct dirtrans const *trans2)
{
- struct dirtrans const *trans1 = a;
- struct dirtrans const *trans2 = b;
- 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);
+ 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);
}
-static void
-newdir (char const *dir, char const *trans)
+static struct dirtrans *
+dirtrans_alloc(char const *dir, char const *trans)
{
- if (dir)
- {
- size_t dirlen = strlen (dir);
- size_t translen = strlen (trans);
- struct dirtrans *dt = mu_alloc (sizeof *dt);
-
- while (dirlen > 0 && dir[dirlen-1] == '/')
+ size_t dirlen = strlen(dir);
+ size_t translen = strlen(trans);
+ struct dirtrans *dt = malloc(sizeof *dt);
+
+ assert(dt!=NULL);
+
+ while (dirlen > 0 && dir[dirlen-1] == '/')
dirlen--;
- dt->dir = mu_alloc (dirlen + 1);
- memcpy (dt->dir, dir, dirlen);
- dt->dir[dirlen] = 0;
- dt->dirlen = dirlen;
- dt->trans = trans;
- dt->translen = translen;
-
- if (!translist)
- {
- MU_ASSERT (mu_list_create (&translist));
- mu_list_set_comparator (translist, transcmp);
+ dt->dir = malloc(dirlen + 1);
+ assert(dt->dir != NULL);
+ memcpy(dt->dir, dir, dirlen);
+ dt->dir[dirlen] = 0;
+ dt->dirlen = dirlen;
+ dt->trans = trans;
+ dt->translen = translen;
+ dt->next = NULL;
+
+ return dt;
+}
+
+static void
+dirtrans_free(struct dirtrans *dt)
+{
+ if (dt) {
+ free(dt->dir);
+ free(dt);
+ }
+}
+
+static void
+newdir(char const *dir, char const *trans)
+{
+ struct dirtrans *l, *m, *dt;
+ size_t i, n, count;
+
+ dt = dirtrans_alloc(dir, trans);
+
+ l = dir_head;
+ if (l) {
+ if (dirtranscmp(l, dt) > 0) {
+ l = NULL;
+ } else if (dirtranscmp(dir_tail, dt) < 0) {
+ l = dir_tail;
+ } else {
+ count = dir_count;
+ while (count) {
+ int c;
+
+ n = count / 2;
+ for (m = l, i = 0; i < n; m = m->next, i++)
+ ;
+
+ c = dirtranscmp(m, dt);
+ if (c == 0) {
+ dirtrans_free(dt);
+ return;
+ } else if (n == 0) {
+ break;
+ } else if (c < 0) {
+ l = m;
+ count -= n;
+ } else {
+ count = n;
+ }
+ }
}
- else if (mu_list_locate (translist, dt, NULL) == 0)
- {
- free (dt->dir);
- free (dt);
- return;
+ }
+
+ if (!l) {
+ if (dir_head == NULL)
+ dir_head = dir_tail = dt;
+ else {
+ dt->next = dir_head;
+ dir_head = dt;
}
+ } else {
+ while (l->next && dirtranscmp(l->next, dt) < 0)
+ l = l->next;
+
+ dt->next = l->next;
+ l->next = dt;
+ if (!dt->next)
+ dir_tail = dt;
+ }
+ dir_count++;
+}
- MU_ASSERT (mu_list_append (translist, dt));
+static char *
+bufrealloc(char *buf, size_t *psize)
+{
+ size_t size = *psize;
+
+ if (size == 0) {
+ size = 64;
+ buf = malloc(64);
+ } else {
+ if ((size_t) -1 / 3 * 2 <= size) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ size += (size + 1) / 2;
+ buf = realloc(buf, size);
}
+ *psize = size;
+ return buf;
+}
+
+static char *
+getcwd_alloc(void)
+{
+ size_t size = 0;
+ char *buf = NULL;
+ char *p;
+
+ do {
+ buf = bufrealloc(buf, &size);
+ if (!buf) {
+ perror("getcwd_alloc");
+ abort();
+ }
+ } while ((p = getcwd(buf, size)) == NULL && errno == ERANGE);
+ return buf;
+}
+
+ssize_t
+input(char **pbuf, size_t *psize)
+{
+ char *buf = *pbuf;
+ size_t size = *psize;
+ ssize_t off = 0;
+
+ do {
+ if (size == 0 || off + 1 == size) {
+ buf = bufrealloc(buf, &size);
+ if (!buf) {
+ perror("input");
+ abort();
+ }
+
+ }
+ if (!fgets(buf + off, size - off, stdin)) {
+ if (off == 0)
+ return -1;
+ break;
+ }
+ off += strlen(buf + off);
+ } while (buf[off - 1] != '\n');
+
+ buf[--off] = 0;
+ *pbuf = buf;
+ *psize = size;
+
+ return off;
}
static inline int
-isbnd (int c)
+isbnd(int c)
{
- return mu_c_is_class (c, MU_CTYPE_CNTRL|MU_CTYPE_PUNCT|MU_CTYPE_SPACE);
+ return iscntrl(c) || ispunct(c) || isspace(c);
}
int
-main (int argc, char **argv)
+main(int argc, char **argv)
{
- int i;
- int rc;
- char *buf = NULL;
- size_t size, n;
- mu_iterator_t itr;
-
- mu_set_program_name (argv[0]);
- mu_stdstream_setup (MU_STDSTREAM_RESET_NONE);
-
- for (i = 1; i < argc; i += 2)
- newdir (argv[i], (i + 1 < argc) ? argv[i + 1] : "");
-
- newdir (getenv ("PWD"), ".");
- newdir (mu_getcwd (), ".");
-
- mu_list_sort (translist, NULL);
-
- MU_ASSERT (mu_list_get_iterator (translist, &itr));
- while ((rc = mu_stream_getline (mu_strin, &buf, &size, &n)) == 0 && n > 0)
- {
- n = mu_rtrim_class (buf, MU_CTYPE_SPACE);
- for (mu_iterator_first (itr); !mu_iterator_is_done (itr);
- mu_iterator_next (itr))
- {
- struct dirtrans *dt;
- size_t start = 0;
- char *p;
-
- mu_iterator_current (itr, (void**) &dt);
- while ((p = strstr (buf + start, dt->dir)))
- {
- if (isbnd (p[dt->dirlen]))
- {
- size_t off = p - buf;
- size_t rest = n - start;
- ssize_t d = (ssize_t)dt->translen - dt->dirlen;
-
- if (d > 0)
- {
- if (n + d + 1 > size)
- {
- size = n + d + 1;
- buf = mu_realloc (buf, size);
- p = buf + off;
+ size_t i;
+ char *buf = NULL;
+ size_t size = 0;
+ ssize_t n;
+
+ assert(argc % 2 != 0);
+ for (i = 1; i < argc; i += 2)
+ newdir(argv[i], argv[i + 1]);
+
+ newdir(getenv("PWD"), ".");
+ newdir (getcwd_alloc(), ".");
+
+ while ((n = input(&buf, &size)) >= 0) {
+ struct dirtrans *dt;
+
+ for (dt = dir_head; dt; dt = dt->next) {
+ size_t start = 0;
+ char *p;
+
+ while ((p = strstr(buf + start, dt->dir))) {
+ if (isbnd(p[dt->dirlen])) {
+ size_t off = p - buf;
+ size_t rest = n - start;
+ ssize_t d = (ssize_t) dt->translen - dt->dirlen;
+
+ if (d > 0) {
+ if (n + d + 1 > size) {
+ size = n + d + 1;
+ buf = realloc(buf, size);
+ assert(buf != NULL);
+ p = buf + off;
}
}
+
+ memmove(p + dt->translen, p + dt->dirlen,
+ rest - dt->dirlen + 1);
+ memcpy(p, dt->trans, dt->translen);
- memmove (p + dt->translen, p + dt->dirlen,
- rest - dt->dirlen + 1);
- memcpy (p, dt->trans, dt->translen);
-
- n += d;
- start = off + dt->translen;
- }
- else
- start++;
+ n += d;
+ start = off + dt->translen;
+ } else
+ start++;
}
}
- mu_stream_write (mu_strout, buf, n, NULL);
- mu_stream_write (mu_strout, "\n", 1, NULL);
+ fwrite(buf, n, 1, stdout);
+ putchar('\n');
}
- return 0;
+ return 0;
}
+
+/* Local Variables: */
+/* mode: c */
+/* c-basic-offset: 4 */
+/* End: */
diff --git a/testsuite/mockmail.c b/testsuite/mockmail.c
index 485bd80e1..09cdb2296 100644
--- a/testsuite/mockmail.c
+++ b/testsuite/mockmail.c
@@ -458,7 +458,7 @@ main (int argc, char **argv)
if (p)
p[1] = 0;
msg_add_rcpt (&msg, q);
- }
+ }
else
msg_add_rcpt (&msg, p);
}

Return to:

Send suggestions and report system problems to the System administrator.