const struct mapping_t *map,
char* errbuf, size_t errlen);
const struct mapping_t *map,
char* errbuf, size_t errlen);
- strfcpy (path, val, sizeof (path));
- mutt_expand_path (path, sizeof (path));
+ strfcpy (path, val, sizeof(path));
+ mutt_expand_path (path, sizeof(path));
- snprintf (dst, sizeof (dst), "%s=unknown", option->option);
+ snprintf (dst, sizeof(dst), "%s=unknown", option->option);
if ((e = REGCOMP (rx, s, flags)) != 0) {
regerror (e, rx, errbuf, errlen);
if ((e = REGCOMP (rx, s, flags)) != 0) {
regerror (e, rx, errbuf, errlen);
- rfc822_write_address (s, sizeof (s), *((ADDRESS**) option->data), 0);
+ rfc822_write_address (s, sizeof(s), *((ADDRESS**) option->data), 0);
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
/* for synonym warning reports: adds synonym to end of list */
static void syn_add (struct option_t* n, struct option_t* o) {
/* for synonym warning reports: adds synonym to end of list */
static void syn_add (struct option_t* n, struct option_t* o) {
mutt_extract_token (tmp, s, 0);
/* is the item defined as a variable or a function? */
mutt_extract_token (tmp, s, 0);
/* is the item defined as a variable or a function? */
-static void mutt_set_default (const char* name, void* p, unsigned long more) {
- char buf[LONG_STRING];
- struct option_t* ptr = (struct option_t*) p;
+static void mutt_set_default(const char *name, void* p, unsigned long more)
+{
+ char buf[LONG_STRING];
+ struct option_t *ptr = p;
- if (DTYPE (ptr->type) == DT_SYN) {
- if (!more)
- return;
- ptr = hash_find (ConfigOptions, (char*) ptr->data);
- }
- if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
- return;
- mutt_option_value (ptr->option, buf, sizeof (buf));
- if (str_len (ptr->init) == 0 && buf && *buf)
- ptr->init = str_dup (buf);
+ if (DTYPE(ptr->type) == DT_SYN) {
+ if (!more)
+ return;
+ ptr = hash_find(ConfigOptions, (const char *)ptr->data);
+ }
+ if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
+ return;
+
+ mutt_option_value(ptr->option, buf, sizeof(buf));
+ if (str_len(ptr->init) == 0 && buf && *buf)
+ ptr->init = str_dup(buf);
}
static struct option_t* add_option (const char* name, const char* init,
short type, short dodup) {
}
static struct option_t* add_option (const char* name, const char* init,
short type, short dodup) {
/* only expand for string as it's the only place where
* we want to expand vars right now */
if (src->init && *src->init) {
/* only expand for string as it's the only place where
* we want to expand vars right now */
if (src->init && *src->init) {
- memset (&token, 0, sizeof (BUFFER));
- memset (&in, 0, sizeof (BUFFER));
+ memset (&token, 0, sizeof(BUFFER));
+ memset (&in, 0, sizeof(BUFFER));
len = str_len (src->init) + 2;
in.data = mem_malloc (len+1);
snprintf (in.data, len, "\"%s\"", src->init);
len = str_len (src->init) + 2;
in.data = mem_malloc (len+1);
snprintf (in.data, len, "\"%s\"", src->init);
if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
init_expand (&init, ptr);
if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
init_expand (&init, ptr);
if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("Invalid default setting for $%s found: \"%s\".\n"
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("Invalid default setting for $%s found: \"%s\".\n"
while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
- strfcpy (path, tmp->data, sizeof (path));
- mutt_expand_path (path, sizeof (path));
+ strfcpy (path, tmp->data, sizeof(path));
+ mutt_expand_path (path, sizeof(path));
-#define NUMVARS (sizeof (MuttVars)/sizeof (MuttVars[0]))
-#define NUMCOMMANDS (sizeof (Commands)/sizeof (Commands[0]))
+#define NUMVARS (sizeof(MuttVars)/sizeof(MuttVars[0]))
+#define NUMCOMMANDS (sizeof(Commands)/sizeof(Commands[0]))
/* initial string that starts completion. No telling how much crap
* the user has typed so far. Allocate LONG_STRING just to be sure! */
char User_typed[LONG_STRING] = { 0 };
/* initial string that starts completion. No telling how much crap
* the user has typed so far. Allocate LONG_STRING just to be sure! */
char User_typed[LONG_STRING] = { 0 };
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ strfcpy (User_typed, pt, sizeof(User_typed));
+ memset (Matches, 0, sizeof(Matches));
+ memset (Completed, 0, sizeof(Completed));
for (num = 0; Commands[num].name; num++)
candidate (Completed, User_typed, Commands[num].name,
for (num = 0; Commands[num].name; num++)
candidate (Completed, User_typed, Commands[num].name,
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ strfcpy (User_typed, pt, sizeof(User_typed));
+ memset (Matches, 0, sizeof(Matches));
+ memset (Completed, 0, sizeof(Completed));
for (num = 0; MuttVars[num].option; num++)
candidate (Completed, User_typed, MuttVars[num].option,
for (num = 0; MuttVars[num].option; num++)
candidate (Completed, User_typed, MuttVars[num].option,
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
strncpy (pt, Completed, buffer + len - pt - spaces);
Matches[(numtabs - 2) % Num_matched]);
strncpy (pt, Completed, buffer + len - pt - spaces);
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ strfcpy (User_typed, pt, sizeof(User_typed));
+ memset (Matches, 0, sizeof(Matches));
+ memset (Completed, 0, sizeof(Completed));
- candidate (Completed, User_typed, menu[num].name, sizeof (Completed));
+ candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
/* try the generic menu */
if (Completed[0] == 0 && CurrentMenu != MENU_PAGER) {
menu = OpGeneric;
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name,
/* try the generic menu */
if (Completed[0] == 0 && CurrentMenu != MENU_PAGER) {
menu = OpGeneric;
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name,
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
strncpy (pt, Completed, buffer + len - pt - spaces);
Matches[(numtabs - 2) % Num_matched]);
strncpy (pt, Completed, buffer + len - pt - spaces);
/* ignore the trailing '=' when comparing */
var[str_len (var) - 1] = 0;
if (!(option = hash_find (ConfigOptions, var)))
/* ignore the trailing '=' when comparing */
var[str_len (var) - 1] = 0;
if (!(option = hash_find (ConfigOptions, var)))
if ((DTYPE (option->type) == DT_STR) ||
(DTYPE (option->type) == DT_PATH) ||
(DTYPE (option->type) == DT_RX)) {
if ((DTYPE (option->type) == DT_STR) ||
(DTYPE (option->type) == DT_PATH) ||
(DTYPE (option->type) == DT_RX)) {
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
*((ADDRESS **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
*((ADDRESS **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
- snprintf (tmp, sizeof (tmp), "%d", (*((short *) option->data)));
+ snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
- snprintf(tmp, sizeof (tmp), "%s%s%s",
+ snprintf(tmp, sizeof(tmp), "%s%s%s",
(*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
(*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
}
(*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
(*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
}
}
else if (DTYPE (option->type) == DT_BOOL)
strfcpy (tmp, option (option->data) ? "yes" : "no",
}
else if (DTYPE (option->type) == DT_BOOL)
strfcpy (tmp, option (option->data) ? "yes" : "no",
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
- memset (&err, 0, sizeof (err));
- memset (&token, 0, sizeof (token));
+ memset (&err, 0, sizeof(err));
+ memset (&token, 0, sizeof(token));
- snprintf (command, sizeof (command), "set ?%s\n", p->data);
+ snprintf (command, sizeof(command), "set ?%s\n", p->data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
mem_free (&token.data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
mem_free (&token.data);
- err.dsize = sizeof (errstr);
- memset (&token, 0, sizeof (token));
+ err.dsize = sizeof(errstr);
+ memset (&token, 0, sizeof(token));
for (; p; p = p->next) {
if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
fprintf (stderr, _("Error in command line: %s\n"), err.data);
for (; p; p = p->next) {
if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
fprintf (stderr, _("Error in command line: %s\n"), err.data);
for (i = 0; MuttVars[i].option; i++) {
if (DTYPE (MuttVars[i].type) != DT_SYS)
hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
for (i = 0; MuttVars[i].option; i++) {
if (DTYPE (MuttVars[i].type) != DT_SYS)
hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
"\033]9;%ld\a", (long) time (NULL));
/* on one of the systems I use, getcwd() does not return the same prefix
"\033]9;%ld\a", (long) time (NULL));
/* on one of the systems I use, getcwd() does not return the same prefix
if ((p = strchr (utsname.nodename, '.'))) {
Hostname = str_substrdup (utsname.nodename, p);
p++;
if ((p = strchr (utsname.nodename, '.'))) {
Hostname = str_substrdup (utsname.nodename, p);
p++;
- mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof (buffer));
+ mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof(buffer));
- mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof (buffer));
+ mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
- snprintf (buffer, sizeof (buffer), "Reply-To: %s", p);
+ snprintf (buffer, sizeof(buffer), "Reply-To: %s", p);
parse_my_hdr (&token, &buf, 0, &err);
mem_free (&token.data);
}
parse_my_hdr (&token, &buf, 0, &err);
mem_free (&token.data);
}
- snprintf (buffer, sizeof (buffer), "%s/.muttngrc-%s", NONULL (Homedir),
+ snprintf (buffer, sizeof(buffer), "%s/.muttngrc-%s", NONULL (Homedir),
- snprintf (buffer, sizeof (buffer), "%s/.muttngrc", NONULL (Homedir));
+ snprintf (buffer, sizeof(buffer), "%s/.muttngrc", NONULL (Homedir));
- snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc-%s",
+ snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc-%s",
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc",
+ snprintf (buffer, sizeof(buffer), "%s/.muttng/muttngrc",
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", SYSCONFDIR,
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", SYSCONFDIR,
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc", SYSCONFDIR);
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc", SYSCONFDIR);
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", PKGDATADIR,
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", PKGDATADIR,
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc", PKGDATADIR);
+ snprintf (buffer, sizeof(buffer), "%s/Muttngrc", PKGDATADIR);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
- snprintf (buffer, sizeof (buffer), "%s: %s", Muttrc, strerror (errno));
+ snprintf (buffer, sizeof(buffer), "%s: %s", Muttrc, strerror (errno));
if (str_cmp (buf, option->init) != 0)
list_push_back (l, option);
}
if (str_cmp (buf, option->init) != 0)
list_push_back (l, option);
}
- qsort (tmp->data, tmp->length, sizeof (void*), opt_cmp);
+ qsort (tmp->data, tmp->length, sizeof(void*), opt_cmp);
for (i = 0; i < tmp->length; i++) {
option = (struct option_t*) tmp->data[i];
FuncTable[DTYPE (option->type)].opt_to_string
for (i = 0; i < tmp->length; i++) {
option = (struct option_t*) tmp->data[i];
FuncTable[DTYPE (option->type)].opt_to_string