projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mostly reindents.
[apps/madmutt.git]
/
rfc1524.c
diff --git
a/rfc1524.c
b/rfc1524.c
index
5764beb
..
9b745b4
100644
(file)
--- a/
rfc1524.c
+++ b/
rfc1524.c
@@
-23,10
+23,11
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "rfc1524.h"
#include "attach.h"
#include "rfc1524.h"
#include "attach.h"
@@
-62,7
+63,7
@@
int rfc1524_expand_command (BODY * a, char *filename, char *_type,
char buf[LONG_STRING];
char type[LONG_STRING];
char buf[LONG_STRING];
char type[LONG_STRING];
-
strfcpy (type, _type, sizeof (type)
);
+
m_strcpy(type, sizeof(type), _type
);
if (option (OPTMAILCAPSANITIZE))
mutt_sanitize_filename (type, 0);
if (option (OPTMAILCAPSANITIZE))
mutt_sanitize_filename (type, 0);
@@
-86,7
+87,7
@@
int rfc1524_expand_command (BODY * a, char *filename, char *_type,
param[z] = '\0';
_pvalue = mutt_get_parameter (param, a->parameter);
param[z] = '\0';
_pvalue = mutt_get_parameter (param, a->parameter);
-
strfcpy (pvalue, NONULL (_pvalue), sizeof (
pvalue));
+
m_strcpy(pvalue, sizeof(pvalue), NONULL(_
pvalue));
if (option (OPTMAILCAPSANITIZE))
mutt_sanitize_filename (pvalue, 0);
if (option (OPTMAILCAPSANITIZE))
mutt_sanitize_filename (pvalue, 0);
@@
-105,7
+106,7
@@
int rfc1524_expand_command (BODY * a, char *filename, char *_type,
buf[y++] = command[x++];
}
buf[y] = '\0';
buf[y++] = command[x++];
}
buf[y] = '\0';
-
strfcpy (command, buf, clen
);
+
m_strcpy(command, clen, buf
);
return needspipe;
}
return needspipe;
}
@@
-126,24
+127,23
@@
static char *get_field (char *s)
s++;
}
else {
s++;
}
else {
- *ch++ =
0
;
-
SKIPWS
(ch);
+ *ch++ =
'\0'
;
+
ch = vskipspaces
(ch);
break;
}
}
break;
}
}
-
str_skip_trailws
(s);
+
m_strrtrim
(s);
return ch;
}
static int get_field_text (char *field, char **entry,
char *type, char *filename, int line)
{
return ch;
}
static int get_field_text (char *field, char **entry,
char *type, char *filename, int line)
{
- field =
str_skip_initws
(field);
+ field =
vskipspaces
(field);
if (*field == '=') {
if (entry) {
if (*field == '=') {
if (entry) {
- field++;
- field = str_skip_initws (field);
- str_replace (entry, field);
+ field = vskipspaces(field + 1);
+ m_strreplace(entry, field);
}
return 1;
}
}
return 1;
}
@@
-197,7
+197,7
@@
static int rfc1524_mailcap_parse (BODY * a,
/* check type */
ch = get_field (buf);
if (ascii_strcasecmp (buf, type) && (ascii_strncasecmp (buf, type, btlen) || (buf[btlen] != 0 && /* implicit wild */
/* check type */
ch = get_field (buf);
if (ascii_strcasecmp (buf, type) && (ascii_strncasecmp (buf, type, btlen) || (buf[btlen] != 0 && /* implicit wild */
-
str_cmp
(buf + btlen, "/*")))) /* wildsubtype */
+
m_strcmp
(buf + btlen, "/*")))) /* wildsubtype */
continue;
/* next field is the viewcommand */
continue;
/* next field is the viewcommand */
@@
-406,7
+406,7
@@
static void strnfcpy (char *d, char *s, size_t siz, size_t len)
{
if (len > siz)
len = siz - 1;
{
if (len > siz)
len = siz - 1;
-
strfcpy (d, s, len
);
+
m_strcpy(d, len, s
);
}
int rfc1524_expand_filename (char *nametemplate,
}
int rfc1524_expand_filename (char *nametemplate,
@@
-431,7
+431,7
@@
int rfc1524_expand_filename (char *nametemplate,
if (!nametemplate) {
if (oldfile)
if (!nametemplate) {
if (oldfile)
-
strfcpy (newfile, oldfile, nflen
);
+
m_strcpy(newfile, nflen, oldfile
);
}
else if (!oldfile) {
mutt_expand_fmt (newfile, nflen, nametemplate, "mutt");
}
else if (!oldfile) {
mutt_expand_fmt (newfile, nflen, nametemplate, "mutt");
@@
-498,13
+498,13
@@
int rfc1524_expand_filename (char *nametemplate,
if (rmatch)
*right = 0;
else
if (rmatch)
*right = 0;
else
-
strfcpy (right, nametemplate + i + 2, sizeof (right)
);
+
m_strcpy(right, sizeof(right), nametemplate + i + 2
);
snprintf (newfile, nflen, "%s%s%s", left, oldfile, right);
}
else {
/* no "%s" in the name template. */
snprintf (newfile, nflen, "%s%s%s", left, oldfile, right);
}
else {
/* no "%s" in the name template. */
-
strfcpy (newfile, nametemplate, nflen
);
+
m_strcpy(newfile, nflen, nametemplate
);
}
}
}
}