Commit 1c0ee638 1c0ee63834fc729e6ed49fcfa6965d8a7cc88f87 by Sergey Poznyakoff

Mail: bugfixes.

* mail/file.c: Use "headers" instead of non-standard "z."
* mail/mail.c: Avoid % interpretation in
the argument to util_cache_command.
* mail/util.c (_run_and_free): Avoid % interpretation in
the argument to util_do_command.
1 parent 9b0dee5f
...@@ -121,7 +121,7 @@ mail_file (int argc, char **argv) ...@@ -121,7 +121,7 @@ mail_file (int argc, char **argv)
121 if (mailvar_get (NULL, "header", mailvar_type_boolean, 0) == 0) 121 if (mailvar_get (NULL, "header", mailvar_type_boolean, 0) == 0)
122 { 122 {
123 util_do_command ("summary"); 123 util_do_command ("summary");
124 util_do_command ("z."); 124 util_do_command ("headers");
125 } 125 }
126 return 0; 126 return 0;
127 } 127 }
......
...@@ -137,7 +137,7 @@ parse_opt (int key, char *arg, struct argp_state *state) ...@@ -137,7 +137,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
137 break; 137 break;
138 138
139 case 'E': 139 case 'E':
140 util_cache_command (&command_list, arg); 140 util_cache_command (&command_list, "%s", arg);
141 break; 141 break;
142 142
143 case 'F': 143 case 'F':
...@@ -499,7 +499,7 @@ main (int argc, char **argv) ...@@ -499,7 +499,7 @@ main (int argc, char **argv)
499 if (mailvar_get (NULL, "header", mailvar_type_boolean, 0) == 0) 499 if (mailvar_get (NULL, "header", mailvar_type_boolean, 0) == 0)
500 { 500 {
501 util_do_command ("summary"); 501 util_do_command ("summary");
502 util_do_command ("z."); 502 util_do_command ("headers");
503 } 503 }
504 504
505 mailvar_get (&prompt, "prompt", mailvar_type_string, 0); 505 mailvar_get (&prompt, "prompt", mailvar_type_string, 0);
......
...@@ -1068,7 +1068,7 @@ util_cache_command (mu_list_t *list, const char *fmt, ...) ...@@ -1068,7 +1068,7 @@ util_cache_command (mu_list_t *list, const char *fmt, ...)
1068 static int 1068 static int
1069 _run_and_free (void *item, void *data) 1069 _run_and_free (void *item, void *data)
1070 { 1070 {
1071 util_do_command ((char *) item); 1071 util_do_command ("%s", (char *) item);
1072 free (item); 1072 free (item);
1073 return 0; 1073 return 0;
1074 } 1074 }
......