projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
rfc1524.c
diff --git
a/rfc1524.c
b/rfc1524.c
index
31750b5
..
220beeb
100644
(file)
--- a/
rfc1524.c
+++ b/
rfc1524.c
@@
-27,6
+27,7
@@
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
@@
-127,19
+128,19
@@
static char *get_field (char *s)
break;
}
}
break;
}
}
-
mutt_remove_trailing_
ws (s);
+
str_skip_trail
ws (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 =
mutt_skip_whitespace
(field);
+ field =
str_skip_initws
(field);
if (*field == '=') {
if (entry) {
field++;
if (*field == '=') {
if (entry) {
field++;
- field =
mutt_skip_whitespace
(field);
-
mutt_
str_replace (entry, field);
+ field =
str_skip_initws
(field);
+ str_replace (entry, field);
}
return 1;
}
}
return 1;
}
@@
-188,7
+189,7
@@
static int rfc1524_mailcap_parse (BODY * a,
/* ignore comments */
if (*buf == '#')
continue;
/* ignore comments */
if (*buf == '#')
continue;
- d
print (2, (debugfile,
"mailcap entry: %s\n", buf));
+ d
ebug_print (2, (
"mailcap entry: %s\n", buf));
/* check type */
ch = get_field (buf);
/* check type */
ch = get_field (buf);
@@
-212,7
+213,7
@@
static int rfc1524_mailcap_parse (BODY * a,
while (ch) {
field = ch;
ch = get_field (ch);
while (ch) {
field = ch;
ch = get_field (ch);
- d
print (2, (debugfile,
"field: %s\n", field));
+ d
ebug_print (2, (
"field: %s\n", field));
if (!ascii_strcasecmp (field, "needsterminal")) {
if (entry)
if (!ascii_strcasecmp (field, "needsterminal")) {
if (entry)
@@
-376,7
+377,7
@@
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));
- d
print (2, (debugfile,
"Checking mailcap file: %s\n", path));
+ d
ebug_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);
}