* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include <lib-lib/macros.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include "mx.h"
#include "copy.h"
#include <lib-crypt/crypt.h>
+#include <lib-ui/curses.h>
#include "mutt_idna.h"
static int address_header_decode (char **str);
int this_is_from;
int ignore = 0;
char buf[STRING]; /* should be long enough to get most fields in one pass */
- char *nl;
+ char *eol;
string_list_t *t;
char **headers;
int hdr_count;
* we can do a more efficient line to line copying
*/
while (ftello (in) < off_end) {
- nl = strchr (buf, '\n');
+ eol = strchr (buf, '\n');
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
- if (nl && buf[0] != ' ' && buf[0] != '\t') {
+ if (eol && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
if (!from && m_strncmp("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
/* Read all the headers into the array */
while (ftello (in) < off_end) {
- nl = strchr (buf, '\n');
+ eol = strchr (buf, '\n');
/* Read a line */
if ((fgets (buf, sizeof (buf), in)) == NULL)
break;
/* Is it the begining of a header? */
- if (nl && buf[0] != ' ' && buf[0] != '\t') {
+ if (eol && buf[0] != ' ' && buf[0] != '\t') {
/* set curline to 1 for To:/Cc:/Bcc: and 0 otherwise */
- curline = (flags & CH_WEED) && (ascii_strncmp ("To:", buf, 3) == 0 ||
- ascii_strncmp ("Cc:", buf, 3) == 0 ||
- ascii_strncmp ("Bcc:", buf, 4) == 0);
+ curline = (flags & CH_WEED) && (m_strncmp("To:", buf, 3) == 0 ||
+ m_strncmp("Cc:", buf, 3) == 0 ||
+ m_strncmp("Bcc:", buf, 4) == 0);
/* Do we have anything pending? */
if (this_one) {
fputs ("MIME-Version: 1.0\n", out);
fputs ("Content-Transfer-Encoding: 8bit\n", out);
fputs ("Content-Type: text/plain; charset=", out);
- charset_canonicalize (chsbuf, sizeof (chsbuf),
- Charset ? Charset : "us-ascii");
+ charset_canonicalize(chsbuf, sizeof (chsbuf), Charset);
rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);
fputs (buffer, out);
fputc ('\n', out);