# include "config.h"
#endif
-#include <string.h>
#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/wait.h>
#include <errno.h>
-#include <sys/stat.h>
#include <fcntl.h>
-#include <time.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/macros.h>
#include <lib-lib/buffer.h>
#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/url.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include "alias.h"
#include "mutt.h"
#include "mx.h"
-#include "url.h"
#include "attach.h"
#include "version.h"
* Renamed to mutt_adv_mktemp so I only have to change where it's
* called, and not all possible cases.
*/
-void mutt_adv_mktemp (const char* dir, char *s, size_t l)
+void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
{
char buf[_POSIX_PATH_MAX];
char tmp[_POSIX_PATH_MAX];
char *period;
- size_t sl;
+ ssize_t sl;
struct stat sb;
m_strcpy(buf, sizeof(buf), m_strisempty(dir) ? NONULL(Tempdir) : dir);
a = a->next;
if (b->parameter)
- parameter_delete(&b->parameter);
+ parameter_list_wipe(&b->parameter);
if (b->unlink && b->filename) {
- debug_print (1, ("unlinking %s.\n", b->filename));
unlink (b->filename);
}
- else if (b->filename)
- debug_print (1, ("not unlinking %s.\n", b->filename));
p_delete(&b->filename);
p_delete(&b->content);
}
/* returns true if the header contained in "s" is in list "t" */
-int mutt_matches_ignore (const char *s, LIST * t)
+int mutt_matches_ignore (const char *s, string_list_t * t)
{
for (; t; t = t->next) {
if (!ascii_strncasecmp (s, t->data, m_strlen(t->data))
void mutt_expand_link (char *newpath, const char *path, const char *lnk)
{
const char *lb = NULL;
- size_t len;
+ ssize_t len;
/* lnk is full path */
if (*lnk == '/') {
m_strcpy(newpath + len, _POSIX_PATH_MAX - len, lnk);
}
-char *mutt_expand_path (char *s, size_t slen)
+char *mutt_expand_path (char *s, ssize_t slen)
{
return _mutt_expand_path (s, slen, 0);
}
-char *_mutt_expand_path (char *s, size_t slen, int rx)
+char *_mutt_expand_path (char *s, ssize_t slen, int rx)
{
char p[_POSIX_PATH_MAX] = "";
char q[_POSIX_PATH_MAX] = "";
case '@':
{
HEADER *h;
+ /* FIXME: BUG ? */
address_t *alias;
- if ((alias = mutt_lookup_alias (s + 1))) {
+ if ((alias = alias_lookup(s + 1))) {
h = header_new();
h->env = envelope_new();
h->env->from = h->env->to = alias;
return (s);
}
-/* Extract the real name from /etc/passwd's GECOS field.
- * When set, honor the regular expression in GecosMask,
- * otherwise assume that the GECOS field is a
- * comma-separated list.
- * Replace "&" by a capitalized version of the user's login
- * name.
- */
-
-char *mutt_gecos_name (char *dest, ssize_t destlen, struct passwd *pw)
-{
- regmatch_t pat_match[1];
- ssize_t pwnl;
- int idx;
- char *p;
-
- if (!pw || !pw->pw_gecos)
- return NULL;
-
- p_clear(dest, destlen);
-
- if (GecosMask.rx) {
- if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
- m_strcpy(dest, MIN(pat_match[0].rm_eo - pat_match[0].rm_so + 1, destlen),
- pw->pw_gecos + pat_match[0].rm_so);
- }
- else if ((p = strchr (pw->pw_gecos, ',')))
- m_strcpy(dest, MIN(destlen, p - pw->pw_gecos + 1), pw->pw_gecos);
- else
- m_strcpy(dest, destlen, pw->pw_gecos);
-
- pwnl = m_strlen(pw->pw_name);
-
- for (idx = 0; dest[idx]; idx++) {
- if (dest[idx] == '&') {
- memmove (&dest[idx + pwnl], &dest[idx + 1],
- MAX (destlen - idx - pwnl - 1, 0));
- memcpy (&dest[idx], pw->pw_name, MIN (destlen - idx - 1, pwnl));
- dest[idx] = toupper ((unsigned char) dest[idx]);
- }
- }
-
- return dest;
-}
-
-
char *mutt_get_parameter (const char *s, PARAMETER * p)
{
for (; p; p = p->next)
if (ascii_strcasecmp (attribute, q->attribute) == 0) {
*p = q->next;
q->next = NULL;
- parameter_delete(&q);
+ parameter_list_wipe(&q);
return;
}
}
/* spam and user headers should never be hashed, and the new envelope may
* have better values. Use new versions regardless. */
mutt_buffer_free (&base->spam);
- mutt_free_list (&base->userhdrs);
+ string_list_wipe(&base->userhdrs);
MOVE_ELEM(spam);
MOVE_ELEM(userhdrs);
#undef MOVE_ELEM
snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir),
NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++,
(unsigned int) rand(), (unsigned int) rand());
- debug_print (1, ("%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
unlink (s);
}
-void mutt_free_alias (ALIAS ** p)
-{
- ALIAS *t;
-
- while (*p) {
- t = *p;
- *p = (*p)->next;
- p_delete(&t->name);
- address_delete (&t->addr);
- p_delete(&t);
- }
-}
-
/* collapse the pathname using ~ or = when possible */
void mutt_pretty_mailbox (char *s)
{
char *p = s, *q = s;
- size_t len;
+ ssize_t len;
url_scheme_t scheme;
scheme = url_check_scheme (s);
}
}
-void mutt_pretty_size (char *s, size_t len, long n)
+void mutt_pretty_size (char *s, ssize_t len, long n)
{
if (n == 0)
m_strcpy(s, len, "0K");
}
}
-void mutt_expand_file_fmt (char *dest, size_t destlen, const char *fmt,
+void mutt_expand_file_fmt (char *dest, ssize_t destlen, const char *fmt,
const char *src)
{
char tmp[LONG_STRING];
mutt_expand_fmt (dest, destlen, fmt, tmp);
}
-void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
+void mutt_expand_fmt (char *dest, ssize_t destlen, const char *fmt,
const char *src)
{
const char *p;
char *d;
- size_t slen;
+ ssize_t slen;
int found = 0;
slen = m_strlen(src);
/* return 0 on success, -1 on abort, 1 on error */
int mutt_check_overwrite (const char *attname, const char *path,
- char *fname, size_t flen, int *append,
+ char *fname, ssize_t flen, int *append,
char **directory)
{
int rc = 0;
return 0;
}
-void mutt_save_path (char *d, size_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);
*d = 0;
}
-void mutt_safe_path (char *s, size_t l, address_t * a)
+void mutt_safe_path (char *s, ssize_t l, address_t * a)
{
char *p;
}
/* Does this pattern match? */
- if (regexec
- (l->rx->rx, s, (size_t) l->nmatch, (regmatch_t *) pmatch,
- (int) 0) == 0) {
- debug_print (5, ("%s matches %s\n%d subst", s, l->rx->pattern, l->rx->rx->re_nsub));
-
+ if (regexec(l->rx->rx, s, l->nmatch, (regmatch_t *)pmatch, (int) 0) == 0)
+ {
/* Copy template into text, with substitutions. */
for (p = l->template; *p;) {
if (*p == '%') {
}
}
text[tlen] = '\0';
- debug_print (5, ("\"%s\"\n", text));
return 1;
}
}
return (1);
}
-int mutt_cmp_list (const LIST * a, const LIST * b)
+int mutt_cmp_list (const string_list_t * a, const string_list_t * b)
{
while (a && b) {
if (m_strcmp(a->data, b->data))
projects / apps / madmutt.git / blobdiff