projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More string and buffer functions.
[apps/madmutt.git]
/
lib-ui
/
query.c
diff --git
a/lib-ui/query.c
b/lib-ui/query.c
index
62ecd9a
..
a9415e4
100644
(file)
--- a/
lib-ui/query.c
+++ b/
lib-ui/query.c
@@
-7,12
+7,11
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#include <lib-
lib/lib-lib
.h>
+#include <lib-
ui/lib-ui
.h>
#include <lib-sys/unix.h>
#include <lib-ui/menu.h>
#include <lib-sys/unix.h>
#include <lib-ui/menu.h>
-#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
#include "mutt.h"
#include "alias.h"
@@
-31,16
+30,6
@@
typedef struct entry {
QUERY *data;
} ENTRY;
QUERY *data;
} ENTRY;
-static struct mapping_t QueryHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Mail"), OP_MAIL},
- {N_("New Query"), OP_QUERY},
- {N_("Make Alias"), OP_CREATE_ALIAS},
- {N_("Search"), OP_SEARCH},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
/* Variables for outsizing output format */
static int FirstColumn;
static int SecondColumn;
/* Variables for outsizing output format */
static int FirstColumn;
static int SecondColumn;
@@
-76,7
+65,7
@@
static QUERY *run_query (char *s, int quiet)
int l;
int l;
- m
utt_expand_file_fmt
(cmd, sizeof (cmd), QueryCmd, s);
+ m
_quotefile_fmt
(cmd, sizeof (cmd), QueryCmd, s);
if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
return 0;
if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
return 0;
@@
-100,14
+89,14
@@
static QUERY *run_query (char *s, int quiet)
cur = cur->next;
}
cur = cur->next;
}
- l = m
utt_strwidth
(p);
+ l = m
_strwidth
(p);
if (l > SecondColumn)
SecondColumn = l;
cur->addr = rfc822_parse_adrlist (cur->addr, p);
p = strtok (NULL, "\t\n");
if (p) {
if (l > SecondColumn)
SecondColumn = l;
cur->addr = rfc822_parse_adrlist (cur->addr, p);
p = strtok (NULL, "\t\n");
if (p) {
- l = m
utt_strwidth
(p);
+ l = m
_strwidth
(p);
if (l > FirstColumn)
FirstColumn = l;
cur->name = m_strdup(p);
if (l > FirstColumn)
FirstColumn = l;
cur->name = m_strdup(p);
@@
-159,7
+148,7
@@
static int query_search (MUTTMENU * m, regex_t * re, int n)
static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
{
ENTRY *table = (ENTRY *) m->data;
static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
{
ENTRY *table = (ENTRY *) m->data;
- char buf2[S
HORT_STRING], buf[SHORT_
STRING] = "";
+ char buf2[S
TRING], buf[
STRING] = "";
/* need a query format ... hard coded constants are not good */
while (FirstColumn + SecondColumn > 70) {
/* need a query format ... hard coded constants are not good */
while (FirstColumn + SecondColumn > 70) {
@@
-171,7
+160,7
@@
static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
SecondColumn = QUERY_MIN_COLUMN_LENGHT;
}
SecondColumn = QUERY_MIN_COLUMN_LENGHT;
}
- rfc822_
write_address
(buf, sizeof (buf), table[num].data->addr, 1);
+ rfc822_
addrcat
(buf, sizeof (buf), table[num].data->addr, 1);
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
@@
-213,15
+202,15
@@
int mutt_query_complete (char *buf, ssize_t buflen)
tmpa = result_to_addr (results);
mutt_addrlist_to_local (tmpa);
buf[0] = '\0';
tmpa = result_to_addr (results);
mutt_addrlist_to_local (tmpa);
buf[0] = '\0';
- rfc822_
write_address
(buf, buflen, tmpa, 0);
+ rfc822_
addrcat
(buf, buflen, tmpa, 0);
address_list_wipe(&tmpa);
mutt_clear_error ();
address_list_wipe(&tmpa);
mutt_clear_error ();
- return
(0)
;
+ return
0
;
}
/* multiple results, choose from query menu */
query_menu (buf, buflen, results, 1);
}
}
/* multiple results, choose from query menu */
query_menu (buf, buflen, results, 1);
}
- return
(0)
;
+ return
0
;
}
void mutt_query_menu (char *buf, ssize_t buflen)
}
void mutt_query_menu (char *buf, ssize_t buflen)
@@
-250,7
+239,6
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
QUERY *queryp = NULL;
int i, done = 0;
int op;
QUERY *queryp = NULL;
int i, done = 0;
int op;
- char helpstr[SHORT_STRING];
char title[STRING];
snprintf (title, sizeof (title), _("Query")); /* FIXME */
char title[STRING];
snprintf (title, sizeof (title), _("Query")); /* FIXME */
@@
-261,8
+249,6
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
menu->tag = query_tag;
menu->menu = MENU_QUERY;
menu->title = title;
menu->tag = query_tag;
menu->menu = MENU_QUERY;
menu->title = title;
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_QUERY, QueryHelp);
if (results == NULL) {
/* Prompt for Query */
if (results == NULL) {
/* Prompt for Query */
@@
-325,9
+311,6
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
menu->tag = query_tag;
menu->menu = MENU_QUERY;
menu->title = title;
menu->tag = query_tag;
menu->menu = MENU_QUERY;
menu->title = title;
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_QUERY,
- QueryHelp);
/* count the number of results */
for (queryp = results; queryp; queryp = queryp->next)
/* count the number of results */
for (queryp = results; queryp; queryp = queryp->next)
@@
-426,7
+409,7
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
mutt_addrlist_to_local (tmpa);
tagged = 1;
mutt_addrlist_to_local (tmpa);
tagged = 1;
- rfc822_
write_address
(buf, buflen, tmpa, 0);
+ rfc822_
addrcat
(buf, buflen, tmpa, 0);
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
@@
-434,9
+417,8
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
address_t *tmpa = result_to_addr (QueryTable[i].data);
mutt_addrlist_to_local (tmpa);
address_t *tmpa = result_to_addr (QueryTable[i].data);
mutt_addrlist_to_local (tmpa);
- strcat (buf, ", "); /* __STRCAT_CHECKED__ */
- rfc822_write_address ((char *) buf + curpos + 1,
- buflen - curpos - 1, tmpa, 0);
+ m_strcat(buf, buflen, ", ");
+ rfc822_addrcat(buf + curpos + 1, buflen - curpos - 1, tmpa, 0);
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
@@
-447,7
+429,7
@@
static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
mutt_addrlist_to_local (tmpa);
address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
mutt_addrlist_to_local (tmpa);
- rfc822_
write_address
(buf, buflen, tmpa, 0);
+ rfc822_
addrcat
(buf, buflen, tmpa, 0);
address_list_wipe(&tmpa);
}
address_list_wipe(&tmpa);
}