#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <string.h>
#include <stdlib.h>
break;
}
}
- mutt_remove_trailing_ws (s);
+ str_skip_trailws (s);
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++;
- field = mutt_skip_whitespace (field);
+ field = str_skip_initws (field);
str_replace (entry, field);
}
return 1;
/* ignore comments */
if (*buf == '#')
continue;
- dprint (2, (debugfile, "mailcap entry: %s\n", buf));
+ 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 */
- safe_strcmp (buf + btlen, "/*")))) /* wildsubtype */
+ mutt_strcmp (buf + btlen, "/*")))) /* wildsubtype */
continue;
/* next field is the viewcommand */
while (ch) {
field = ch;
ch = get_field (ch);
- dprint (2, (debugfile, "field: %s\n", field));
+ debug_print (2, ("field: %s\n", field));
if (!ascii_strcasecmp (field, "needsterminal")) {
if (entry)
if (get_field_text (field + 4, &test_command, type, filename, line)
&& test_command) {
- len = safe_strlen (test_command) + STRING;
+ len = mutt_strlen (test_command) + STRING;
safe_realloc (&test_command, len);
rfc1524_expand_command (a, a->filename, type, test_command, len);
if (mutt_system (test_command)) {
path[x] = '\0';
mutt_expand_path (path, sizeof (path));
- dprint (2, (debugfile, "Checking mailcap file: %s\n", path));
+ debug_print (2, ("Checking mailcap file: %s\n", path));
found = rfc1524_mailcap_parse (a, path, type, entry, opt);
}
rmatch = 1;
- for (r = 0, j = safe_strlen (oldfile) - 1, k =
- safe_strlen (nametemplate) - 1;
+ for (r = 0, j = mutt_strlen (oldfile) - 1, k =
+ mutt_strlen (nametemplate) - 1;
j >= (lmatch ? i : 0) && k >= i + 2; j--, k--) {
if (nametemplate[k] != oldfile[j]) {
rmatch = 0;