move extract_token to libparse

- Move `extract_token()` to libparse - Drop dummy copy in the test code
flatcap · Mar 13, 2023 · b2c1625 · b2c1625
1 parent d44e665
commit b2c1625
Show file tree

Hide file tree

Showing 24 changed files with 180 additions and 392 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -737,7 +737,7 @@
 2019-11-11  Richard Russon  \<rich@flatcap.org\>
 * Bug Fixes
   - browser: fix directory view
-  - fix crash in mutt_extract_token()
+  - fix crash in parse_extract_token()
   - force a screen refresh
   - fix crash sending message from command line
   - notmuch: use nm_default_url if no mailbox data

diff --git a/Makefile.autosetup b/Makefile.autosetup
@@ -674,7 +674,7 @@ $(PWD)/pager:
 ###############################################################################
 # libparse
 LIBPARSE=	libparse.a
-LIBPARSEOBJS=
+LIBPARSEOBJS=	parse/extract.o
 CLEANFILES+=	$(LIBPARSE) $(LIBPARSEOBJS)
 ALLOBJS+=	$(LIBPARSEOBJS)
 

diff --git a/alias/commands.c b/alias/commands.c
@@ -33,11 +33,10 @@
 #include "address/lib.h"
 #include "config/lib.h"
 #include "core/lib.h"
-#include "mutt.h"
 #include "commands.h"
 #include "lib.h"
+#include "parse/lib.h"
 #include "alias.h"
-#include "init.h"
 #include "reverse.h"
 
 /**
@@ -59,7 +58,7 @@ enum CommandResult parse_alias(struct Buffer *buf, struct Buffer *s,
   }
 
   /* name */
