#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-ui/curses.h>
#include "mutt.h"
-#include "mutt_curses.h"
-#include "ascii.h"
#include "handler.h"
#include "state.h"
#include "lib.h"
-#include "lib/debug.h"
-
#define FLOWED_MAX 77
static int get_quote_level (char *line)
* the end of the string w/ pos */
if (pos < line + len) {
if (*pos == ' ') {
- debug_print (4, ("f=f: found space directly at width\n"));
*pos = '\0';
++pos;
}
else {
char *save = pos;
- debug_print (4, ("f=f: need to search for space\n"));
while (pos >= oldpos && *pos != ' ') {
--pos;
}
if (pos < oldpos) {
- debug_print (4, ("f=f: no space found while searching "
- "to left; going right\n"));
pos = save;
while (pos < line + len && *pos && *pos != ' ') {
++pos;
}
- debug_print (4, ("f=f: found space at pos %d\n", pos-line));
- } else {
- debug_print (4, ("f=f: found space while searching to left\n"));
}
*pos = '\0';
++pos;
}
}
- else {
- debug_print (4, ("f=f: line completely fits on screen\n"));
- }
+
if (s->prefix)
state_puts (s->prefix, s);
t = NULL;
}
- debug_print (2, ("f=f: DelSp: %s\n", delsp ? "yes" : "no"));
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
}
void rfc3676_space_stuff (HEADER* hdr) {
-#if DEBUG
- int lc = 0;
- size_t len = 0;
- unsigned char c = '\0';
-#endif
FILE* in = NULL, *out = NULL;
char buf[LONG_STRING];
char tmpfile[_POSIX_PATH_MAX];
if (!hdr || !hdr->content || !hdr->content->filename)
return;
- debug_print (2, ("f=f: postprocess %s\n", hdr->content->filename));
if ((in = safe_fopen (hdr->content->filename, "r")) == NULL)
return;
mutt_mktemp (tmpfile);
while (fgets (buf, sizeof (buf), in)) {
if (ascii_strncmp ("From ", buf, 4) == 0 || buf[0] == ' ') {
fputc (' ', out);
-#if DEBUG
- lc++;
- len = m_strlen(buf);
- if (len > 0) {
- c = buf[len-1];
- buf[len-1] = '\0';
- }
- debug_print (4, ("f=f: line %d needs space-stuffing: '%s'\n",
- lc, buf));
- if (len > 0)
- buf[len-1] = c;
-#endif
}
fputs (buf, out);
}
fclose (out);
mutt_set_mtime (hdr->content->filename, tmpfile);
unlink (hdr->content->filename);
- str_replace (&hdr->content->filename, tmpfile);
+ m_strreplace(&hdr->content->filename, tmpfile);
}