From: Richard Russon <rich@flatcap.org>
Date: Fri, 13 Jul 2018 20:59:49 +0000 (+0100)
Subject: move from to libemail
X-Git-Tag: 2019-10-25~756^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2f8a090dc2883aff8d230258c3f197e15e558a0;p=neomutt

move from to libemail
---

diff --git a/Makefile.autosetup b/Makefile.autosetup
index c64920a2a..ec4a0f20c 100644
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -64,7 +64,7 @@ NEOMUTT=	neomutt$(EXEEXT)
 NEOMUTTOBJS=	addrbook.o alias.o bcache.o browser.o buffy.o \
 		color.o commands.o complete.o compose.o compress.o \
 		conststrings.o copy.o curs_lib.o curs_main.o edit.o editmsg.o \
-		enriched.o enter.o filter.o flags.o from.o group.o handler.o \
+		enriched.o enter.o filter.o flags.o group.o handler.o \
 		hdrline.o help.o hook.o init.o keymap.o \
 		main.o menu.o muttlib.o mutt_account.o mutt_attach.o mutt_body.o mutt_header.o \
 		mutt_history.o mutt_logging.o mutt_signal.o mutt_socket.o mutt_thread.o mutt_window.o mx.o \
@@ -90,7 +90,7 @@ ALLOBJS+=	$(NEOMUTTOBJS)
 # libemail
 LIBEMAIL=	libemail.a
 LIBEMAILOBJS=	email/address.o email/attach.o email/body.o email/envelope.o \
-		email/header.o email/parameter.o email/tags.o email/thread.o
+		email/from.o email/header.o email/parameter.o email/tags.o email/thread.o
 CLEANFILES+=	$(LIBEMAIL) $(LIBEMAILOBJS)
 MUTTLIBS+=	$(LIBEMAIL)
 ALLOBJS+=	$(LIBEMAILOBJS)
diff --git a/email/email.h b/email/email.h
index d919a8ecc..b7d78d5f7 100644
--- a/email/email.h
+++ b/email/email.h
@@ -31,6 +31,7 @@
  * | email/attach.c    | @subpage email_attach    |
  * | email/body.c      | @subpage email_body      |
  * | email/envelope.c  | @subpage email_envelope  |
+ * | email/from.c      | @subpage email_from      |
  * | email/header.c    | @subpage email_header    |
  * | email/parameter.c | @subpage email_parameter |
  * | email/tags.c      | @subpage email_tags      |
@@ -45,6 +46,7 @@
 #include "body.h"
 #include "content.h"
 #include "envelope.h"
+#include "from.h"
 #include "header.h"
 #include "parameter.h"
 #include "tags.h"
diff --git a/from.c b/email/from.c
similarity index 98%
rename from from.c
rename to email/from.c
index 07e81dbf1..570ad06f6 100644
--- a/from.c
+++ b/email/from.c
@@ -21,7 +21,7 @@
  */
 
 /**
- * @page from Determine who the email is from
+ * @page email_from Determine who the email is from
  *
  * Determine who the email is from
  */
diff --git a/email/from.h b/email/from.h
new file mode 100644
index 000000000..96cb76e90
--- /dev/null
+++ b/email/from.h
@@ -0,0 +1,31 @@
+/**
+ * @file
+ * Determine who the email is from
+ *
+ * @authors
+ * Copyright (C) 1996-2000,2013 Michael R. Elkins <me@mutt.org>
+ *
+ * @copyright
+ * 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 2 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/>.
+ */
+
+#ifndef _EMAIL_FROM_H
+#define _EMAIL_FROM_H
+
+#include <stdio.h>
+#include <time.h>
+
+int is_from(const char *s, char *path, size_t pathlen, time_t *tp);
+
+#endif /* _EMAIL_FROM_H */
diff --git a/protos.h b/protos.h
index 17622e18c..89560f5b1 100644
--- a/protos.h
+++ b/protos.h
@@ -44,8 +44,6 @@ enum XdgType
 
 int mutt_system(const char *cmd);
 
-int is_from(const char *s, char *path, size_t pathlen, time_t *tp);
-
 int mutt_set_xdg_path(enum XdgType type, char *buf, size_t bufsize);
 void mutt_help(int menu);
 void mutt_make_help(char *d, size_t dlen, const char *txt, int menu, int op);