X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=5ad2e221ea587e120945676f7331c13134d3240d;hp=ef3f3d0c125a0e3479a7d22f3c1b9be9fbd84c9a;hb=3cb53df6efcb6b137bbab53c16da4eddbc5a1b2b;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c diff --git a/init.c b/init.c index ef3f3d0..5ad2e22 100644 --- a/init.c +++ b/init.c @@ -20,9 +20,9 @@ #include #include #include +#include #include "mutt.h" -#include "mapping.h" #include "mutt_curses.h" #include "history.h" #include "keymap.h" @@ -186,7 +186,8 @@ static void bool_to_string (char* dst, size_t dstlen, } static int bool_from_string (struct option_t* dst, const char* val, - char* errbuf, size_t errlen) { + char* errbuf __attribute__ ((unused)), + size_t errlen __attribute__ ((unused))) { int flag = -1; if (!dst) @@ -273,7 +274,7 @@ static void sys_to_string (char* dst, size_t dstlen, } else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 && CurrentFolder && *CurrentFolder) { - size_t Maildirlength = m_strlen(Maildir); + ssize_t Maildirlength = m_strlen(Maildir); /* * if name starts with $folder, just strip it to keep hierarchy @@ -290,10 +291,10 @@ static void sys_to_string (char* dst, size_t dstlen, val = t+1; /* default: use as-is */ else - val = CurrentFolder; + val = (char *) CurrentFolder; } else - val = option->init; + val = (char *) option->init; snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val)); if (clean) @@ -301,7 +302,7 @@ static void sys_to_string (char* dst, size_t dstlen, } static int path_from_string (struct option_t* dst, const char* val, - char* errbuf, size_t errlen) { + char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) { char path[_POSIX_PATH_MAX]; if (!dst) @@ -313,9 +314,9 @@ static int path_from_string (struct option_t* dst, const char* val, } path[0] = '\0'; - strfcpy (path, val, sizeof(path)); + m_strcpy(path, sizeof(path), val); mutt_expand_path (path, sizeof(path)); - str_replace ((char **) dst->data, path); + m_strreplace((char **) dst->data, path); return (1); } @@ -327,12 +328,12 @@ static int str_from_string (struct option_t* dst, const char* val, if (!check_special (dst->option, (unsigned long) val, errbuf, errlen)) return (0); - str_replace ((char**) dst->data, val); + m_strreplace((char**) dst->data, val); return (1); } static int user_from_string (struct option_t* dst, const char* val, - char* errbuf, size_t errlen) { + char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) { /* if dst == NULL, we may get here in case the user did unset it, * see parse_set() where item is free()'d before coming here; so * just silently ignore it */ @@ -342,7 +343,7 @@ static int user_from_string (struct option_t* dst, const char* val, dst->data = (unsigned long) m_strdup(val); else { char* s = (char*) dst->data; - str_replace (&s, val); + m_strreplace(&s, val); } if (m_strlen(dst->init) == 0) dst->init = m_strdup((char*) dst->data); @@ -357,7 +358,7 @@ static void quad_to_string (char* dst, size_t dstlen, } static int quad_from_string (struct option_t* dst, const char* val, - char* errbuf, size_t errlen) { + char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) { int flag = -1; if (!dst) @@ -467,7 +468,7 @@ static int rx_from_string (struct option_t* dst, const char* val, p_delete(&p->rx); } - str_replace (&p->pattern, val); + m_strreplace(&p->pattern, val); p->rx = rx; p->not = not; @@ -491,7 +492,7 @@ static void magic_to_string (char* dst, size_t dstlen, } static int magic_from_string (struct option_t* dst, const char* val, - char* errbuf, size_t errlen) { + char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) { int flag = -1; if (!dst || !val || !*val) @@ -517,17 +518,17 @@ static void addr_to_string (char* dst, size_t dstlen, struct option_t* option) { char s[HUGE_STRING]; s[0] = '\0'; - rfc822_write_address (s, sizeof(s), *((ADDRESS**) option->data), 0); + rfc822_write_address (s, sizeof(s), *((address_t**) option->data), 0); snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s)); } static int addr_from_string (struct option_t* dst, const char* val, - char* errbuf, size_t errlen) { + char* errbuf __attribute__ ((unused)), size_t errlen __attribute__ ((unused))) { if (!dst) return (0); - rfc822_free_address ((ADDRESS**) dst->data); + address_delete ((address_t**) dst->data); if (val && *val) - *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val); + *((address_t**) dst->data) = rfc822_parse_adrlist (NULL, val); return (1); } @@ -824,7 +825,8 @@ static int remove_from_rx_list (list2_t** l, const char *str) static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data, BUFFER * err) { - int i, j, res = 0; + int i, j; + unsigned long res = 0; BUFFER token; struct option_t* option = NULL; @@ -884,8 +886,9 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data, return 0; } -static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_unignore (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { do { mutt_extract_token (buf, s, 0); @@ -901,8 +904,9 @@ static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_ignore (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { do { mutt_extract_token (buf, s, 0); @@ -914,8 +918,9 @@ static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_list (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_list (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { do { mutt_extract_token (buf, s, 0); @@ -936,8 +941,9 @@ static void _alternates_clean (void) } } -static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_alternates (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { _alternates_clean (); do { @@ -952,8 +958,9 @@ static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_unalternates (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_unalternates (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { _alternates_clean (); do { @@ -980,9 +987,9 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data, /* Insist on at least one parameter */ if (!MoreArgs (s)) { if (data == M_SPAM) - strfcpy (err->data, _("spam: no matching pattern"), err->dsize); + m_strcpy(err->data, err->dsize, _("spam: no matching pattern")); else - strfcpy (err->data, _("nospam: no matching pattern"), err->dsize); + m_strcpy(err->data, err->dsize, _("nospam: no matching pattern")); return -1; } @@ -1034,12 +1041,12 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data, } /* This should not happen. */ - strfcpy (err->data, "This is no good at all.", err->dsize); + m_strcpy(err->data, err->dsize, "This is no good at all."); return -1; } static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) + BUFFER * err __attribute__ ((unused))) { do { mutt_extract_token (buf, s, 0); @@ -1057,7 +1064,8 @@ static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_lists (BUFFER * buf, BUFFER * s, unsigned long data, +static int parse_lists (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), BUFFER * err) { do { @@ -1082,7 +1090,7 @@ static void _attachments_clean (void) { } static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata, - BUFFER *err) { + BUFFER *err __attribute__ ((unused))) { ATTACH_MATCH *a; LIST *listp, *lastp; char *p; @@ -1154,7 +1162,8 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata, return 0; } -static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err) { +static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, + BUFFER *err __attribute__ ((unused))) { ATTACH_MATCH *a; LIST *lp, *lastp, *newlp; char *tmp; @@ -1175,7 +1184,7 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *er *minor = '\0'; ++minor; } else { - minor = "unknown"; + minor = m_strdup("unknown"); } major = mutt_check_mime_type(tmp); @@ -1227,13 +1236,15 @@ static int print_attach_list (LIST *lp, char op, const char *name) { return 0; } -static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { +static int parse_attachments (BUFFER *buf, BUFFER *s, + unsigned long data __attribute__ ((unused)), + BUFFER *err) { char op, *category; LIST **listp; mutt_extract_token(buf, s, 0); if (!buf->data || *buf->data == '\0') { - strfcpy(err->data, _("attachments: no disposition"), err->dsize); + m_strcpy(err->data, err->dsize, _("attachments: no disposition")); return -1; } @@ -1270,20 +1281,20 @@ static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER else listp = &InlineExclude; } else { - strfcpy(err->data, _("attachments: invalid disposition"), err->dsize); + m_strcpy(err->data, err->dsize, _("attachments: invalid disposition")); return -1; } return parse_attach_list(buf, s, listp, err); } -static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { +static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data __attribute__ ((unused)), BUFFER *err) { char op, *p; LIST **listp; mutt_extract_token(buf, s, 0); if (!buf->data || *buf->data == '\0') { - strfcpy(err->data, _("unattachments: no disposition"), err->dsize); + m_strcpy(err->data, err->dsize, _("unattachments: no disposition")); return -1; } @@ -1306,15 +1317,16 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFF listp = &InlineExclude; } else { - strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize); + m_strcpy(err->data, err->dsize, _("unattachments: invalid disposition")); return -1; } return parse_unattach_list(buf, s, listp, err); } -static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_unlists (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { do { mutt_extract_token (buf, s, 0); @@ -1330,7 +1342,7 @@ static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data, +static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err) { do { @@ -1348,8 +1360,9 @@ static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_unsubscribe (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { do { mutt_extract_token (buf, s, 0); @@ -1364,8 +1377,9 @@ static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +static int parse_unalias (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { ALIAS *tmp, *last = NULL; @@ -1406,7 +1420,8 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data, return 0; } -static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data, +static int parse_alias (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), BUFFER * err) { ALIAS *tmp = Aliases; @@ -1414,7 +1429,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data, char *estr = NULL; if (!MoreArgs (s)) { - strfcpy (err->data, _("alias: no address"), err->dsize); + m_strcpy(err->data, err->dsize, _("alias: no address")); return (-1); } @@ -1440,7 +1455,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data, } else { /* override the previous value */ - rfc822_free_address (&tmp->addr); + address_delete (&tmp->addr); if (CurrentMenu == MENU_ALIAS) set_option (OPTFORCEREDRAWINDEX); } @@ -1460,7 +1475,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data, } #ifdef DEBUG if (DebugLevel >= 2) { - ADDRESS *a; + address_t *a; /* A group is terminated with an empty address, so check a->mailbox */ for (a = tmp->addr; a && a->mailbox; a = a->next) { @@ -1475,7 +1490,9 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data, } static int -parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err) +parse_unmy_hdr (BUFFER * buf, BUFFER * s, + unsigned long data __attribute__ ((unused)), + BUFFER * err __attribute__ ((unused))) { LIST *last = NULL; LIST *tmp = UserHeader; @@ -1517,7 +1534,7 @@ parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err) return 0; } -static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data, +static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err) { LIST *tmp; @@ -1526,7 +1543,7 @@ static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data, mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE); if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') { - strfcpy (err->data, _("invalid header field"), err->dsize); + m_strcpy(err->data, err->dsize, _("invalid header field")); return (-1); } keylen = p - buf->data + 1; @@ -1582,7 +1599,7 @@ parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map, } /* if additional data more == 1, we want to resolve synonyms */ -static void mutt_set_default(const char *name, void* p, unsigned long more) +static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, unsigned long more) { char buf[LONG_STRING]; struct option_t *ptr = p; @@ -1663,8 +1680,8 @@ static int init_expand (char** dst, struct option_t* src) { } /* if additional data more == 1, we want to resolve synonyms */ -static void mutt_restore_default (const char* name, void* p, - unsigned long more) { +static void mutt_restore_default (const char* name __attribute__ ((unused)), + void* p, unsigned long more) { char errbuf[STRING]; struct option_t* ptr = (struct option_t*) p; char* init = NULL; @@ -1705,7 +1722,7 @@ static void mutt_restore_default (const char* name, void* p, } /* check whether value for $dsn_return would be valid */ -static int check_dsn_return (const char* option, unsigned long p, +static int check_dsn_return (const char* option __attribute__ ((unused)), unsigned long p, char* errbuf, size_t errlen) { char* val = (char*) p; if (val && *val && m_strncmp(val, "hdrs", 4) != 0 && @@ -1721,7 +1738,8 @@ static int check_dsn_return (const char* option, unsigned long p, static int check_dsn_notify (const char* option, unsigned long p, char* errbuf, size_t errlen) { list2_t* list = NULL; - int i = 0, rc = 1; + size_t i = 0; + int rc = 1; char* val = (char*) p; if (!val || !*val) @@ -1768,7 +1786,7 @@ static int check_debug (const char* option, unsigned long p, } #endif -static int check_history (const char* option, unsigned long p, +static int check_history (const char* option __attribute__ ((unused)), unsigned long p, char* errbuf, size_t errlen) { if (!check_num ("history", p, errbuf, errlen)) return (0); @@ -1800,8 +1818,7 @@ static const struct mapping_t* get_sortmap (struct option_t* option) { map = SortBrowserMethods; break; case DT_SORT_KEYS: - if ((WithCrypto & APPLICATION_PGP)) - map = SortKeyMethods; + map = SortKeyMethods; break; case DT_SORT_AUX: map = SortAuxMethods; @@ -1878,7 +1895,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data); return (-1); } - SKIPWS (s->dptr); + s->dptr = vskipspaces(s->dptr); if (reset) { if (query || unset || inv) { @@ -1972,7 +1989,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, r = -1; break; } else if (DTYPE (option->type) == DT_ADDR) - rfc822_free_address ((ADDRESS **) option->data); + address_delete ((address_t **) option->data); else if (DTYPE (option->type) == DT_USER) /* to unset $user_ means remove */ hash_delete (ConfigOptions, option->option, @@ -2131,7 +2148,8 @@ static int source_rc (const char *rcfile, BUFFER * err) #undef MAXERRS -static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data, +static int parse_source (BUFFER * tmp, BUFFER * s, + unsigned long data __attribute__ ((unused)), BUFFER * err) { char path[_POSIX_PATH_MAX]; @@ -2143,7 +2161,7 @@ static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data, return (-1); } - strfcpy (path, tmp->data, sizeof(path)); + m_strcpy(path, sizeof(path), tmp->data); mutt_expand_path (path, sizeof(path)); rc += source_rc (path, err); @@ -2176,7 +2194,7 @@ int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err) debug_print (1, ("expand '%s'\n", line)); - SKIPWS (expn.dptr); + expn.dptr = vskipspaces(expn.dptr); while (*expn.dptr) { if (*expn.dptr == '#') break; /* rest of line is a comment */ @@ -2230,7 +2248,7 @@ static void candidate (char *dest, char *try, const char *src, int len) if (strstr (src, try) == src) { Matches[Num_matched++] = src; if (dest[0] == 0) - strfcpy (dest, src, len); + m_strcpy(dest, len, src); else { for (l = 0; src[l] && src[l] == dest[l]; l++); dest[l] = 0; @@ -2244,7 +2262,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs) int num; int spaces; /* keep track of the number of leading spaces on the line */ - SKIPWS (buffer); + buffer = vskipspaces(buffer); spaces = buffer - pt; pt = buffer + pos - spaces; @@ -2255,7 +2273,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs) /* first TAB. Collect all the matches */ if (numtabs == 1) { Num_matched = 0; - strfcpy (User_typed, pt, sizeof(User_typed)); + m_strcpy(User_typed, sizeof(User_typed), pt); p_clear(Matches, sizeof(Matches)); p_clear(Completed, sizeof(Completed)); for (num = 0; Commands[num].name; num++) @@ -2304,7 +2322,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs) /* first TAB. Collect all the matches */ if (numtabs == 1) { Num_matched = 0; - strfcpy (User_typed, pt, sizeof(User_typed)); + m_strcpy(User_typed, sizeof(User_typed), pt); p_clear(Matches, sizeof(Matches)); p_clear(Completed, sizeof(Completed)); for (num = 0; MuttVars[num].option; num++) @@ -2342,7 +2360,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs) /* first TAB. Collect all the matches */ if (numtabs == 1) { Num_matched = 0; - strfcpy (User_typed, pt, sizeof(User_typed)); + m_strcpy(User_typed, sizeof(User_typed), pt); p_clear(Matches, sizeof(Matches)); p_clear(Completed, sizeof(Completed)); for (num = 0; menu[num].name; num++) @@ -2391,7 +2409,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos) if (buffer[0] == 0) return 0; - SKIPWS (buffer); + buffer = vskipspaces(buffer); spaces = buffer - pt; pt = buffer + pos - spaces; @@ -2402,7 +2420,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos) return 0; if (m_strncmp(buffer, "set", 3) == 0) { - strfcpy (var, pt, sizeof(var)); + m_strcpy(var, sizeof(var), pt); /* ignore the trailing '=' when comparing */ var[m_strlen(var) - 1] = 0; if (!(option = hash_find (ConfigOptions, var))) @@ -2418,16 +2436,16 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos) if ((DTYPE (option->type) == DT_STR) || (DTYPE (option->type) == DT_PATH) || (DTYPE (option->type) == DT_RX)) { - strfcpy (tmp, NONULL (*((char **) option->data)), sizeof(tmp)); + m_strcpy(tmp, sizeof(tmp), NONULL(*((char **)option->data))); if (DTYPE (option->type) == DT_PATH) mutt_pretty_mailbox (tmp); } else if (DTYPE (option->type) == DT_ADDR) { rfc822_write_address (tmp, sizeof(tmp), - *((ADDRESS **) option->data), 0); + *((address_t **) option->data), 0); } else if (DTYPE (option->type) == DT_QUAD) - strfcpy (tmp, vals[quadoption (option->data)], sizeof(tmp)); + m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]); else if (DTYPE (option->type) == DT_NUM) snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data))); else if (DTYPE (option->type) == DT_SORT) { @@ -2442,10 +2460,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos) map = SortBrowserMethods; break; case DT_SORT_KEYS: - if ((WithCrypto & APPLICATION_PGP)) - map = SortKeyMethods; - else - map = SortMethods; + map = SortKeyMethods; break; default: map = SortMethods; @@ -2474,22 +2489,21 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos) default: p = "unknown"; } - strfcpy (tmp, p, sizeof(tmp)); + m_strcpy(tmp, sizeof(tmp), p); } else if (DTYPE (option->type) == DT_BOOL) - strfcpy (tmp, option (option->data) ? "yes" : "no", - sizeof(tmp)); + m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no"); else return 0; - for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof(tmp2) - 2;) { + for (s = tmp, d = tmp2; *s && (d - tmp2) < ssizeof(tmp2) - 2;) { if (*s == '\\' || *s == '"') *d++ = '\\'; *d++ = *s++; } *d = '\0'; - strfcpy (tmp, pt, sizeof(tmp)); + m_strcpy(tmp, sizeof(tmp), pt); snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2); return 1; @@ -2528,26 +2542,6 @@ int mutt_query_variables (LIST * queries) return 0; } -const char *mutt_getnamebyvalue (int val, const struct mapping_t *map) -{ - int i; - - for (i = 0; map[i].name; i++) - if (map[i].value == val) - return (map[i].name); - return NULL; -} - -int mutt_getvaluebyname (const char *name, const struct mapping_t *map) -{ - int i; - - for (i = 0; map[i].name; i++) - if (ascii_strcasecmp (map[i].name, name) == 0) - return (map[i].value); - return (-1); -} - static int mutt_execute_commands (LIST * p) { BUFFER err, token; @@ -2574,7 +2568,8 @@ void mutt_init (int skip_sys_rc, LIST * commands) struct utsname utsname; const char *p; char buffer[STRING], error[STRING]; - int i, default_rc = 0, need_pause = 0; + int default_rc = 0, need_pause = 0; + unsigned int i; BUFFER err; p_clear(&err, 1); @@ -2638,9 +2633,9 @@ void mutt_init (int skip_sys_rc, LIST * commands) uname (&utsname); /* some systems report the FQDN instead of just the hostname */ if ((p = strchr (utsname.nodename, '.'))) { - Hostname = str_substrdup (utsname.nodename, p); + Hostname = p_dupstr(utsname.nodename, p - utsname.nodename); p++; - strfcpy (buffer, p, sizeof(buffer)); /* save the domain for below */ + m_strcpy(buffer, sizeof(buffer), p); /* save the domain for below */ } else Hostname = m_strdup(utsname.nodename); @@ -2666,8 +2661,7 @@ void mutt_init (int skip_sys_rc, LIST * commands) if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) { buffer[0] = '\0'; fgets (buffer, sizeof(buffer), f); - p = buffer; - SKIPWS (p); + p = vskipspaces(buffer); q = (char*)p; while (*q && !isspace(*q)) q++; @@ -2793,7 +2787,7 @@ void mutt_init (int skip_sys_rc, LIST * commands) Muttrc = m_strdup(buffer); } else { - strfcpy (buffer, Muttrc, sizeof(buffer)); + m_strcpy(buffer, sizeof(buffer), Muttrc); p_delete(&Muttrc); mutt_expand_path (buffer, sizeof(buffer)); Muttrc = m_strdup(buffer); @@ -2844,7 +2838,7 @@ void mutt_init (int skip_sys_rc, LIST * commands) /* warn about synonym variables */ if (!list_empty(Synonyms)) { - int i = 0; + i = 0; fprintf (stderr, _("Warning: the following synonym variables were found:\n")); for (i = 0; i < Synonyms->length; i++) { struct option_t* newopt = NULL, *oldopt = NULL; @@ -2889,7 +2883,8 @@ static int opt_cmp (const void* a, const void* b) { } /* callback for hash_map() to put all non-synonym vars into list */ -static void opt_sel_full (const char* key, void* data, +static void opt_sel_full (const char* key __attribute__ ((unused)), + void* data, unsigned long more) { list2_t** l = (list2_t**) more; struct option_t* option = (struct option_t*) data; @@ -2900,7 +2895,8 @@ static void opt_sel_full (const char* key, void* data, } /* callback for hash_map() to put all changed non-synonym vars into list */ -static void opt_sel_diff (const char* key, void* data, +static void opt_sel_diff (const char* key __attribute__ ((unused)), + void* data, unsigned long more) { list2_t** l = (list2_t**) more; struct option_t* option = (struct option_t*) data; @@ -2916,7 +2912,7 @@ static void opt_sel_diff (const char* key, void* data, /* dump out the value of all the variables we have */ int mutt_dump_variables (int full) { - int i = 0; + size_t i = 0; char outbuf[STRING]; list2_t* tmp = NULL; struct option_t* option = NULL;