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
6c6d317
..
bef1144
100644
(file)
--- a/
rfc1524.c
+++ b/
rfc1524.c
@@
-35,7
+35,6
@@
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
#include <lib-sys/unix.h>
#include <lib-sys/unix.h>
@@
-69,7
+68,7
@@
int rfc1524_expand_command (BODY * a, char *filename, char *_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++];
@@
-83,7
+82,7
@@
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';
param[z++] = command[x++];
param[z] = '\0';
@@
-161,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;
@@
-189,11
+188,10
@@
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);
/* check type */
ch = get_field (buf);
@@
-217,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)
@@
-265,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) {
@@
-368,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++;
}
@@
-381,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);
}
@@
-403,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;
- m_strcpy(d, len, s);
-}
-
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;
@@
-494,7
+483,7
@@
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;
if (rmatch)
*right = 0;