projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
please, libidn has not changed in years now
[apps/madmutt.git]
/
rfc1524.c
diff --git
a/rfc1524.c
b/rfc1524.c
index
ceca551
..
bef1144
100644
(file)
--- a/
rfc1524.c
+++ b/
rfc1524.c
@@
-21,17
+21,6
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-
-#include "mutt.h"
-#include "rfc1524.h"
-#include "attach.h"
-
-#include "lib/debug.h"
-
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
@@
-41,6
+30,18
@@
#include <errno.h>
#include <unistd.h>
#include <errno.h>
#include <unistd.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 <lib-sys/unix.h>
+
+#include "mutt.h"
+#include "rfc1524.h"
+#include "attach.h"
+
/* The command semantics include the following:
* %s is the filename that contains the mail body data
* %t is the content type, like text/plain
/* The command semantics include the following:
* %s is the filename that contains the mail body data
* %t is the content type, like text/plain
@@
-62,12
+63,12
@@
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);
- while (command[x] && x < clen && y < sizeof (buf)) {
+ while (command[x] && x < clen && y < s
s
izeof (buf)) {
if (command[x] == '\\') {
x++;
buf[y++] = command[x++];
if (command[x] == '\\') {
x++;
buf[y++] = command[x++];
@@
-81,12
+82,12
@@
int rfc1524_expand_command (BODY * a, char *filename, char *_type,
int z = 0;
x++;
int z = 0;
x++;
- while (command[x] && command[x] != '}' && z < sizeof (param))
+ while (command[x] && command[x] != '}' && z < s
s
izeof (param))
param[z++] = command[x++];
param[z] = '\0';
_pvalue = mutt_get_parameter (param, a->parameter);
param[z++] = command[x++];
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;
}
@@
-160,7
+160,7
@@
static int rfc1524_mailcap_parse (BODY * a,
{
FILE *fp;
char *buf = NULL;
{
FILE *fp;
char *buf = NULL;
- size_t buflen;
+ s
s
ize_t buflen;
char *ch;
char *field;
int found = FALSE;
char *ch;
char *field;
int found = FALSE;
@@
-188,16
+188,15
@@
static int rfc1524_mailcap_parse (BODY * a,
btlen = ch - type;
if ((fp = fopen (filename, "r")) != NULL) {
btlen = ch - type;
if ((fp = fopen (filename, "r")) != NULL) {
- while (!found && (buf = mutt_read_line
(buf, &buflen, fp, &line)) != NULL) {
+ while (!found && (buf = mutt_read_line(buf, &buflen, fp, &line)) != NULL) {
/* ignore comments */
if (*buf == '#')
continue;
/* ignore comments */
if (*buf == '#')
continue;
- debug_print (2, ("mailcap entry: %s\n", buf));
/* 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 */
@@
-216,7
+215,6
@@
static int rfc1524_mailcap_parse (BODY * a,
while (ch) {
field = ch;
ch = get_field (ch);
while (ch) {
field = ch;
ch = get_field (ch);
- debug_print (2, ("field: %s\n", field));
if (!ascii_strcasecmp (field, "needsterminal")) {
if (entry)
if (!ascii_strcasecmp (field, "needsterminal")) {
if (entry)
@@
-264,7
+262,7
@@
static int rfc1524_mailcap_parse (BODY * a,
* if this is the right entry.
*/
char *test_command = NULL;
* if this is the right entry.
*/
char *test_command = NULL;
- size_t len;
+ s
s
ize_t len;
if (get_field_text (field + 4, &test_command, type, filename, line)
&& test_command) {
if (get_field_text (field + 4, &test_command, type, filename, line)
&& test_command) {
@@
-367,7
+365,7
@@
int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry,
while (!found && *curr) {
x = 0;
while (!found && *curr) {
x = 0;
- while (*curr && *curr != ':' && x < sizeof (path) - 1) {
+ while (*curr && *curr != ':' && x < s
s
izeof (path) - 1) {
path[x++] = *curr;
curr++;
}
path[x++] = *curr;
curr++;
}
@@
-380,7
+378,6
@@
int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry,
path[x] = '\0';
mutt_expand_path (path, sizeof (path));
path[x] = '\0';
mutt_expand_path (path, sizeof (path));
- debug_print (2, ("Checking mailcap file: %s\n", path));
found = rfc1524_mailcap_parse (a, path, type, entry, opt);
}
found = rfc1524_mailcap_parse (a, path, type, entry, opt);
}
@@
-402,15
+399,8
@@
int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry,
* Returns 1 if newfile specified
*/
* Returns 1 if newfile specified
*/
-static void strnfcpy (char *d, char *s, size_t siz, size_t len)
-{
- if (len > siz)
- len = siz - 1;
- strfcpy (d, s, len);
-}
-
int rfc1524_expand_filename (char *nametemplate,
int rfc1524_expand_filename (char *nametemplate,
- char *oldfile, char *newfile, size_t nflen)
+ char *oldfile, char *newfile, s
s
ize_t nflen)
{
int i, j, k, ps, r;
char *s;
{
int i, j, k, ps, r;
char *s;
@@
-431,7
+421,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");
@@
-493,18
+483,18
@@
int rfc1524_expand_filename (char *nametemplate,
if (lmatch)
*left = 0;
else
if (lmatch)
*left = 0;
else
-
strnfcpy (left, nametemplate, sizeof (left)
, i);
+
m_strncpy(left, sizeof(left), nametemplate
, i);
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
);
}
}
}
}