move parse.c into rfc822parse.c in the lib-mime as it's what it's about

for real :)

now we will optimize that code together :]

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/Makefile.am b/Makefile.am
index 1a34a07..f07b281 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ muttng_SOURCES = $(BUILT_SOURCES) \
        handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
        init.c keymap.c lib.c \
        main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
        handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
        init.c keymap.c lib.c \
        main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \

-       pager.c parse.c pattern.c postpone.c query.c \
+       pager.c pattern.c postpone.c query.c \

        recvattach.c recvcmd.c rfc1524.c rfc3676.c \
        score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
        thread.c url.c utf8.c wcwidth.c \
        recvattach.c recvcmd.c rfc1524.c rfc3676.c \
        score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
        thread.c url.c utf8.c wcwidth.c \

diff --git a/lib-lib/date.h b/lib-lib/date.h
index ffb79ae..b31800a 100644 (file)
--- a/lib-lib/date.h
+++ b/lib-lib/date.h
@@ -17,8 +17,8 @@
  *  Copyright © 2006 Pierre Habouzit
  */
 
  *  Copyright © 2006 Pierre Habouzit
  */
 

-#ifndef MUTT_LIB_LIB_STR_H
-#define MUTT_LIB_LIB_STR_H
+#ifndef MUTT_LIB_LIB_DATE_H
+#define MUTT_LIB_LIB_DATE_H

 
 #include <time.h>
 
 
 #include <time.h>
 

diff --git a/lib-mime/Makefile.am b/lib-mime/Makefile.am
index 8bb51b1..0e9fa5a 100644 (file)
--- a/lib-mime/Makefile.am
+++ b/lib-mime/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libmime.a
 
 noinst_LIBRARIES = libmime.a
 

-libmime_a_SOURCES = mime.h mime.c rfc822.c rfc2047.c rfc2231.c
+libmime_a_SOURCES = mime.h mime.c rfc822address.c rfc822parse.c rfc2047.c rfc2231.c

 
 noinst_HEADERS    = mime.h
 
 
 noinst_HEADERS    = mime.h
 

diff --git a/lib-mime/rfc822.c b/lib-mime/rfc822address.c
similarity index 100%
rename from lib-mime/rfc822.c
rename to lib-mime/rfc822address.c

diff --git a/parse.c b/lib-mime/rfc822parse.c
similarity index 98%
rename from parse.c
rename to lib-mime/rfc822parse.c
index c998fc3..2c8f4ad 100644 (file)
--- a/parse.c
+++ b/lib-mime/rfc822parse.c
@@ -1,3 +1,22 @@
+/*
+ *  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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA 02110-1301, USA.
+ *
+ *  Copyright © 2006 Pierre Habouzit
+ */
+

 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>


@@ -11,28 +30,28 @@
 # include "config.h"
 #endif
 
 # include "config.h"
 #endif
 

+#include <sys/stat.h>
+#include <stdlib.h>
+

 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>

+#include <lib-lib/date.h>

 
 

-#include <lib-mime/mime.h>
+#include <lib-crypt/crypt.h>

 
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"
 
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"

-#include <lib-crypt/crypt.h>

 #include "url.h"
 
 #include "lib/rx.h"
 #include "lib/debug.h"
 
 #include "url.h"
 
 #include "lib/rx.h"
 #include "lib/debug.h"
 

-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <stdlib.h>
+#include "mime.h"

 
 /* Reads an arbitrarily long header field, and looks ahead for continuation
  * lines.  ``line'' must point to a dynamically allocated string; it is
 
 /* Reads an arbitrarily long header field, and looks ahead for continuation
  * lines.  ``line'' must point to a dynamically allocated string; it is