*
* 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
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
%{
#include <glib/gi18n.h>
#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include "procmsg.h"
#include "procmime.h"
#include "quote_fmt.h"
#include "quote_fmt_lex.h"
+#include "account.h"
+#include "file-utils.h"
/* decl */
/*
static MsgInfo *msginfo = NULL;
static PrefsAccount *account = NULL;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
static gchar default_dictionary[BUFFSIZE];
#endif
static gboolean *visible = NULL;
static gint maxsize = 0;
static gint stacksize = 0;
static GHashTable *var_table = NULL;
+static GList *attachments = NULL;
typedef struct st_buffer
{
extern int quote_fmt_firsttime;
extern int line;
+extern int escaped_string;
static void add_visibility(gboolean val)
{
if (visible == NULL)
maxsize = 0;
}
-
- visible[stacksize - 1] = val;
+ if (visible != NULL)
+ visible[stacksize - 1] = val;
}
static void remove_visibility(void)
{
stacksize--;
if (stacksize < 0) {
- g_warning("Error: visibility stack underflow\n");
+ g_warning("Error: visibility stack underflow");
stacksize = 0;
}
}
gchar *quote_fmt_get_buffer(void)
{
if (current != &main_expr)
- g_warning("Error: parser still in sub-expr mode\n");
+ g_warning("Error: parser still in sub-expr mode");
if (error != 0)
return NULL;
return current->buffer;
}
+GList *quote_fmt_get_attachments_list(void)
+{
+ return attachments;
+}
+
+gint quote_fmt_get_line(void)
+{
+ return line;
+}
+
gint quote_fmt_get_cursor_pos(void)
{
return cursor_pos;
g_hash_table_destroy(var_table);
var_table = NULL;
}
+ if (attachments) {
+ GList *cur = attachments;
+ while (cur) {
+ g_free(cur->data);
+ cur = g_list_next(cur);
+ }
+ g_list_free(attachments);
+ attachments = NULL;
+ }
}
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str,
const gchar *my_body, gboolean my_dry_run,
- PrefsAccount *account,
- GtkAspell *gtkaspell);
+ PrefsAccount *compose_account,
+ gboolean string_is_escaped,
+ GtkAspell *compose_gtkaspell)
#else
void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str,
const gchar *my_body, gboolean my_dry_run,
- PrefsAccount *compose_account)
+ PrefsAccount *compose_account,
+ gboolean string_is_escaped)
#endif
{
quote_str = my_quote_str;
body = my_body;
msginfo = info;
account = compose_account;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
gchar *dict = gtkaspell_get_default_dictionary(compose_gtkaspell);
if (dict)
strncpy2(default_dictionary, dict, sizeof(default_dictionary));
clear_buffer();
error = 0;
line = 1;
+ escaped_string = string_is_escaped;
if (!var_table)
var_table = g_hash_table_new_full(g_str_hash, g_str_equal,
void quote_fmterror(char *str)
{
- g_warning("Error: %s at line %d\n", str, line);
+ g_warning("Error: %s at line %d", str, line);
error = 1;
}
return g_ascii_isspace(ch) || ch == '.' || ch == '-';
}
+/*
+ * Search for glibc extended strftime timezone specs within haystack.
+ * If not found NULL is returned and the integer pointed by tzspeclen is
+ * not changed.
+ * If found a pointer to the start of the specification within haystack
+ * is returned and the integer pointed by tzspeclen is set to the lenght
+ * of specification.
+ */
+static const char* strtzspec(const char *haystack, int *tzspeclen)
+{
+ const char *p = NULL;
+ const char *q = NULL;
+ const char *r = NULL;
+
+ p = strstr(haystack, "%");
+ while (p != NULL) {
+ q = p + 1;
+ if (!*q) return NULL;
+ r = strchr("_-0^#", *q); /* skip flags */
+ if (r != NULL) {
+ ++q;
+ if (!*q) return NULL;
+ }
+ while (*q >= '0' && *q <= '9') ++q; /* skip width */
+ if (!*q) return NULL;
+ if (*q == 'z' || *q == 'Z') { /* numeric or name */
+ *tzspeclen = 1 + (q - p);
+ return p;
+ }
+ p = strstr(q, "%");
+ }
+ return NULL;
+}
+
static void quote_fmt_show_date(const MsgInfo *msginfo, const gchar *format)
{
char result[100];
*/
#define RLEFT (sizeof result) - (rptr - result)
-#define STR_SIZE(x) (sizeof (x) - 1)
zone[0] = 0;
* feed it to strftime(). don't forget that '%%z' mean literal '%z'.
*/
for (rptr = result, fptr = format; fptr && *fptr && rptr < &result[sizeof result - 1];) {
- int perc;
+ int perc, zlen;
const char *p;
char *tmp;
- if (NULL != (zptr = strstr(fptr, "%z"))) {
+ if (NULL != (zptr = strtzspec(fptr, &zlen))) {
/*
* count nr. of prepended percent chars
*/
/*
* feed to strftime()
*/
- tmp = g_strndup(fptr, zptr - fptr + (perc % 2 ? 0 : STR_SIZE("%z")));
+ tmp = g_strndup(fptr, zptr - fptr + (perc % 2 ? 0 : zlen));
if (tmp) {
rptr += strftime(rptr, RLEFT, tmp, <);
g_free(tmp);
*/
if (zone[0] && perc % 2)
rptr += g_snprintf(rptr, RLEFT, "%s", zone);
- fptr = zptr + STR_SIZE("%z");
+ fptr = zptr + zlen;
} else {
rptr += strftime(rptr, RLEFT, fptr, <);
fptr = NULL;
g_free(utf);
}
}
-#undef STR_SIZE
#undef RLEFT
}
if (body)
fp = str_open_as_stream(body);
else {
- if (procmime_msginfo_is_encrypted(msginfo))
+ if (MSG_IS_ENCRYPTED(msginfo->flags))
fp = procmime_get_first_encrypted_text_content(msginfo);
else
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");
else {
+ account_sigsep_matchlist_create();
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
-
- if (!signature && strncmp(buf, "-- \n", 4) == 0)
+
+ if (!signature && account_sigsep_matchlist_nchar_found(buf, "%s\n"))
break;
if (quoted && quote_str)
INSERT(buf);
}
+ account_sigsep_matchlist_delete();
fclose(fp);
}
}
static void quote_fmt_insert_file(const gchar *filename)
{
FILE *file;
- char buffer[256];
+ char buffer[PATH_MAX];
if ((file = g_fopen(filename, "rb")) != NULL) {
while (fgets(buffer, sizeof(buffer), file)) {
static void quote_fmt_insert_program_output(const gchar *progname)
{
- FILE *file;
- char buffer[256];
-
- if ((file = popen(progname, "r")) != NULL) {
- while (fgets(buffer, sizeof(buffer), file)) {
- INSERT(buffer);
- }
- pclose(file);
+ int pipefd[2];
+ pid_t pid;
+
+ GError *error;
+ gint argc;
+ gchar **argv;
+ gboolean ret;
+
+ /* turn the command-line string into an array */
+ argv = NULL;
+ argc = 0;
+ error = NULL;
+ ret = g_shell_parse_argv (progname, &argc, &argv, &error);
+ if (!ret) {
+ g_error("could not parse command line from '%s'", progname);
+ return;
+ }
+
+ if (pipe(pipefd) == -1) {
+ g_error("can't pipe - error %s", g_strerror(errno));
+ return;
}
+
+ if (0 == (pid = fork())) {
+ /*
+ * redirect output to write end of pipe
+ */
+ close(pipefd[0]);
+ dup2(pipefd[1], STDOUT_FILENO);
+ if (-1 == execvp(argv[0], argv))
+ perror("execvp");
+ } else {
+ char buffer[BUFFSIZE];
+ int r;
+
+ waitpid(pid, NULL, 0);
+
+ g_strfreev (argv);
+
+ /*
+ * make it non blocking
+ */
+ if (-1 == fcntl(pipefd[0], F_SETFL, fcntl(pipefd[0], F_GETFL) | O_NONBLOCK))
+ g_warning("set to non blocking failed");
+
+ /*
+ * get the output
+ */
+ do {
+ r = read(pipefd[0], buffer, sizeof buffer - 1);
+ if (r > 0) {
+ buffer[r] = 0;
+ INSERT(buffer);
+ }
+ } while (r > 0);
+
+ close(pipefd[0]);
+ close(pipefd[1]);
+ }
}
static void quote_fmt_insert_user_input(const gchar *varname)
g_free(text);
}
+static void quote_fmt_attach_file(const gchar *filename)
+{
+ attachments = g_list_append(attachments, g_strdup(filename));
+}
+
+static void quote_fmt_attach_file_program_output(const gchar *progname)
+{
+ int pipefd[2];
+ pid_t pid;
+
+ GError *error;
+ gint argc;
+ gchar **argv;
+ gboolean ret;
+
+ /* turn the command-line string into an array */
+ argv = NULL;
+ argc = 0;
+ error = NULL;
+ ret = g_shell_parse_argv (progname, &argc, &argv, &error);
+ if (!ret) {
+ g_error("could not parse command line from '%s'", progname);
+ return;
+ }
+
+ if (pipe(pipefd) == -1) {
+ g_error("can't pipe - error %s", g_strerror(errno));
+ return;
+ }
+
+ if (0 == (pid = fork())) {
+ /*
+ * redirect output to write end of pipe
+ */
+ close(pipefd[0]);
+ dup2(pipefd[1], STDOUT_FILENO);
+ if (-1 == execvp(argv[0], argv))
+ perror("execvp");
+ } else {
+ char buffer[BUFFSIZE];
+ int r;
+
+ waitpid(pid, NULL, 0);
+
+ g_strfreev (argv);
+
+ /*
+ * make it non blocking
+ */
+ if (-1 == fcntl(pipefd[0], F_SETFL, fcntl(pipefd[0], F_GETFL) | O_NONBLOCK))
+ g_warning("set to non blocking failed");
+
+ /*
+ * get the output
+ */
+ do {
+ r = read(pipefd[0], buffer, sizeof buffer - 1);
+ if (r > 0) {
+ buffer[r] = 0;
+ /* trim trailing CR/LF */
+ strretchomp(buffer);
+ attachments = g_list_append(attachments, g_strdup(buffer));
+ }
+ } while (r > 0);
+
+ close(pipefd[0]);
+ close(pipefd[1]);
+ }
+}
+
static gchar *quote_fmt_complete_address(const gchar *addr)
{
gint count;
%token SHOW_QUOTED_MESSAGE_NO_SIGNATURE SHOW_MESSAGE_NO_SIGNATURE
%token SHOW_EOL SHOW_QUESTION_MARK SHOW_EXCLAMATION_MARK SHOW_PIPE SHOW_OPARENT SHOW_CPARENT
%token SHOW_ACCOUNT_FULL_NAME SHOW_ACCOUNT_MAIL_ADDRESS SHOW_ACCOUNT_NAME SHOW_ACCOUNT_ORGANIZATION
-%token SHOW_ACCOUNT_DICT
-%token SHOW_DICT
+%token SHOW_ACCOUNT_DICT SHOW_ACCOUNT_SIG SHOW_ACCOUNT_SIGPATH
+%token SHOW_DICT SHOW_TAGS
%token SHOW_ADDRESSBOOK_COMPLETION_FOR_CC
%token SHOW_ADDRESSBOOK_COMPLETION_FOR_FROM
%token SHOW_ADDRESSBOOK_COMPLETION_FOR_TO
%token QUERY_FULLNAME QUERY_SUBJECT QUERY_TO QUERY_NEWSGROUPS
%token QUERY_MESSAGEID QUERY_CC QUERY_REFERENCES
%token QUERY_ACCOUNT_FULL_NAME QUERY_ACCOUNT_ORGANIZATION QUERY_ACCOUNT_DICT
+%token QUERY_ACCOUNT_SIG QUERY_ACCOUNT_SIGPATH
%token QUERY_DICT
%token QUERY_CC_FOUND_IN_ADDRESSBOOK
%token QUERY_FROM_FOUND_IN_ADDRESSBOOK
%token QUERY_NOT_FULLNAME QUERY_NOT_SUBJECT QUERY_NOT_TO QUERY_NOT_NEWSGROUPS
%token QUERY_NOT_MESSAGEID QUERY_NOT_CC QUERY_NOT_REFERENCES
%token QUERY_NOT_ACCOUNT_FULL_NAME QUERY_NOT_ACCOUNT_ORGANIZATION QUERY_NOT_ACCOUNT_DICT
+%token QUERY_NOT_ACCOUNT_SIG QUERY_NOT_ACCOUNT_SIGPATH
%token QUERY_NOT_DICT
%token QUERY_NOT_CC_FOUND_IN_ADDRESSBOOK
%token QUERY_NOT_FROM_FOUND_IN_ADDRESSBOOK
%token QUERY_NOT_TO_FOUND_IN_ADDRESSBOOK
/* other tokens */
%token INSERT_FILE INSERT_PROGRAMOUTPUT INSERT_USERINPUT
+%token ATTACH_FILE ATTACH_PROGRAMOUTPUT
%token OPARENT CPARENT
%token CHARACTER
%token SHOW_DATE_EXPR
%start quote_fmt
-%token <chr> CHARACTER
+%type <chr> CHARACTER
%type <chr> character
%type <str> string
character_or_special
| query
| query_not
- | insert ;
+ | insert
+ | attach ;
character_or_special:
special
}
| string CHARACTER
{
- int len;
+ size_t len;
strncpy($$, $1, sizeof($$));
$$[sizeof($$) - 1] = '\0';
if (account && account->organization)
INSERT(account->organization);
}
+ | SHOW_ACCOUNT_SIG
+ {
+ gchar *str = account_get_signature_str(account);
+ INSERT(str);
+ g_free(str);
+ }
+ | SHOW_ACCOUNT_SIGPATH
+ {
+ if (account && account->sig_path)
+ INSERT(account->sig_path);
+ }
| SHOW_ACCOUNT_DICT
{
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
if (account && account->enable_default_dictionary) {
gchar *dictname = g_path_get_basename(account->default_dictionary);
INSERT(dictname);
}
| SHOW_DICT
{
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
INSERT(default_dictionary);
#endif
}
+ | SHOW_TAGS
+ {
+ gchar *tags = procmsg_msginfo_get_tags_str(msginfo);
+ if (tags) {
+ INSERT(tags);
+ }
+ g_free(tags);
+ }
| SHOW_BACKSLASH
{
INSERT("\\");
}
| SET_CURSOR_POS
{
- cursor_pos = current->bufsize;
+ if (current->buffer)
+ cursor_pos = g_utf8_strlen(current->buffer, -1);
+ else
+ cursor_pos = 0;
}
| SHOW_ADDRESSBOOK_COMPLETION_FOR_CC
{
{
remove_visibility();
}
+ | QUERY_ACCOUNT_SIG
+ {
+ gchar *str = account_get_signature_str(account);
+ add_visibility(str != NULL && * str != '\0');
+ g_free(str);
+ }
+ OPARENT quote_fmt CPARENT
+ {
+ remove_visibility();
+ }
+ | QUERY_ACCOUNT_SIGPATH
+ {
+ add_visibility(account != NULL && account->sig_path != NULL
+ && *account->sig_path != '\0');
+ }
+ OPARENT quote_fmt CPARENT
+ {
+ remove_visibility();
+ }
| QUERY_ACCOUNT_DICT
{
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
add_visibility(account != NULL && account->enable_default_dictionary == TRUE &&
account->default_dictionary != NULL && *account->default_dictionary != '\0');
#else
}
| QUERY_DICT
{
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
add_visibility(*default_dictionary != '\0');
#else
add_visibility(FALSE);
{
remove_visibility();
}
+ | QUERY_NOT_ACCOUNT_SIG
+ {
+ gchar *str = account_get_signature_str(account);
+ add_visibility(str == NULL || *str == '\0');
+ g_free(str);
+ }
+ OPARENT quote_fmt CPARENT
+ {
+ remove_visibility();
+ }
+ | QUERY_NOT_ACCOUNT_SIGPATH
+ {
+ add_visibility(account == NULL || account->sig_path == NULL
+ || *account->sig_path == '\0');
+ }
+ OPARENT quote_fmt CPARENT
+ {
+ remove_visibility();
+ }
| QUERY_NOT_ACCOUNT_DICT
{
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
add_visibility(account == NULL || account->enable_default_dictionary == FALSE
|| *account->default_dictionary == '\0');
#else
}
| QUERY_NOT_DICT
{
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
add_visibility(*default_dictionary == '\0');
#else
add_visibility(FALSE);
quote_fmt_insert_user_input(sub_expr.buffer);
}
};
+
+attach:
+ ATTACH_FILE
+ {
+ current = &sub_expr;
+ clear_buffer();
+ }
+ OPARENT sub_expr CPARENT
+ {
+ current = &main_expr;
+ if (!dry_run) {
+ quote_fmt_attach_file(sub_expr.buffer);
+ }
+ }
+ | ATTACH_PROGRAMOUTPUT
+ {
+ current = &sub_expr;
+ clear_buffer();
+ }
+ OPARENT sub_expr CPARENT
+ {
+ current = &main_expr;
+ if (!dry_run) {
+ quote_fmt_attach_file_program_output(sub_expr.buffer);
+ }
+ };
+;
projects / claws.git / blobdiff