#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 */
/*
{
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;
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 (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)
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 QUERY_NOT_TO_FOUND_IN_ADDRESSBOOK
/* other tokens */
%token INSERT_FILE INSERT_PROGRAMOUTPUT INSERT_USERINPUT
-%token ATTACH_FILE
+%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
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