From 1d23ff94c4c79b9a771197f39d023b2f9c0928c9 Mon Sep 17 00:00:00 2001 From: pdmef Date: Sat, 11 Feb 2006 23:09:27 +0000 Subject: [PATCH] - read $sysconfdir/mime.types in addition (fixes bug #6197 except not with an option) git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@779 e385b8ad-14ed-0310-8656-cc95a2468c6d --- VERSION.svn | 2 +- sendlib.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/VERSION.svn b/VERSION.svn index 451dd3f..7e1d92a 100644 --- a/VERSION.svn +++ b/VERSION.svn @@ -1 +1 @@ -778 +779 diff --git a/sendlib.c b/sendlib.c index 7369e84..e47825c 100644 --- a/sendlib.c +++ b/sendlib.c @@ -892,7 +892,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path) szf = str_len (path); - for (count = 0; count < 3; count++) { + for (count = 0; count < 4; count++) { /* * can't use strtok() because we use it in an inner loop below, so use * a switch statement here instead. @@ -907,6 +907,9 @@ int mutt_lookup_mime_type (BODY * att, const char *path) case 2: strfcpy (buf, PKGDATADIR "/mime.types", sizeof (buf)); break; + case 3: + strfcpy (buf, SYSCONFDIR "/mime.types", sizeof (buf)); + break; default: debug_print (1, ("Internal error, count = %d.\n", count)); goto bye; /* shouldn't happen */ -- 2.20.1