-  mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+  parse_extract_token(buf, s, TOKEN_NO_FLAGS);
   mutt_debug(LL_DEBUG5, "First token is '%s'\n", buf->data);
   if (parse_grouplist(&gl, buf, s, err) == -1)
   {
@@ -68,7 +67,7 @@ enum CommandResult parse_alias(struct Buffer *buf, struct Buffer *s,
   char *name = mutt_str_dup(buf->data);
 
   /* address list */
-  mutt_extract_token(buf, s, TOKEN_QUOTE | TOKEN_SPACE | TOKEN_SEMICOLON);
+  parse_extract_token(buf, s, TOKEN_QUOTE | TOKEN_SPACE | TOKEN_SEMICOLON);
   mutt_debug(LL_DEBUG5, "Second token is '%s'\n", buf->data);
   struct AddressList al = TAILQ_HEAD_INITIALIZER(al);
   int parsed = mutt_addrlist_parse2(&al, buf->data);
@@ -163,7 +162,7 @@ enum CommandResult parse_unalias(struct Buffer *buf, struct Buffer *s,
 {
   do
   {
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
     struct Alias *np = NULL;
     if (mutt_str_equal("*", buf->data))

diff --git a/alternates.c b/alternates.c
@@ -34,10 +34,9 @@
 #include "address/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
-#include "mutt.h"
 #include "alternates.h"
+#include "parse/lib.h"
 #include "commands.h"
-#include "init.h"
 
 struct RegexList Alternates = STAILQ_HEAD_INITIALIZER(Alternates); ///< List of regexes to match the user's alternate email addresses
 struct RegexList UnAlternates = STAILQ_HEAD_INITIALIZER(UnAlternates); ///< List of regexes to exclude false matches in Alternates
@@ -93,7 +92,7 @@ enum CommandResult parse_alternates(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
     if (parse_grouplist(&gl, buf, s, err) == -1)
       goto bail;
@@ -127,7 +126,7 @@ enum CommandResult parse_unalternates(struct Buffer *buf, struct Buffer *s,
 {
   do
   {
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
     mutt_regexlist_remove(&Alternates, buf->data);
 
     if (!mutt_str_equal(buf->data, "*") &&

diff --git a/attach/attachments.c b/attach/attachments.c
@@ -36,10 +36,9 @@
 #include "email/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
-#include "mutt.h"
 #include "attachments.h"
 #include "ncrypt/lib.h"
-#include "init.h"
+#include "parse/lib.h"
 
 /**
  * struct AttachMatch - An attachment matching a regex for attachment counter
@@ -316,7 +315,7 @@ static enum CommandResult parse_attach_list(struct Buffer *buf, struct Buffer *s
 
   do
   {
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
     if (!buf->data || (*buf->data == '\0'))
       continue;
@@ -394,7 +393,7 @@ static enum CommandResult parse_unattach_list(struct Buffer *buf, struct Buffer
 
   do
   {
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
     FREE(&tmp);
 
     if (mutt_istr_equal(buf->data, "any"))
@@ -470,7 +469,7 @@ static int print_attach_list(struct ListHead *h, const char op, const char *name
 enum CommandResult parse_attachments(struct Buffer *buf, struct Buffer *s,
                                      intptr_t data, struct Buffer *err)
 {
-  mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+  parse_extract_token(buf, s, TOKEN_NO_FLAGS);
   if (!buf->data || (*buf->data == '\0'))
   {
     mutt_buffer_strcpy(err, _("attachments: no disposition"));
@@ -533,7 +532,7 @@ enum CommandResult parse_unattachments(struct Buffer *buf, struct Buffer *s,
   char *p = NULL;
   struct ListHead *head = NULL;
 
-  mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+  parse_extract_token(buf, s, TOKEN_NO_FLAGS);
   if (!buf->data || (*buf->data == '\0'))
   {
     mutt_buffer_strcpy(err, _("unattachments: no disposition"));

diff --git a/color/command.c b/color/command.c
@@ -35,10 +35,9 @@
 #include "mutt/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
-#include "mutt.h"
 #include "lib.h"
 #include "pager/lib.h"
-#include "init.h"
+#include "parse/lib.h"
 #include "options.h"
 #ifdef USE_DEBUG_COLOR
 #include <stdio.h>
@@ -231,7 +230,7 @@ static enum CommandResult parse_attr_spec(struct Buffer *buf, struct Buffer *s,
     return MUTT_CMD_WARNING;
   }
 
-  mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+  parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
   if (mutt_istr_equal("bold", buf->data))
     *attrs |= A_BOLD;
@@ -273,7 +272,7 @@ static enum CommandResult parse_color_pair(struct Buffer *buf, struct Buffer *s,
       return MUTT_CMD_WARNING;
     }
 
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
     if (mutt_istr_equal("bold", buf->data))
     {
@@ -325,7 +324,7 @@ static enum CommandResult parse_color_pair(struct Buffer *buf, struct Buffer *s,
     return MUTT_CMD_WARNING;
   }
 
-  mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+  parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
   return parse_color_name(buf->data, bg, attrs, false, err);
 }
@@ -397,7 +396,7 @@ static enum CommandResult parse_object(struct Buffer *buf, struct Buffer *s,
       return MUTT_CMD_WARNING;
     }
 
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
     rc = mutt_map_get_value(buf->data, ComposeColorFields);
     if (rc == -1)
@@ -440,7 +439,7 @@ static enum CommandResult parse_object(struct Buffer *buf, struct Buffer *s,
 static enum CommandResult parse_uncolor(struct Buffer *buf, struct Buffer *s,
                                         struct Buffer *err, bool uncolor)
 {
-  mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+  parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
   if (mutt_str_equal(buf->data, "*"))
   {
@@ -487,7 +486,7 @@ static enum CommandResult parse_uncolor(struct Buffer *buf, struct Buffer *s,
     {
       color_debug(LL_DEBUG5, "do nothing\n");
       /* just eat the command, but don't do anything real about it */
-      mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+      parse_extract_token(buf, s, TOKEN_NO_FLAGS);
     } while (MoreArgs(s));
 
     return MUTT_CMD_SUCCESS;
@@ -504,7 +503,7 @@ static enum CommandResult parse_uncolor(struct Buffer *buf, struct Buffer *s,
 
   do
   {
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
     if (mutt_str_equal("*", buf->data))
     {
       if (regex_colors_parse_uncolor(cid, NULL, uncolor))
@@ -742,7 +741,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
     return MUTT_CMD_WARNING;
   }
 
-  mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+  parse_extract_token(buf, s, TOKEN_NO_FLAGS);
   color_debug(LL_DEBUG5, "color: %s\n", mutt_buffer_string(buf));
 
   rc = parse_object(buf, s, &cid, &q_level, err);
@@ -760,7 +759,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
     color_debug(LL_DEBUG5, "regex needed\n");
     if (MoreArgs(s))
     {
-      mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+      parse_extract_token(buf, s, TOKEN_NO_FLAGS);
     }
     else
     {
@@ -811,12 +810,12 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
      * 0 arguments: sets the default status color (handled below by else part)
      * 1 argument : colorize pattern on match
      * 2 arguments: colorize nth submatch of pattern */
-    mutt_extract_token(buf, s, TOKEN_NO_FLAGS);
+    parse_extract_token(buf, s, TOKEN_NO_FLAGS);
 
     if (MoreArgs(s))
     {
       struct Buffer tmp = mutt_buffer_make(0);
-      mutt_extract_token(&tmp, s, TOKEN_NO_FLAGS);
+      parse_extract_token(&tmp, s, TOKEN_NO_FLAGS);
       if (!mutt_str_atoui_full(tmp.data, &match))
       {
         mutt_buffer_printf(err, _("%s: invalid number: %s"),