#include <sys/wait.h>
#include <sys/stat.h>
+#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 "mutt.h"
#include "mutt_curses.h"
-#include "ascii.h"
#include "handler.h"
#include "state.h"
#include "lib.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#define FLOWED_MAX 77
return quoted;
}
-static void print_flowed_line (char *line, STATE * s,
- int ql, int delsp,
- int* spaces, int space_len) {
+static void print_flowed_line (char *line, STATE * s, int ql) {
int width;
char *pos, *oldpos;
- int len = str_len (line);
+ int len = m_strlen(line);
int i;
if (MaxLineLength > 0) {
width = COLS;
}
- if (str_len (line) == 0) {
- if (option (OPTQUOTEEMPTY)) {
+ if (m_strlen(line) == 0) {
+ if (!(s->flags & M_REPLYING) || option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
for (i=0;i<ql;++i) state_putc('>',s);
if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED) &&
(ql > 0 || s->prefix))
state_putc (' ', s);
-
- if (delsp && spaces && space_len > 0) {
- /* here, we need to character-wise step through the line
- * to eliminate all spaces which were trailing due to DelSp */
- for (i = 0; i < str_len (oldpos); i++) {
- if (oldpos[i] == ' ' && spaces[&(oldpos[i])-line] != 0) {
- debug_print (4, ("f=f: DelSp: spaces[%d] forces space removal\n",
- &(oldpos[i])-line));
- continue;
- }
- /* print space at oldpos[i] if it was non-trailing */
- state_putc (oldpos[i], s);
- }
- } else
- /* for no DelSp, just do whole line as per usual */
- state_puts (oldpos, s);
+ state_puts (oldpos, s);
/* fprintf(stderr,"print_flowed_line: `%s'\n",oldpos); */
if (pos < line + len)
state_putc (' ', s);
int rfc3676_handler (BODY * a, STATE * s) {
int bytes = a->length;
char buf[LONG_STRING];
- char *curline = str_dup ("");
+ char *curline = p_new(char, 1);
char *t = NULL;
- unsigned int curline_len = 1, space_len = 1,
+ unsigned int curline_len = 1,
quotelevel = 0, newql = 0;
int buf_off, buf_len;
- int delsp = 0;
- int* spaces = NULL;
+ int delsp = 0, fixed = 0;
+
+ *curline='\0';
/* respect DelSP of RfC3676 only with f=f parts */
if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
- delsp = str_len (t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
+ delsp = m_strlen(t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
t = NULL;
}
debug_print (2, ("f=f: DelSp: %s\n", delsp ? "yes" : "no"));
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
- buf_len = str_len (buf);
+
+ buf_len = m_strlen(buf);
bytes -= buf_len;
newql = get_quote_level (buf);
* but has to be handled - see RFC 3676, sec. 4.5.
*/
if (newql != quotelevel && curline && *curline) {
- print_flowed_line (curline, s, quotelevel, delsp, spaces, space_len);
+ print_flowed_line (curline, s, quotelevel);
*curline = '\0';
curline_len = 1;
- space_len = 0;
}
quotelevel = newql;
* possibly a change in quoting level. But that's better than not
* displaying it at all.
*/
- if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
+ if ((t = strrchr (buf, '\r')) || (t = strrchr (buf, '\n'))) {
*t = '\0';
buf_len = t - buf;
}
+
buf_off = newql;
/* respect space-stuffing */
if (buf[buf_off] == ' ')
buf_off++;
+ /* for DelSp=yes, we need to strip one SP prior to CRLF
+ * which may make the line look like fixed although it wasn't
+ * so keep this in mind for later processing */
+ fixed = buf_len == 0 || buf[buf_len - 1] != ' ' ||
+ (strcmp(buf + buf_off, "-- ") == 0);
+
+ if (delsp && buf_len >= 1 && buf[buf_len-1] == ' ')
+ buf[--buf_len] = '\0';
+
+ /* we're here when last space removed 'cause of DelSp was
+ * the last space and there isn't more -> done */
+ if ((buf_len - buf_off) < 0) {
+ print_flowed_line (curline, s, quotelevel);
+ *curline = '\0';
+ curline_len = 1;
+ continue;
+ }
+
/* signature separator also flushes the previous paragraph */
if (strcmp(buf + buf_off, "-- ") == 0 && curline && *curline) {
- print_flowed_line (curline, s, quotelevel, delsp, spaces, space_len);
+ print_flowed_line (curline, s, quotelevel);
*curline = '\0';
curline_len = 1;
- space_len = 0;
}
- mem_realloc (&curline, curline_len + buf_len - buf_off);
- mem_realloc (&spaces, (curline_len + buf_len - buf_off)*sizeof (int));
+ p_realloc(&curline, curline_len + buf_len - buf_off);
strcpy (curline + curline_len - 1, buf + buf_off);
- memset (&spaces[space_len], 0, (buf_len - buf_off)*sizeof (int));
curline_len += buf_len - buf_off;
- space_len += buf_len - buf_off;
/* if this was a fixed line the paragraph is finished */
- if (buf_len == 0 || buf[buf_len - 1] != ' ' || strcmp(buf + buf_off, "-- ") == 0) {
- print_flowed_line (curline, s, quotelevel, delsp, spaces, space_len);
+ if (fixed) {
+ print_flowed_line (curline, s, quotelevel);
*curline = '\0';
curline_len = 1;
- space_len = 0;
- } else {
- /* if last line we appended had a space and we have DelSp=yes,
- * get a 1 into spaces array at proper position so that
- * print_flowed_line() can handle it; don't kill the space
- * right here 'cause we maybe need soft linebreaks to search for break
- */
- if (delsp && curline && *curline && curline_len-2 >= 0 &&
- curline[curline_len-2] == ' ') {
- debug_print (4, ("f=f: DelSp: marking spaces[%d] for later removal\n",
- curline_len-2));
- spaces[curline_len-2] = 1;
- }
}
}
- mem_free (&spaces);
- mem_free (&curline);
+ p_delete(&curline);
return (0);
}
fputc (' ', out);
#if DEBUG
lc++;
- len = str_len (buf);
+ len = m_strlen(buf);
if (len > 0) {
c = buf[len-1];
buf[len-1] = '\0';
fputs (buf, out);
}
fclose (in);
- unlink (hdr->content->filename);
fclose (out);
- str_replace (&hdr->content->filename, tmpfile);
+ mutt_set_mtime (hdr->content->filename, tmpfile);
+ unlink (hdr->content->filename);
+ m_strreplace(&hdr->content->filename, tmpfile);
}
projects / apps / madmutt.git / blobdiff