* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <unistd.h>
#include <utime.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/file.h>
-#include <lib-lib/url.h>
-
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-sys/unix.h>
+
#include "alias.h"
#include "mutt.h"
#include "mx.h"
envelope_delete(extra);
}
-void _mutt_mktemp (char *s, const char *src, int line)
+void mutt_mktemp (char *s)
{
snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir),
}
}
-void mutt_expand_file_fmt (char *dest, ssize_t destlen, const char *fmt,
- const char *src)
+void mutt_expand_file_fmt(char *dest, ssize_t destlen,
+ const char *fmt, const char *src)
{
- char tmp[LONG_STRING];
+ char tmp[LONG_STRING];
- mutt_quote_filename (tmp, sizeof (tmp), src);
- mutt_expand_fmt (dest, destlen, fmt, tmp);
+ mutt_quote_filename(tmp, sizeof(tmp), src);
+ mutt_expand_fmt(dest, destlen, fmt, tmp);
}
-void mutt_expand_fmt (char *dest, ssize_t destlen, const char *fmt,
- const char *src)
+void mutt_expand_fmt(char *dst, ssize_t dlen,
+ const char *fmt, const char *src)
{
- const char *p;
- char *d;
- ssize_t slen;
- int found = 0;
-
- slen = m_strlen(src);
- destlen--;
-
- for (p = fmt, d = dest; destlen && *p; p++) {
- if (*p == '%') {
- switch (p[1]) {
- case '%':
- *d++ = *p++;
- destlen--;
- break;
- case 's':
- found = 1;
- m_strcpy(d, destlen + 1, src);
- d += destlen > slen ? slen : destlen;
- destlen -= destlen > slen ? slen : destlen;
- p++;
- break;
- default:
- *d++ = *p;
- destlen--;
- break;
- }
- }
- else {
- *d++ = *p;
- destlen--;
+ ssize_t pos = 0;
+ int found = 0;
+
+ while (*fmt && pos < dlen - 1) {
+ if (*fmt == '%') {
+ switch (*++fmt) {
+ case 's':
+ found = 1;
+ pos += m_strcpy(dst + pos, dlen - pos, src);
+ break;
+
+ case '%':
+ dst[pos++] = *fmt++;
+ break;
+
+ default:
+ dst[pos++] = '%';
+ break;
+ }
+ } else {
+ dst[pos++] = *fmt++;
+ }
}
- }
-
- *d = '\0';
-
- if (!found && destlen > 0) {
- m_strcat(dest, destlen, " ");
- m_strcat(dest, destlen, src);
- }
+ dst[pos] = '\0';
+ if (!found) {
+ pos += m_strcpy(dst + pos, dlen - pos, " ");
+ pos += m_strcpy(dst + pos, dlen - pos, src);
+ }
}
/* return 0 on success, -1 on abort, 1 on error */
return 0;
}
-void mutt_save_path (char *d, ssize_t dsize, address_t * a)
+void mutt_save_path(char *d, ssize_t dsize, address_t *a)
{
- if (a && a->mailbox) {
- m_strcpy(d, dsize, a->mailbox);
- if (!option (OPTSAVEADDRESS)) {
- char *p;
+ if (a && a->mailbox) {
+ m_strcpy(d, dsize, a->mailbox);
- if ((p = strpbrk (d, "%@")))
- *p = 0;
+ if (!option(OPTSAVEADDRESS)) {
+ char *p = strpbrk(d, "%@");
+ if (p)
+ *p = '\0';
+ }
+ m_strtolower(d);
+ } else {
+ *d = '\0';
}
- m_strtolower(d);
- }
- else
- *d = 0;
}
-void mutt_safe_path (char *s, ssize_t l, address_t * a)
+void mutt_safe_path(char *s, ssize_t l, address_t *a)
{
- char *p;
+ mutt_save_path(s, l, a);
- mutt_save_path (s, l, a);
- for (p = s; *p; p++)
- if (*p == '/' || ISSPACE (*p) || !IsPrint ((unsigned char) *p))
- *p = '_';
-}
-
-/* counts how many characters in s can be skipped while none of the
- * characters of c appears */
-int mutt_skipchars (const char *s, const char *c)
-{
- int ret = 0;
- const char *p = s;
-
- while (s && *s) {
- register const char *t = c;
-
- while (t && *t) {
- if (*t == *s)
- return (ret);
- t++;
+ while (*s) {
+ if (*s == '/' || ISSPACE(*s) || !isprint((unsigned char)*s))
+ *s = '_';
+ s++;
}
- ret++;
- s++;
- }
- return (m_strlen(p));
}
void mutt_FormatString (char *dest, /* output buffer */
col++;
}
else {
- unsigned int bar = mutt_skipchars (src, "%\\");
+ unsigned int bar = strcspn(src, "%\\");
char *bar2 = p_dupstr(src, bar);
while (bar--) {
/* Make sure that the string is printable by changing all non-printable
chars to dots, or spaces for non-printable whitespace */
for (cp = dest; *cp; cp++)
- if (!IsPrint (*cp) && !((flags & M_FORMAT_TREE) && (*cp <= M_TREE_MAX)))
+ if (!isprint(*cp) && !((flags & M_FORMAT_TREE) && (*cp <= M_TREE_MAX)))
*cp = isspace ((unsigned char) *cp) ? ' ' : '.';
}
#endif
}
-/* This function allows the user to specify a command to read stdout from in
- place of a normal file. If the last character in the string is a pipe (|),
- then we assume it is a commmand to run instead of a normal file. */
-FILE *mutt_open_read (const char *path, pid_t * thepid)
-{
- int len = m_strlen(path);
- FILE *f;
-
- if (path[len - 1] == '|') {
- char *s = m_strdup(path);
-
- /* read from a pipe */
-
- s[len - 1] = 0;
- mutt_endwin (NULL);
- *thepid = mutt_create_filter (s, NULL, &f, NULL);
- p_delete(&s);
- } else {
- f = fopen (path, "r");
- if (!f)
- return NULL;
- *thepid = -1;
- }
-
- return (f);
-}
-
/* returns 0 if OK to proceed, -1 to abort, 1 to retry */
int mutt_save_confirm (const char *s, struct stat *st)
{
return (ret);
}
-void mutt_display_sanitize (char *s)
-{
- for (; *s; s++) {
- if (!IsPrint (*s))
- *s = '?';
- }
-}
-
void mutt_sleep (short s)
{
- if (SleepTime > s)
- sleep (SleepTime);
- else if (s)
- sleep (s);
+ sleep(MAX(s, SleepTime));
}
/* Decrease a file's modification time by 1 second */
return (0);
return (1);
}
+
+int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
+{
+ char ch;
+ char qc = 0; /* quote char */
+ char *pc;
+
+ /* reset the destination pointer to the beginning of the buffer */
+ dest->dptr = dest->data;
+
+ tok->dptr = vskipspaces(tok->dptr);
+ while ((ch = *tok->dptr)) {
+ if (!qc) {
+ if ((ISSPACE(ch) && !(flags & M_TOKEN_SPACE))
+ || (ch == '#' && !(flags & M_TOKEN_COMMENT))
+ || (ch == '=' && (flags & M_TOKEN_EQUAL))
+ || (ch == ';' && !(flags & M_TOKEN_SEMICOLON))
+ || ((flags & M_TOKEN_PATTERN) && strchr("~=!|", ch)))
+ {
+ break;
+ }
+ }
+
+ tok->dptr++;
+
+ if (ch == qc) {
+ qc = 0; /* end of quote */
+ } else
+ if (!qc && (ch == '\'' || ch == '"') && !(flags & M_TOKEN_QUOTE)) {
+ qc = ch;
+ } else
+ if (ch == '\\' && qc != '\'') {
+ if (!*tok->dptr)
+ return -1; /* premature end of token */
+
+ switch (ch = *tok->dptr++) {
+ case 'c':
+ case 'C':
+ if (!*tok->dptr)
+ return -1; /* premature end of token */
+ mutt_buffer_addch(dest,
+ (ascii_toupper(*tok->dptr) - 'A' + 1) & 0x7f);
+ tok->dptr++;
+ break;
+ case 'r':
+ mutt_buffer_addch(dest, '\r');
+ break;
+ case 'n':
+ mutt_buffer_addch(dest, '\n');
+ break;
+ case 't':
+ mutt_buffer_addch(dest, '\t');
+ break;
+ case 'f':
+ mutt_buffer_addch(dest, '\f');
+ break;
+ case 'e':
+ mutt_buffer_addch(dest, '\033');
+ break;
+ default:
+ if (isdigit((unsigned char)ch)
+ && isdigit((unsigned char)*tok->dptr)
+ && isdigit((unsigned char)*(tok->dptr + 1)))
+ {
+ mutt_buffer_addch(dest, (ch << 6) + (*tok->dptr << 3) +
+ *(tok->dptr + 1) - 3504);
+ tok->dptr += 2;
+ } else {
+ mutt_buffer_addch(dest, ch);
+ }
+ }
+ } else
+ if (ch == '^' && (flags & M_TOKEN_CONDENSE)) {
+ if (!*tok->dptr)
+ return -1; /* premature end of token */
+ ch = *tok->dptr++;
+ if (ch == '^') {
+ mutt_buffer_addch(dest, ch);
+ } else
+ if (ch == '[') {
+ mutt_buffer_addch(dest, '\033');
+ } else
+ if (isalpha((unsigned char)ch)) {
+ mutt_buffer_addch(dest, ascii_toupper(ch) - 'A' + 1);
+ } else {
+ mutt_buffer_addch(dest, '^');
+ mutt_buffer_addch(dest, ch);
+ }
+ } else
+ if (ch == '`' && (!qc || qc == '"')) {
+ FILE *fp;
+ pid_t pid;
+ char *cmd, *ptr;
+ ssize_t expnlen;
+ BUFFER expn;
+ int line = 0;
+
+ pc = tok->dptr;
+ do {
+ if ((pc = strpbrk(pc, "\\`"))) {
+ /* skip any quoted chars */
+ if (*pc == '\\')
+ pc += 2;
+ }
+ } while (pc && *pc != '`');
+ if (!pc) {
+ return (-1);
+ }
+
+ cmd = p_dupstr(tok->dptr, pc - tok->dptr);
+ if ((pid = mutt_create_filter(cmd, NULL, &fp, NULL)) < 0) {
+ p_delete(&cmd);
+ return -1;
+ }
+ p_delete(&cmd);
+
+ tok->dptr = pc + 1;
+
+ /* read line */
+ p_clear(&expn, 1);
+ expn.data = mutt_read_line(NULL, &expn.dsize, fp, &line);
+ fclose(fp);
+ mutt_wait_filter(pid);
+
+ /* if we got output, make a new string consiting of the shell ouptput
+ plus whatever else was left on the original line */
+ /* BUT: If this is inside a quoted string, directly add output to
+ * the token */
+ if (expn.data && qc) {
+ mutt_buffer_addstr(dest, expn.data);
+ p_delete(&expn.data);
+ } else
+ if (expn.data) {
+ expnlen = m_strlen(expn.data);
+ tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
+ ptr = xmalloc(tok->dsize);
+ memcpy(ptr, expn.data, expnlen);
+ strcpy(ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
+ if (tok->destroy)
+ p_delete(&tok->data);
+ tok->data = ptr;
+ tok->dptr = ptr;
+ tok->destroy = 1; /* mark that the caller should destroy this data */
+ ptr = NULL;
+ p_delete(&expn.data);
+ }
+ } else
+ if (ch == '$' && (!qc || qc == '"')
+ && (*tok->dptr == '{' || isalpha((unsigned char)*tok->dptr)))
+ {
+ char *env = NULL, *var = NULL;
+
+ if (*tok->dptr == '{') {
+ tok->dptr++;
+ if ((pc = strchr (tok->dptr, '}'))) {
+ var = p_dupstr(tok->dptr, pc - tok->dptr);
+ tok->dptr = pc + 1;
+ }
+ } else {
+ for (pc = tok->dptr; isalnum((unsigned char)*pc) || *pc == '_';
+ pc++);
+ var = p_dupstr(tok->dptr, pc - tok->dptr);
+ tok->dptr = pc;
+ }
+ if (var) {
+ char tmp[STRING];
+ if ((env = getenv (var))
+ || (mutt_option_value (var, tmp, sizeof (tmp)) && (env = tmp)))
+ {
+ mutt_buffer_addstr (dest, env);
+ }
+ }
+ p_delete(&var);
+ } else {
+ mutt_buffer_addch(dest, ch);
+ }
+ }
+ mutt_buffer_addch(dest, 0); /* terminate the string */
+ tok->dptr = vskipspaces(tok->dptr);
+ return 0;
+}