+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
%{
#include "defs.h"
#include "procmsg.h"
#include "procmime.h"
#include "utils.h"
-#include "intl.h"
+#include "procheader.h"
#include "quote_fmt.h"
#include "quote_fmt_lex.h"
static const gchar *body = NULL;
static gint error = 0;
+static gint cursor_pos = 0;
+
static void add_visibility(gboolean val)
{
stacksize++;
bufsize += len;
}
-static void flush_buffer(void)
-{
- if (buffer != NULL)
- *buffer = '\0';
- bufsize = 0;
-}
-
gchar *quote_fmt_get_buffer(void)
{
if (error != 0)
return buffer;
}
+gint quote_fmt_get_cursor_pos(void)
+{
+ return cursor_pos;
+}
+
#define INSERT(buf) \
if (stacksize != 0 && visible[stacksize - 1]) \
add_buffer(buf)
*buffer = 0;
bufsize = 0;
error = 0;
+ cursor_pos = 0;
}
void quote_fmterror(char *str)
{
- g_warning(_("Error: %s\n"), str);
+ g_warning("Error: %s\n", str);
error = 1;
}
return 1;
}
-static int isseparator(char ch)
+static int isseparator(int ch)
{
return isspace(ch) || ch == '.' || ch == '-';
}
%token OPARENT CPARENT
%token CHARACTER
%token SHOW_DATE_EXPR
+%token SET_CURSOR_POS
%start quote_fmt
{
INSERT_CHARACTER($1);
}
- | query ;
+ | query
| insert ;
character:
}
| string CHARACTER
{
- strcpy($$, $1);
- $$[strlen($$) + 1] = '\0';
- $$[strlen($$)] = $2;
+ int len;
+
+ strncpy($$, $1, sizeof($$));
+ $$[sizeof($$) - 1] = '\0';
+ len = strlen($$);
+ if (len + 1 < sizeof($$)) {
+ $$[len + 1] = '\0';
+ $$[len] = $2;
+ }
};
special:
}
| SHOW_DATE_EXPR OPARENT string CPARENT
{
- if (msginfo->date_t) {
- char timef[128];
- struct tm *lt;
-
- if (NULL != (lt = localtime(&msginfo->date_t))) {
- strftime(timef, sizeof timef, $3, lt);
- INSERT(timef);
+ /*
+ * ALF - GNU C's strftime() has a nice format specifier
+ * for time zone offset (%z). Non-standard however, so
+ * emulate it.
+ */
+ if (msginfo->date) {
+ char result[100];
+ char *rptr;
+ char zone[6];
+ struct tm lt;
+ const char *fptr;
+ const char *zptr;
+
+#define RLEFT (sizeof result) - (rptr - result)
+#define STR_SIZE(x) (sizeof (x) - 1)
+
+ zone[0] = 0;
+
+ if (procheader_date_parse_to_tm(msginfo->date, <, zone)) {
+ /*
+ * break up format string in tiny bits delimited by valid %z's and
+ * feed it to strftime(). don't forget that '%%z' mean literal '%z'.
+ */
+ for (rptr = result, fptr = $3; fptr && *fptr && rptr < &result[sizeof result - 1];) {
+ int perc;
+ const char *p;
+ char *tmp;
+
+ if (NULL != (zptr = strstr(fptr, "%z"))) {
+ /*
+ * count nr. of prepended percent chars
+ */
+ for (perc = 0, p = zptr; p && p >= $3 && *p == '%'; p--, perc++)
+ ;
+ /*
+ * feed to strftime()
+ */
+ tmp = g_strndup(fptr, zptr - fptr + (perc % 2 ? 0 : STR_SIZE("%z")));
+ if (tmp) {
+ rptr += strftime(rptr, RLEFT, tmp, <);
+ g_free(tmp);
+ }
+ /*
+ * append time zone offset
+ */
+ if (zone[0] && perc % 2)
+ rptr += g_snprintf(rptr, RLEFT, "%s", zone);
+ fptr = zptr + STR_SIZE("%z");
+ } else {
+ rptr += strftime(rptr, RLEFT, fptr, <);
+ fptr = NULL;
+ }
+ }
+
+ INSERT(result);
}
+#undef STR_SIZE
+#undef RLEFT
}
}
| SHOW_DATE
| SHOW_FIRST_NAME
{
if (msginfo->fromname) {
- gchar *p;
+ guchar *p;
gchar *str;
- str = alloca(strlen(msginfo->fromname) + 1);
- if (str != NULL) {
- strcpy(str, msginfo->fromname);
- p = str;
- while (*p && !isspace(*p)) p++;
- *p = '\0';
- INSERT(str);
+ p = strchr(msginfo->fromname, ',');
+ if (p != NULL) {
+ /* fromname is like "Duck, Donald" */
+ p++;
+ while (*p && isspace(*p)) p++;
+ str = alloca(strlen(p) + 1);
+ if (str != NULL) {
+ strcpy(str, p);
+ INSERT(str);
+ }
+ } else {
+ /* fromname is like "Donald Duck" */
+ str = alloca(strlen(msginfo->fromname) + 1);
+ if (str != NULL) {
+ strcpy(str, msginfo->fromname);
+ p = str;
+ while (*p && !isspace(*p)) p++;
+ *p = '\0';
+ INSERT(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. */
+ p = strchr(str, ',');
+ if (p != NULL) {
+ /* fromname is like "Duck, Donald" */
+ *p = '\0';
INSERT(str);
- }
} else {
- /* If there is no space, just insert whole fromname. */
- INSERT(str);
+ /* fromname is like "Donald Duck" */
+ 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);
+ }
}
}
}
#define MAX_SENDER_INITIAL 20
if (msginfo->fromname) {
gchar tmp[MAX_SENDER_INITIAL];
- gchar *p;
+ guchar *p;
gchar *cur;
gint len = 0;
}
| SHOW_MESSAGE
{
- if (msginfo->folder) {
+ if (msginfo->folder || body) {
gchar buf[BUFFSIZE];
FILE *fp;
fp = procmime_get_first_text_content(msginfo);
if (fp == NULL)
- g_warning(_("Can't get text part\n"));
+ g_warning("Can't get text part\n");
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
}
| SHOW_QUOTED_MESSAGE
{
- if (msginfo->folder) {
+ if (msginfo->folder || body) {
gchar buf[BUFFSIZE];
FILE *fp;
fp = procmime_get_first_text_content(msginfo);
if (fp == NULL)
- g_warning(_("Can't get text part\n"));
+ g_warning("Can't get text part\n");
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
}
| SHOW_MESSAGE_NO_SIGNATURE
{
- if (msginfo->folder) {
+ if (msginfo->folder || body) {
gchar buf[BUFFSIZE];
FILE *fp;
fp = procmime_get_first_text_content(msginfo);
if (fp == NULL)
- g_warning(_("Can't get text part\n"));
+ g_warning("Can't get text part\n");
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
- if (strncmp(buf, "-- ", 3) == 0)
+ if (strncmp(buf, "-- \n", 4) == 0)
break;
INSERT(buf);
}
}
| SHOW_QUOTED_MESSAGE_NO_SIGNATURE
{
- if (msginfo->folder) {
+ if (msginfo->folder || body) {
gchar buf[BUFFSIZE];
FILE *fp;
fp = procmime_get_first_text_content(msginfo);
if (fp == NULL)
- g_warning(_("Can't get text part\n"));
+ g_warning("Can't get text part\n");
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
- if (strncmp(buf, "-- ", 3) == 0)
+ if (strncmp(buf, "-- \n", 4) == 0)
break;
if (quote_str)
INSERT(quote_str);
| SHOW_CPARENT
{
INSERT("}");
+ }
+ | SET_CURSOR_POS
+ {
+ cursor_pos = bufsize;
};
query:
FILE *file;
char buffer[256];
- if(file = fopen($3, "rb")) {
+ if((file = fopen($3, "rb")) != NULL) {
while(fgets(buffer, sizeof(buffer), file)) {
INSERT(buffer);
}
FILE *file;
char buffer[256];
- if(file = popen($3, "r")) {
+ if((file = popen($3, "r")) != NULL) {
while(fgets(buffer, sizeof(buffer), file)) {
INSERT(buffer);
}
projects / claws.git / blobdiff