projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small leftovers
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
b2d283d
..
761054b
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-25,7
+25,6
@@
#include "handler.h"
#include "recvattach.h"
#include "mutt_curses.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_curses.h"
-#include "rfc2047.h"
#include "mx.h"
#include "copy.h"
#include "pager.h"
#include "mx.h"
#include "copy.h"
#include "pager.h"
@@
-745,7
+744,7
@@
static size_t convert_file_from_to (FILE * file,
for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) {
if ((c1 = strchr (c, ':')) == c)
continue;
for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) {
if ((c1 = strchr (c, ':')) == c)
continue;
- tcode[i] =
str_substrdup
(c, c1);
+ tcode[i] =
m_substrdup
(c, c1);
}
ret = (size_t) (-1);
}
ret = (size_t) (-1);
@@
-754,7
+753,7
@@
static size_t convert_file_from_to (FILE * file,
for (c = fromcodes; c; c = c1 ? c1 + 1 : 0) {
if ((c1 = strchr (c, ':')) == c)
continue;
for (c = fromcodes; c; c = c1 ? c1 + 1 : 0) {
if ((c1 = strchr (c, ':')) == c)
continue;
- fcode =
str_substrdup
(c, c1);
+ fcode =
m_substrdup
(c, c1);
ret = convert_file_to (file, fcode, ncodes, (const char **) tcode,
&cn, info);
ret = convert_file_to (file, fcode, ncodes, (const char **) tcode,
&cn, info);
@@
-938,7
+937,7
@@
int mutt_lookup_mime_type (BODY * att, const char *path)
for (q = p; *q && !ISSPACE (*q); q++);
for (q = p; *q && !ISSPACE (*q); q++);
-
str_substrcpy (subtype, p, q, sizeof (subtype)
);
+
m_strncpy(subtype, sizeof(subtype), p, q - p
);
if ((type = mutt_check_mime_type (ct)) == TYPEOTHER)
m_strcpy(xtype, sizeof(xtype), ct);
if ((type = mutt_check_mime_type (ct)) == TYPEOTHER)
m_strcpy(xtype, sizeof(xtype), ct);
@@
-956,8
+955,8
@@
bye:
if (type != TYPEOTHER || *xtype != '\0') {
att->type = type;
if (type != TYPEOTHER || *xtype != '\0') {
att->type = type;
-
str_replace
(&att->subtype, subtype);
-
str_replace
(&att->xtype, xtype);
+
m_strreplace
(&att->subtype, subtype);
+
m_strreplace
(&att->xtype, xtype);
}
return (type);
}
return (type);