/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
#if HAVE_CONFIG_H
#include "mutt_crypt.h"
#include "lib.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
#define BUFI_SIZE 1000
#define BUFO_SIZE 2000
if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
break;
- linelen = strlen (line);
+ linelen = safe_strlen (line);
len -= linelen;
/*
buf[i++] = ch;
}
if (i != 4) {
- dprint (2, (debugfile, "%s:%d [mutt_decode_base64()]: "
- "didn't get a multiple of 4 chars.\n", __FILE__, __LINE__));
+ debug_print (2, ("didn't get a multiple of 4 chars.\n"));
break;
}
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -= mutt_strlen (tmps);
- if ((!mutt_strncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
+ len -= safe_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 -= mutt_strlen (tmps);
- if (!mutt_strncmp (tmps, "end", 3))
+ len -= safe_strlen (tmps);
+ if (!safe_strncmp (tmps, "end", 3))
break;
pt = tmps;
linelen = decode_byte (*pt);
stte->indent_len = 0;
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
- stte->indent_len += mutt_strlen (stte->s->prefix);
+ stte->indent_len += safe_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 += mutt_strlen (stte->s->prefix);
+ stte->indent_len += safe_strlen (stte->s->prefix);
}
else {
state_puts ("> ", stte->s);
- stte->indent_len += mutt_strlen ("> ");
+ stte->indent_len += safe_strlen ("> ");
}
x--;
}
{
char *c;
- if (stte->buff_len < stte->buff_used + mutt_strlen (s)) {
+ if (stte->buff_len < stte->buff_used + safe_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 += mutt_strlen (s->prefix);
+ stte.indent_len += safe_strlen (s->prefix);
}
while (state != DONE) {
* 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 && !mutt_strcmp (Pager, "builtin")
+ 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
- && !mutt_strncmp (cont, "From ",
+ && !safe_strncmp (cont, "From ",
5))))
state_putc (' ', s);
}
fprintf (stderr, "flowed_max = %d\n", flowed_max);
while (bytes > 0 && fgets (line, sizeof (line), s->fpin)) {
- bytes -= strlen (line);
+ bytes -= safe_strlen (line);
tail = NULL;
last_full = full;
*/
full = 0;
- l = strlen (t + 1);
+ l = safe_strlen (t + 1);
t[0] = ' ';
t[1] = '\0';
retry_wrap:
l = flowed_visual_strlen (cont, quoted + i_add + add + col);
- rl = mutt_strlen (cont);
+ rl = safe_strlen (cont);
if (quoted + i_add + add + col + l > flowed_max) {
actually_wrap = 1;
{
int width;
char *pos, *oldpos;
- int len = strlen (line);
+ int len = safe_strlen (line);
int i;
if (MaxLineLength > 0) {
/* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
- if (strlen (line) == 0) {
+ if (safe_strlen (line) == 0) {
if (option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
/* fprintf(stderr,"read `%s'",buf); */
- bytes -= strlen (buf);
+ bytes -= safe_strlen (buf);
newql = get_quote_level (buf);
if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
*t = '\0';
- if (strlen (curline) > 0 && curline[strlen (curline) - 1] == ' '
+ if (safe_strlen (curline) > 0 && curline[safe_strlen (curline) - 1] == ' '
&& newql == quotelevel
&& strcmp (curline + quotelevel, "-- ") != 0) {
if (buf[newql] == ' ')
- curline[strlen (curline) - 1] = '\0';
+ curline[safe_strlen (curline) - 1] = '\0';
- curline = realloc (curline, curline_len + strlen (buf));
+ curline = realloc (curline, curline_len + safe_strlen (buf));
if (curline_len == 1)
*curline = '\0';
- curline_len += strlen (buf);
+ curline_len += safe_strlen (buf);
safe_strncat (curline, curline_len, buf + newql,
- strlen (buf + newql));
+ safe_strlen (buf + newql));
}
else {
if (first_line) {
}
FREE (&curline);
curline_len = 1;
- curline = realloc (curline, curline_len + strlen (buf));
+ curline = realloc (curline, curline_len + safe_strlen (buf));
if (curline_len == 1)
*curline = '\0';
- curline_len += strlen (buf);
- safe_strncat (curline, curline_len, buf, strlen (buf));
+ curline_len += safe_strlen (buf);
+ safe_strncat (curline, curline_len, buf, safe_strlen (buf));
quotelevel = newql;
}
}
}
else {
wild = 1;
- btlen = mutt_strlen (t->data);
+ btlen = safe_strlen (t->data);
}
if (a && a->parts)
}
if (thepid < 0) {
- mutt_perror _("Can't create filter");
+ mutt_perror (_("Can't create filter"));
if (s->flags & M_DISPLAY) {
state_mark_attach (s);
handler = mutt_signed_handler;
}
else if ((WithCrypto & APPLICATION_PGP)
- && mutt_strcasecmp ("encrypted", b->subtype) == 0) {
+ && safe_strcasecmp ("encrypted", b->subtype) == 0) {
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)
projects / apps / madmutt.git / blobdiff