static gchar *buffer = NULL;
static gint bufmax = 0;
static gint bufsize = 0;
-static gchar *quote_str = NULL;
+static const gchar *quote_str = NULL;
+static const gchar *body = NULL;
static gint error = 0;
static void add_visibility(gboolean val)
stacksize--;
}
-static void add_buffer(gchar *s)
+static void add_buffer(const gchar *s)
{
gint len;
add_buffer(tmp); \
}
-void quote_fmt_init(MsgInfo *info, gchar *my_quote_str)
+void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str,
+ const gchar *my_body)
{
quote_str = my_quote_str;
+ body = my_body;
msginfo = info;
stacksize = 0;
add_visibility(TRUE);
void quote_fmterror(char *str)
{
- g_warning(_("Error %s\n"), str);
+ g_warning(_("Error: %s\n"), str);
error = 1;
}
%union {
char chr;
+ char str[256];
}
%token SHOW_NEWSGROUPS
-%token SHOW_DATE SHOW_FROM SHOW_FULLNAME SHOW_FIRST_NAME
+%token SHOW_DATE SHOW_FROM SHOW_FULLNAME SHOW_FIRST_NAME SHOW_LAST_NAME
%token SHOW_SENDER_INITIAL SHOW_SUBJECT SHOW_TO SHOW_MESSAGEID
%token SHOW_PERCENT SHOW_CC SHOW_REFERENCES SHOW_MESSAGE
%token SHOW_QUOTED_MESSAGE SHOW_BACKSLASH SHOW_TAB
%token SHOW_QUOTED_MESSAGE_NO_SIGNATURE SHOW_MESSAGE_NO_SIGNATURE
-%token SHOW_EOL SHOW_QUESTION_MARK SHOW_OPARENT SHOW_CPARENT
+%token SHOW_EOL SHOW_QUESTION_MARK SHOW_PIPE SHOW_OPARENT SHOW_CPARENT
%token QUERY_DATE QUERY_FROM
%token QUERY_FULLNAME QUERY_SUBJECT QUERY_TO QUERY_NEWSGROUPS
%token QUERY_MESSAGEID QUERY_CC QUERY_REFERENCES
+%token INSERT_FILE INSERT_PROGRAMOUTPUT
%token OPARENT CPARENT
%token CHARACTER
%token <chr> CHARACTER
%type <chr> character
+%type <str> string
%%
quote_fmt:
- character_or_special_or_query_list;
+ character_or_special_or_insert_or_query_list;
-character_or_special_or_query_list:
- character_or_special_or_query character_or_special_or_query_list
- | character_or_special_or_query ;
+character_or_special_or_insert_or_query_list:
+ character_or_special_or_insert_or_query character_or_special_or_insert_or_query_list
+ | character_or_special_or_insert_or_query ;
-character_or_special_or_query:
- special ;
+character_or_special_or_insert_or_query:
+ special
| character
{
INSERT_CHARACTER($1);
}
| query ;
-
+ | insert ;
character:
CHARACTER
;
+string:
+ CHARACTER
+ {
+ $$[0] = $1;
+ $$[1] = '\0';
+ }
+ | string CHARACTER
+ {
+ strcpy($$, $1);
+ $$[strlen($$) + 1] = '\0';
+ $$[strlen($$)] = $2;
+ };
+
special:
SHOW_NEWSGROUPS
{
}
}
}
+ | SHOW_LAST_NAME
+ {
+ /* This probably won't work together very well with Middle
+ names and the like - thth */
+ if (msginfo->fromname) {
+ gchar *p;
+ gchar *str;
+
+ str = alloca(strlen(msginfo->fromname) + 1);
+ if (str != NULL) {
+ strcpy(str, msginfo->fromname);
+ p = str;
+ while (*p && !isspace(*p)) p++;
+ if (*p) {
+ /* We found a space. Get first none-space char and
+ insert rest of string from there. */
+ while (*p && isspace(*p)) p++;
+ if (*p) {
+ INSERT(p);
+ } else {
+ /* If there is no none-space char, just insert
+ whole fromname. */
+ INSERT(str);
+ }
+ } else {
+ /* If there is no space, just insert whole fromname. */
+ INSERT(str);
+ }
+ }
+ }
+ }
| SHOW_SENDER_INITIAL
{
#define MAX_SENDER_INITIAL 20
gchar buf[BUFFSIZE];
FILE *fp;
- if ((fp = procmime_get_first_text_content(msginfo))
- == NULL)
+ if (body)
+ fp = str_open_as_stream(body);
+ else
+ fp = procmime_get_first_text_content(msginfo);
+
+ if (fp == NULL)
g_warning(_("Can't get text part\n"));
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar buf[BUFFSIZE];
FILE *fp;
- if ((fp = procmime_get_first_text_content(msginfo))
- == NULL)
+ if (body)
+ fp = str_open_as_stream(body);
+ else
+ fp = procmime_get_first_text_content(msginfo);
+
+ if (fp == NULL)
g_warning(_("Can't get text part\n"));
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar buf[BUFFSIZE];
FILE *fp;
- if ((fp = procmime_get_first_text_content(msginfo))
- == NULL)
+ if (body)
+ fp = str_open_as_stream(body);
+ else
+ fp = procmime_get_first_text_content(msginfo);
+
+ if (fp == NULL)
g_warning(_("Can't get text part\n"));
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar buf[BUFFSIZE];
FILE *fp;
- if ((fp = procmime_get_first_text_content(msginfo))
- == NULL)
+ if (body)
+ fp = str_open_as_stream(body);
+ else
+ fp = procmime_get_first_text_content(msginfo);
+
+ if (fp == NULL)
g_warning(_("Can't get text part\n"));
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
{
INSERT("?");
}
+ | SHOW_PIPE
+ {
+ INSERT("|");
+ }
| SHOW_OPARENT
{
- INSERT("(");
+ INSERT("{");
}
| SHOW_CPARENT
{
- INSERT(")");
+ INSERT("}");
};
query:
{
remove_visibility();
};
+
+insert:
+ INSERT_FILE OPARENT string CPARENT
+ {
+ {
+ FILE *file;
+ char buffer[256];
+
+ if(file = fopen($3, "rb")) {
+ while(fgets(buffer, sizeof(buffer), file)) {
+ INSERT(buffer);
+ }
+ fclose(file);
+ }
+ }
+ }
+ | INSERT_PROGRAMOUTPUT OPARENT string CPARENT
+ {
+ {
+ FILE *file;
+ char buffer[256];
+
+ if(file = popen($3, "r")) {
+ while(fgets(buffer, sizeof(buffer), file)) {
+ INSERT(buffer);
+ }
+ fclose(file);
+ }
+ }
+ };