# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
+#include <lib-lib/macros.h>
+
#include "mutt.h"
+#include "enter.h"
+#include "recvattach.h"
+#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include "buffy.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <errno.h>
mutt_wait_filter (filterpid);
safe_fclose (&fpfilterout);
}
+#if 0
+ /* this is maybe just plain wrong but it makes the pager display
+ * what we have; i.e. for the crypto stuff we only get
+ * 'Could not copy message' for invalid passphrases, no PGP output
+ * not nothing; so just display what we have...
+ * - pdmef
+ */
mutt_unlink (tempfile);
return 0;
+#endif
}
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
- FREE (&err);
+ p_delete(&err);
rfc822_free_address (&adr);
return;
}
/* the following code is shared between printing and piping */
-static int _mutt_pipe_message (HEADER * h, char *cmd,
- int decode, int print, int split, char *sep)
+static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
+ int split, const char *sep)
{
int i, rc = 0;
err.dsize = sizeof (errbuf);
memset (&token, 0, sizeof (token));
r = mutt_parse_rc_line (buffer, &token, &err);
- FREE (&token.data);
+ p_delete(&token.data);
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
void mutt_display_address (ENVELOPE * env)
{
- char *pfx = NULL;
+ const char *pfx = NULL;
char buf[SHORT_STRING];
ADDRESS *adr = NULL;
- adr = mutt_get_address (env, &pfx);
+ adr = mutt_get_address(env, &pfx);
if (!adr)
return;
return -1;
}
-int mutt_update_list_file (char *filename, char *section, char *key,
- char *line)
-{
- FILE *ifp;
- FILE *ofp;
- char buf[HUGE_STRING];
- char oldfile[_POSIX_PATH_MAX];
- char *c;
- int ext = 0, done = 0, r = 0;
-
- snprintf (oldfile, sizeof (oldfile), "%s.bak", filename);
- debug_print (1, ("Renaming %s to %s\n", filename, oldfile));
-
- /* if file not exist, create it */
- if ((ifp = safe_fopen (filename, "a")))
- fclose (ifp);
- if (_mutt_rename_file (filename, oldfile, 1)) {
- mutt_perror (_("Unable to create backup file"));
-
- return (-1);
- }
- debug_print (1, ("Opening %s\n", oldfile));
- if (!(ifp = safe_fopen (oldfile, "r"))) {
- mutt_perror (_("Unable to open backup file for reading"));
-
- return (-1);
- }
- debug_print (1, ("Opening %s\n", filename));
- if (!(ofp = safe_fopen (filename, "w"))) {
- fclose (ifp);
- mutt_perror (_("Unable to open new file for writing"));
-
- return (-1);
- }
- if (mx_lock_file (filename, fileno (ofp), 1, 0, 1)) {
- fclose (ofp);
- fclose (ifp);
- mutt_error (_("Unable to lock %s, old file saved as %s"), filename,
- oldfile);
- return (-1);
- }
-
- if (section) {
- while (r != EOF && !done && fgets (buf, sizeof (buf), ifp)) {
- r = fputs (buf, ofp);
- c = buf;
- while (*c && *c != '\n')
- c++;
- c[0] = 0; /* strip EOL */
- if (!strncmp (buf, "#: ", 3) && !str_casecmp (buf + 3, section))
- done++;
- }
- if (r != EOF && !done) {
- snprintf (buf, sizeof (buf), "#: %s\n", section);
- r = fputs (buf, ofp);
- }
- done = 0;
- }
-
- while (r != EOF && fgets (buf, sizeof (buf), ifp)) {
- if (ext) {
- c = buf;
- while (*c && (*c != '\r') && (*c != '\n'))
- c++;
- c--;
- if (*c != '\\')
- ext = 0;
- }
- else if ((section && !strncmp (buf, "#: ", 3))) {
- if (!done && line) {
- fputs (line, ofp);
- fputc ('\n', ofp);
- }
- r = fputs (buf, ofp);
- done++;
- break;
- }
- else if (key && !strncmp (buf, key, str_len (key)) &&
- (!*key || buf[str_len (key)] == ' ')) {
- c = buf;
- ext = 0;
- while (*c && (*c != '\r') && (*c != '\n'))
- c++;
- c--;
- if (*c == '\\')
- ext = 1;
- if (!done && line) {
- r = fputs (line, ofp);
- if (*key)
- r = fputc ('\n', ofp);
- done++;
- }
- }
- else {
- r = fputs (buf, ofp);
- }
- }
-
- while (r != EOF && fgets (buf, sizeof (buf), ifp))
- r = fputs (buf, ofp);
-
- /* If there wasn't a line to replace, put it on the end of the file */
- if (r != EOF && !done && line) {
- fputs (line, ofp);
- r = fputc ('\n', ofp);
- }
- mx_unlock_file (filename, fileno (ofp), 0);
- fclose (ofp);
- fclose (ifp);
- if (r != EOF) {
- unlink (oldfile);
- return 0;
- }
- unlink (filename);
- mutt_error (_("Cannot write new %s, old file saved as %s"), filename,
- oldfile);
- return (-1);
-}
-
-
void mutt_version (void)
{
- mutt_message ("Mutt-ng %s (%s) based on Mutt 1.5.9", MUTT_VERSION, ReleaseDate);
+ mutt_message (mutt_make_version (1));
}
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
size_t l;
for (p = b->parameter; p; p = p->next) {
- l = str_len (buf);
+ l = m_strlen(buf);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
- FREE (&b->subtype);
+ p_delete(&b->subtype);
mutt_parse_content_type (buf, b);
projects / apps / madmutt.git / blobdiff