# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "buffer.h"
#include "attach.h"
#include "reldate.h"
-#include "svnrev.h"
+#include "version.h"
#ifdef USE_IMAP
#include "imap.h"
#include <sys/types.h>
#include <utime.h>
+#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
+
BODY *mutt_new_body (void)
{
- BODY *p = (BODY *) mem_calloc (1, sizeof (BODY));
+ BODY *p = p_new(BODY, 1);
p->disposition = DISPATTACH;
p->use_disp = 1;
else if (b->filename)
debug_print (1, ("not unlinking %s.\n", b->filename));
- mem_free (&b->filename);
- mem_free (&b->content);
- mem_free (&b->xtype);
- mem_free (&b->subtype);
- mem_free (&b->description);
- mem_free (&b->form_name);
+ p_delete(&b->filename);
+ p_delete(&b->content);
+ p_delete(&b->xtype);
+ p_delete(&b->subtype);
+ p_delete(&b->description);
+ p_delete(&b->form_name);
if (b->hdr) {
/* Don't free twice (b->hdr->content = b->parts) */
if (b->parts)
mutt_free_body (&b->parts);
- mem_free (&b);
+ p_delete(&b);
}
*p = 0;
PARAMETER *o;
while (t) {
- mem_free (&t->attribute);
- mem_free (&t->value);
+ p_delete(&t->attribute);
+ p_delete(&t->value);
o = t;
t = t->next;
- mem_free (&o);
+ p_delete(&o);
}
*p = 0;
}
return;
mutt_free_envelope (&(*h)->env);
mutt_free_body (&(*h)->content);
- mem_free (&(*h)->maildir_flags);
- mem_free (&(*h)->tree);
- mem_free (&(*h)->path);
+ p_delete(&(*h)->maildir_flags);
+ p_delete(&(*h)->tree);
+ p_delete(&(*h)->path);
#ifdef MIXMASTER
mutt_free_list (&(*h)->chain);
#endif
#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
- mem_free (&(*h)->data);
+ p_delete(&(*h)->data);
#endif
- mem_free (h);
+ p_delete(h);
}
/* returns true if the header contained in "s" is in list "t" */
return 0;
}
-/* prepend the path part of *path to *link */
-void mutt_expand_link (char *newpath, const char *path, const char *link)
+/* prepend the path part of *path to *lnk */
+void mutt_expand_link (char *newpath, const char *path, const char *lnk)
{
const char *lb = NULL;
size_t len;
- /* link is full path */
- if (*link == '/') {
- strfcpy (newpath, link, _POSIX_PATH_MAX);
+ /* lnk is full path */
+ if (*lnk == '/') {
+ strfcpy (newpath, lnk, _POSIX_PATH_MAX);
return;
}
if ((lb = strrchr (path, '/')) == NULL) {
- /* no path in link */
- strfcpy (newpath, link, _POSIX_PATH_MAX);
+ /* no path in lnk */
+ strfcpy (newpath, lnk, _POSIX_PATH_MAX);
return;
}
len = lb - path + 1;
memcpy (newpath, path, len);
- strfcpy (newpath + len, link, _POSIX_PATH_MAX - len);
+ strfcpy (newpath + len, lnk, _POSIX_PATH_MAX - len);
}
char *mutt_expand_path (char *s, size_t slen)
char tmp[_POSIX_PATH_MAX];
char *t;
- char *tail = "";
+ const char *tail = "";
int recurse = 0;
rfc822_free_address (&(*p)->reply_to);
rfc822_free_address (&(*p)->mail_followup_to);
- mem_free (&(*p)->list_post);
- mem_free (&(*p)->subject);
+ p_delete(&(*p)->list_post);
+ p_delete(&(*p)->subject);
/* real_subj is just an offset to subject and shouldn't be freed */
- mem_free (&(*p)->message_id);
- mem_free (&(*p)->supersedes);
- mem_free (&(*p)->date);
- mem_free (&(*p)->x_label);
- mem_free (&(*p)->organization);
+ p_delete(&(*p)->message_id);
+ p_delete(&(*p)->supersedes);
+ p_delete(&(*p)->date);
+ p_delete(&(*p)->x_label);
+ p_delete(&(*p)->organization);
#ifdef USE_NNTP
- mem_free (&(*p)->newsgroups);
- mem_free (&(*p)->xref);
- mem_free (&(*p)->followup_to);
- mem_free (&(*p)->x_comment_to);
+ p_delete(&(*p)->newsgroups);
+ p_delete(&(*p)->xref);
+ p_delete(&(*p)->followup_to);
+ p_delete(&(*p)->x_comment_to);
#endif
mutt_buffer_free (&(*p)->spam);
mutt_free_list (&(*p)->references);
mutt_free_list (&(*p)->in_reply_to);
mutt_free_list (&(*p)->userhdrs);
- mem_free (p);
+ p_delete(p);
}
/* move all the headers from extra not present in base into base */
while (*p) {
t = *p;
*p = (*p)->next;
- mem_free (&t->name);
+ p_delete(&t->name);
rfc822_free_address (&t->addr);
- mem_free (&t);
+ p_delete(&t);
}
}
str_replace (directory, fname);
break;
case 1: /* yes */
- mem_free (directory);
+ p_delete(directory);
break;
case -1: /* abort */
- mem_free (directory);
+ p_delete(directory);
return -1;
case 2: /* no */
- mem_free (directory);
+ p_delete(directory);
return 1;
}
}
if (DrawFullLine || option (OPTSTATUSONTOP))
count = (COLS < destlen ? COLS : destlen);
else
- count =
- ((COLS - SidebarWidth) <
- destlen ? (COLS - SidebarWidth) : destlen);
+ count = ((COLS - SW) < destlen ? (COLS - SW) : destlen);
if (count > col) {
count -= col; /* how many columns left on this line */
mutt_FormatString (buf, sizeof (buf), src, callback, data, flags);
break; /* skip rest of input */
}
else {
- short tolower = 0;
+ short lower = 0;
short nodots = 0;
while (ch == '_' || ch == ':') {
if (ch == '_')
- tolower = 1;
+ lower = 1;
else if (ch == ':')
nodots = 1;
callback (buf, sizeof (buf), ch, src, prefix, ifstring, elsestring,
data, flags);
- if (tolower)
+ if (lower)
str_tolower (buf);
if (nodots) {
char *p = buf;
}
else {
unsigned int bar = mutt_skipchars (src, "%\\");
- char *bar2 = mem_malloc (bar + 1);
+ char *bar2 = p_dupstr(src, bar);
- strfcpy (bar2, src, bar + 1);
while (bar--) {
*wptr++ = *src++;
wlen++;
}
col += mutt_strwidth (bar2);
- mem_free (&bar2);
+ p_delete(&bar2);
}
}
*wptr = 0;
then we assume it is a commmand to run instead of a normal file. */
FILE *mutt_open_read (const char *path, pid_t * thepid)
{
- FILE *f;
- struct stat s;
-
- int len = str_len (path);
-
- if (path[len - 1] == '|') {
- /* read from a pipe */
-
- char *s = str_dup (path);
-
- s[len - 1] = 0;
- mutt_endwin (NULL);
- *thepid = mutt_create_filter (s, NULL, &f, NULL);
- mem_free (&s);
- }
- else {
- if (stat (path, &s) < 0)
- return (NULL);
- if (S_ISDIR (s.st_mode)) {
- errno = EINVAL;
- return (NULL);
+ int len = str_len (path);
+ FILE *f;
+
+ if (path[len - 1] == '|') {
+ char *s = str_dup (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;
}
- f = fopen (path, "r");
- *thepid = -1;
- }
- return (f);
+
+ return (f);
}
/* returns 0 if OK to proceed, -1 to abort, 1 to retry */
}
/* Decrease a file's modification time by 1 second */
-
time_t mutt_decrease_mtime (const char *f, struct stat *st)
{
struct utimbuf utim;
return mtime;
}
-const char *mutt_make_version (void)
+/* sets mtime of 'to' to mtime of 'from' */
+void mutt_set_mtime (const char* from, const char* to) {
+ struct utimbuf utim;
+ struct stat st;
+
+ if (stat (from, &st) != -1) {
+ utim.actime = st.st_mtime;
+ utim.modtime = st.st_mtime;
+ utime (to, &utim);
+ }
+}
+
+const char *mutt_make_version (int full)
{
static char vstring[STRING];
- snprintf (vstring, sizeof (vstring), "Mutt-ng %s-%s (based on Mutt 1.5.10/%s)",
- MUTT_VERSION, MUTTNG_SVNREV, ReleaseDate);
+ if (full)
+ snprintf (vstring, sizeof (vstring), "Mutt-ng %s-r%s (based "
+ "on Mutt 1.5.11/%s)", MUTT_VERSION, MUTT_REVISION,
+ ReleaseDate);
+ else
+ snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s",
+ MUTT_VERSION, MUTT_REVISION);
return vstring;
}
p = *list;
*list = (*list)->next;
rx_free (&p->rx);
- mem_free(&p->template);
- mem_free(&p);
+ p_delete(&p->template);
+ p_delete(&p);
}
}
for (p = l->template; *p;) {
if (*p == '%') {
n = atoi (++p); /* find pmatch index */
- while (isdigit (*p))
+ while (isdigit ((unsigned char) *p))
++p; /* skip subst token */
for (i = pmatch[n].rm_so; (i < pmatch[n].rm_eo) && (tlen < x); i++)
text[tlen++] = s[i];
projects / apps / madmutt.git / blobdiff