if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
break;
- linelen = safe_strlen (line);
+ linelen = mutt_strlen (line);
len -= linelen;
/*
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -= safe_strlen (tmps);
+ len -= mutt_strlen (tmps);
if ((!safe_strncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
break;
}
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -= safe_strlen (tmps);
+ len -= mutt_strlen (tmps);
if (!safe_strncmp (tmps, "end", 3))
break;
pt = tmps;
stte->indent_len = 0;
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
- stte->indent_len += safe_strlen (stte->s->prefix);
+ stte->indent_len += mutt_strlen (stte->s->prefix);
}
if (stte->tag_level[RICH_EXCERPT]) {
while (x) {
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
- stte->indent_len += safe_strlen (stte->s->prefix);
+ stte->indent_len += mutt_strlen (stte->s->prefix);
}
else {
state_puts ("> ", stte->s);
- stte->indent_len += safe_strlen ("> ");
+ stte->indent_len += mutt_strlen ("> ");
}
x--;
}
{
char *c;
- if (stte->buff_len < stte->buff_used + safe_strlen (s)) {
+ if (stte->buff_len < stte->buff_used + mutt_strlen (s)) {
stte->buff_len += LONG_STRING;
safe_realloc (&stte->buffer, stte->buff_len + 1);
}
if (s->prefix) {
state_puts (s->prefix, s);
- stte.indent_len += safe_strlen (s->prefix);
+ stte.indent_len += mutt_strlen (s->prefix);
}
while (state != DONE) {
#define FLOWED_MAX 77
-#if 0
-static int flowed_maybe_quoted (char *cont)
-{
- return regexec ((regex_t *) QuoteRegexp.rx, cont, 0, NULL, 0) == 0;
-}
-
-static void flowed_quote (STATE * s, int level)
-{
- int i;
-
- if (s->prefix) {
- if (option (OPTTEXTFLOWED))
- level++;
- else
- state_puts (s->prefix, s);
- }
-
- for (i = 0; i < level; i++)
- state_putc ('>', s);
-}
-
-static void flowed_stuff (STATE * s, char *cont, int level)
-{
- if (!option (OPTTEXTFLOWED) && !(s->flags & M_DISPLAY))
- return;
-
- if (s->flags & M_DISPLAY) {
- /*
- * Hack: If we are in the beginning of the line and there is
- * some text on the line which looks like it's quoted, turn off
- * ANSI colors, so quote coloring doesn't affect this line.
- */
- if (*cont && !level && !safe_strcmp (Pager, "builtin")
- && flowed_maybe_quoted (cont))
- state_puts ("\033[0m", s);
- }
- else if ((!(s->flags & M_PRINTING)) && ((*cont == ' ') || (*cont == '>')
- || (!level
- && !safe_strncmp (cont, "From ",
- 5))))
- state_putc (' ', s);
-}
-
-static char *flowed_skip_indent (char *prefix, char *cont)
-{
- for (; *cont == ' ' || *cont == '\t'; cont++)
- *prefix++ = *cont;
- *prefix = '\0';
- return cont;
-}
-
-static int flowed_visual_strlen (char *l, int i)
-{
- int j;
-
- for (j = 0; *l; l++) {
- if (*l == '\t')
- j += 8 - ((i + j) % 8);
- else
- j++;
- }
-
- return j;
-}
-
-static void text_plain_flowed_handler (BODY * a, STATE * s)
-{
- char line[LONG_STRING];
- char indent[LONG_STRING];
-
- int quoted = -1;
- int last_quoted;
- int full = 1;
- int last_full;
- int col = 0, tmpcol;
-
- int i_add = 0;
- int add = 0;
- int soft = 0;
- int l, rl;
-
- int flowed_max;
- int bytes = a->length;
- int actually_wrap = 0;
-
- char *cont = NULL;
- char *tail = NULL;
- char *lc = NULL;
- char *t;
-
- *indent = '\0';
-
- if (s->prefix)
- add = 1;
-
- /*
- if ((flowed_max = FLOWED_MAX) > COLS - 3)
- flowed_max = COLS - 3;
- if (flowed_max > COLS - WrapMargin)
- flowed_max = COLS - WrapMargin;
- if (flowed_max <= 0)
- flowed_max = COLS;
- */
- flowed_max = COLS - WrapMargin;
- if (flowed_max <= 0)
- flowed_max = COLS;
-
- fprintf (stderr, "flowed_max = %d\n", flowed_max);
-
- while (bytes > 0 && fgets (line, sizeof (line), s->fpin)) {
- bytes -= safe_strlen (line);
- tail = NULL;
-
- last_full = full;
-
- /*
- * If the last line wasn't fully read, this is the
- * tail of some line.
- */
- actually_wrap = !last_full;
-
- if ((t = strrchr (line, '\r')) || (t = strrchr (line, '\n'))) {
- *t = '\0';
- full = 1;
- }
- else if ((t = strrchr (line, ' ')) || (t = strrchr (line, '\t'))) {
- /*
- * Bad: We have a line of more than LONG_STRING characters.
- * (Which SHOULD NOT happen, since lines SHOULD be <= 79
- * characters long.)
- *
- * Try to simulate a soft line break at a word boundary.
- * Handle the rest of the line next time.
- *
- * Give up when we have a single word which is longer than
- * LONG_STRING characters. It will just be split into parts,
- * with a hard line break in between.
- */
-
- full = 0;
- l = safe_strlen (t + 1);
- t[0] = ' ';
- t[1] = '\0';
-
- if (l) {
- fseek (s->fpin, -l, SEEK_CUR);
- bytes += l;
- }
- }
- else
- full = 0;
-
- last_quoted = quoted;
-
- if (last_full) {
- /*
- * We are in the beginning of a new line. Determine quote level
- * and indentation prefix
- */
- for (quoted = 0; line[quoted] == '>'; quoted++);
-
- cont = line + quoted;
-
- /* undo space stuffing */
- if (*cont == ' ')
- cont++;
-
- /* If there is an indentation, record it. */
- cont = flowed_skip_indent (indent, cont);
- i_add = flowed_visual_strlen (indent, quoted + add);
- }
- else {
- /*
- * This is just the tail of some over-long line. Keep
- * indentation and quote levels. Don't unstuff.
- */
- cont = line;
- }
-
- /* If we have a change in quoting depth, wrap. */
-
- if (col && last_quoted != quoted && last_quoted >= 0) {
- state_putc ('\n', s);
- col = 0;
- }
-
- do {
- if (tail)
- cont = tail;
-
- SKIPWS (cont);
-
- tail = NULL;
- soft = 0;
-
- /* try to find a point for word wrapping */
-
- retry_wrap:
- l = flowed_visual_strlen (cont, quoted + i_add + add + col);
- rl = safe_strlen (cont);
- if (quoted + i_add + add + col + l > flowed_max) {
- actually_wrap = 1;
-
- for (tmpcol = quoted + i_add + add + col, t = cont;
- *t && tmpcol < flowed_max; t++) {
- if (*t == ' ' || *t == '\t')
- tail = t;
- if (*t == '\t')
- tmpcol = (tmpcol & ~7) + 8;
- else
- tmpcol++;
- }
-
- if (tail) {
- *tail++ = '\0';
- soft = 2;
- }
- }
-
- /* We seem to be desperate. Get me a new line, and retry. */
- if (!tail && (quoted + add + col + i_add + l > flowed_max) && col) {
- state_putc ('\n', s);
- col = 0;
- goto retry_wrap;
- }
-
- /* Detect soft line breaks. */
- if (!soft && ascii_strcmp (cont, "-- ")) {
- lc = strrchr (cont, ' ');
- if (lc && lc[1] == '\0')
- soft = 1;
- }
-
- /*
- * If we are in the beginning of an output line, do quoting
- * and stuffing.
- *
- * We have to temporarily assemble the line since display
- * stuffing (i.e., turning off quote coloring) may depend on
- * the line's actual content. You never know what people put
- * into their regular expressions.
- */
- if (!col) {
- char tmp[LONG_STRING];
-
- snprintf (tmp, sizeof (tmp), "%s%s", indent, cont);
-
- flowed_quote (s, quoted);
- flowed_stuff (s, tmp, quoted + add);
-
- state_puts (indent, s);
- }
-
- /* output the text */
- state_puts (cont, s);
- col += flowed_visual_strlen (cont, quoted + i_add + add + col);
-
- /* possibly indicate a soft line break */
- if (soft == 2) {
- state_putc (' ', s);
- col++;
- }
-
- /*
- * Wrap if this display line corresponds to a
- * text line. Don't wrap if we changed the line.
- */
- if (!soft || (!actually_wrap && full)) {
- state_putc ('\n', s);
- col = 0;
- }
- }
- while (tail);
- }
-
- if (col)
- state_putc ('\n', s);
-
-}
-#endif
-
static int get_quote_level (char *line)
{
int quoted;
{
int width;
char *pos, *oldpos;
- int len = safe_strlen (line);
+ int len = mutt_strlen (line);
int i;
if (MaxLineLength > 0) {
/* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
- if (safe_strlen (line) == 0) {
+ if (mutt_strlen (line) == 0) {
if (option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
char *t;
unsigned int curline_len = 1;
unsigned int quotelevel = 0, newql = 0;
- int append_next_line = 0;
int first_line = 1;
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
- /* fprintf(stderr,"read `%s'",buf); */
- bytes -= safe_strlen (buf);
+ bytes -= mutt_strlen (buf);
newql = get_quote_level (buf);
if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
*t = '\0';
- if (safe_strlen (curline) > 0 && curline[safe_strlen (curline) - 1] == ' '
+ if (mutt_strlen (curline) > 0 && curline[mutt_strlen (curline) - 1] == ' '
&& newql == quotelevel
&& strcmp (curline + quotelevel, "-- ") != 0) {
if (buf[newql] == ' ')
- curline[safe_strlen (curline) - 1] = '\0';
+ curline[mutt_strlen (curline) - 1] = '\0';
- curline = realloc (curline, curline_len + safe_strlen (buf));
+ curline = realloc (curline, curline_len + mutt_strlen (buf));
if (curline_len == 1)
*curline = '\0';
- curline_len += safe_strlen (buf);
+ curline_len += mutt_strlen (buf);
safe_strncat (curline, curline_len, buf + newql,
- safe_strlen (buf + newql));
+ mutt_strlen (buf + newql));
}
else {
if (first_line) {
}
FREE (&curline);
curline_len = 1;
- curline = realloc (curline, curline_len + safe_strlen (buf));
+ curline = realloc (curline, curline_len + mutt_strlen (buf));
if (curline_len == 1)
*curline = '\0';
- curline_len += safe_strlen (buf);
- safe_strncat (curline, curline_len, buf, safe_strlen (buf));
+ curline_len += mutt_strlen (buf);
+ safe_strncat (curline, curline_len, buf, mutt_strlen (buf));
quotelevel = newql;
}
}
- else {
- append_next_line = 1;
- /* @todo: add handling of very long lines */
+ else if (bytes == 0) {
+ /* in case there's no line end it's likely the last line
+ * so append to current (if any) */
+ if (buf[newql] == ' ')
+ curline[mutt_strlen (curline) - 1] = '\0';
+ curline = realloc (curline, curline_len + mutt_strlen (buf));
+ if (curline_len == 1)
+ *curline = '\0';
+ curline_len += mutt_strlen (buf);
+ safe_strncat (curline, curline_len, buf + newql,
+ mutt_strlen (buf + newql));
+ break;
}
}
if (curline) {
}
}
-
-
#define TXTHTML 1
#define TXTPLAIN 2
#define TXTENRICHED 3
}
else {
wild = 1;
- btlen = safe_strlen (t->data);
+ btlen = mutt_strlen (t->data);
}
if (a && a->parts)
projects / apps / madmutt.git / blobdiff