summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-11-10 16:19:15 +0200
committerSergey Poznyakoff <gray@gnu.org>2020-11-10 16:38:00 +0200
commit7b2f2049e941500944ca6d34f4a3ff34779acee4 (patch)
tree79c2e544b1d7324d46f32bb88797cfeb103328be /include
parent5eaafe97469cde9690b37895e4af90511d9c4dc3 (diff)
downloadmailutils-7b2f2049e941500944ca6d34f4a3ff34779acee4.tar.gz
mailutils-7b2f2049e941500944ca6d34f4a3ff34779acee4.tar.bz2
Fix Savane bug #56428
* NEWS: Update. * configure.ac: Version 3.10.90 * include/mailutils/cstr.h (mu_version_string_parse) (mu_version_string_cmp): New protos. * libmailutils/string/Makefile.am (libstring_la_SOURCES): Add version.c. * libmailutils/string/version.c: New file. * include/mailutils/sys/amd.h (_amd_message): Remove the orig_flags member. All uses changed. (MU_AMD_PROP): New capability. * include/mailutils/url.h (MU_AUTODETECT_ACCURACY_MAX): New constant. * libmailutils/base/amd.c (_amd_prop_create): Raise MU_AMD_PROP if the prop file exists. * libmailutils/base/schemeauto.c: New values for the MU_AUTODETECT_ACCURACY environment variable: default, fast, and max. * libmailutils/property/mhprop.c (_mh_prop_fill): Fix diagnostic message. * libproto/maildir/mbox.c: Fix incorrect letter to attribute mapping. * libproto/mh/mbox.c: Remove uses of orig_flags. * libmailutils/base/registrar.c (mu_registrar_lookup_url): Fall back to the default registrar if the url doesn't contain explicit scheme, the file it references does not exist, and the default record is a local one.
Diffstat (limited to 'include')
-rw-r--r--include/mailutils/cstr.h3
-rw-r--r--include/mailutils/sys/amd.h3
-rw-r--r--include/mailutils/url.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/include/mailutils/cstr.h b/include/mailutils/cstr.h
index f993a03fa..8651d6ada 100644
--- a/include/mailutils/cstr.h
+++ b/include/mailutils/cstr.h
@@ -64,6 +64,9 @@ int mu_c_str_unescape_trans (char const *str, char const *trans,
char **ret_str);
+int mu_version_string_parse (char const *verstr, int version[3], char **endp);
+int mu_version_string_cmp (char const *a, char const *b, int ignoresuf, int *res);
+
int mu_str_expand (char **output, char const *input, mu_assoc_t assoc);
int mu_str_vexpand (char **output, char const *input, ...);
diff --git a/include/mailutils/sys/amd.h b/include/mailutils/sys/amd.h
index 75173d90b..2dd4e553b 100644
--- a/include/mailutils/sys/amd.h
+++ b/include/mailutils/sys/amd.h
@@ -55,9 +55,7 @@ struct _amd_message
mu_off_t body_start; /* Offset of body start in the message file */
mu_off_t body_end; /* Offset of body end (size of file, effectively)*/
- int orig_flags; /* Original attribute flags */
int attr_flags; /* Current attribute flags */
-
time_t mtime; /* Time of last modification */
size_t header_lines; /* Number of lines in the header part */
@@ -70,6 +68,7 @@ struct _amd_message
/* AMD capabilities */
#define MU_AMD_STATUS 0x01 /* format keeps status flags */
#define MU_AMD_IMAPBASE 0x02 /* format keeps IMAP base */
+#define MU_AMD_PROP 0x04 /* prop file existed */
struct _amd_data
{
diff --git a/include/mailutils/url.h b/include/mailutils/url.h
index 40a7448a7..39e6c018a 100644
--- a/include/mailutils/url.h
+++ b/include/mailutils/url.h
@@ -164,7 +164,9 @@ enum
MU_AUTODETECT_ACCURACY_FAST = 0,
/* Default: minimal accuracy */
MU_AUTODETECT_ACCURACY_DEFAULT = 1,
- /* Any non-negative value also allowed */
+ /* Maximal accuracy so far */
+ MU_AUTODETECT_ACCURACY_MAX = 2
+ /* Any non-negative value also allowed ... */
};
int mu_scheme_autodetect_p (mu_url_t);

Return to:

Send suggestions and report system problems to the System administrator.