projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make m_dupstr return NULL if the string was empty.
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
bea5faa
..
01fde6c
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-11,9
+11,14
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "rfc2047.h"
#include "rfc3676.h"
#include "mutt_curses.h"
#include "rfc2047.h"
#include "rfc3676.h"
@@
-26,9
+31,6
@@
#include "url.h"
#include "attach.h"
#include "url.h"
#include "attach.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-178,7
+180,7
@@
static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c)
return top;
}
return top;
}
-static int edit_address (ADDRESS ** a,
/* const */
char *field)
+static int edit_address (ADDRESS ** a,
const
char *field)
{
char buf[HUGE_STRING];
char *err = NULL;
{
char buf[HUGE_STRING];
char *err = NULL;
@@
-196,7
+198,7
@@
static int edit_address (ADDRESS ** a, /* const */ char *field)
mutt_error (_("Error: '%s' is a bad IDN."), err);
mutt_refresh ();
mutt_sleep (2);
mutt_error (_("Error: '%s' is a bad IDN."), err);
mutt_refresh ();
mutt_sleep (2);
-
mem_free
(&err);
+
p_delete
(&err);
}
}
while (idna_ok != 0);
}
}
while (idna_ok != 0);
@@
-217,8
+219,8
@@
static int edit_envelope (ENVELOPE * en, int flags)
buf[0] = 0;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
return (-1);
buf[0] = 0;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
return (-1);
-
mem_free
(&en->newsgroups);
- en->newsgroups =
str_dup
(buf);
+
p_delete
(&en->newsgroups);
+ en->newsgroups =
m_strdup
(buf);
if (en->followup_to)
strfcpy (buf, en->followup_to, sizeof (buf));
if (en->followup_to)
strfcpy (buf, en->followup_to, sizeof (buf));
@@
-227,8
+229,8
@@
static int edit_envelope (ENVELOPE * en, int flags)
if (option (OPTASKFOLLOWUP)
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
if (option (OPTASKFOLLOWUP)
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
-
mem_free
(&en->followup_to);
- en->followup_to =
str_dup
(buf);
+
p_delete
(&en->followup_to);
+ en->followup_to =
m_strdup
(buf);
if (en->x_comment_to)
strfcpy (buf, en->x_comment_to, sizeof (buf));
if (en->x_comment_to)
strfcpy (buf, en->x_comment_to, sizeof (buf));
@@
-237,8
+239,8
@@
static int edit_envelope (ENVELOPE * en, int flags)
if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
-
mem_free
(&en->x_comment_to);
- en->x_comment_to =
str_dup
(buf);
+
p_delete
(&en->x_comment_to);
+ en->x_comment_to =
m_strdup
(buf);
}
else
#endif
}
else
#endif
@@
-265,7
+267,7
@@
static int edit_envelope (ENVELOPE * en, int flags)
if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
p = uh->data + 8;
SKIPWS (p);
if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
p = uh->data + 8;
SKIPWS (p);
-
strncpy (buf, p, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), p
);
}
}
}
}
}
}
@@
-304,7
+306,7
@@
static int edit_envelope (ENVELOPE * en, int flags)
char *nntp_get_header (const char *s)
{
SKIPWS (s);
char *nntp_get_header (const char *s)
{
SKIPWS (s);
- return
str_dup
(s);
+ return
m_strdup
(s);
}
#endif
}
#endif
@@
-367,7
+369,7
@@
static void process_user_header (ENVELOPE * env)
}
else
last = env->userhdrs = mutt_new_list ();
}
else
last = env->userhdrs = mutt_new_list ();
- last->data =
str_dup
(uh->data);
+ last->data =
m_strdup
(uh->data);
}
}
}
}
}
}
@@
-602,7
+604,7
@@
LIST *mutt_make_references (ENVELOPE * e)
if (e->message_id) {
t = mutt_new_list ();
if (e->message_id) {
t = mutt_new_list ();
- t->data =
str_dup
(e->message_id);
+ t->data =
m_strdup
(e->message_id);
t->next = l;
l = t;
}
t->next = l;
l = t;
}
@@
-649,16
+651,16
@@
void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
* been taken from a List-Post header. Is that correct?
*/
if (curenv->real_subj) {
* been taken from a List-Post header. Is that correct?
*/
if (curenv->real_subj) {
-
mem_free
(&env->subject);
- env->subject =
mem_malloc (str_len
(curenv->real_subj) + 5);
+
p_delete
(&env->subject);
+ env->subject =
p_new(char, m_strlen
(curenv->real_subj) + 5);
sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
}
else if (!env->subject)
sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
}
else if (!env->subject)
- env->subject =
str_dup
("Re: your mail");
+ env->subject =
m_strdup
("Re: your mail");
#ifdef USE_NNTP
if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
#ifdef USE_NNTP
if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
- env->x_comment_to =
str_dup
(mutt_get_name (curenv->from));
+ env->x_comment_to =
m_strdup
(mutt_get_name (curenv->from));
#endif
}
#endif
}
@@
-686,7
+688,7
@@
void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
if (curenv->message_id) {
*q = mutt_new_list ();
if (curenv->message_id) {
*q = mutt_new_list ();
- (*q)->data =
str_dup
(curenv->message_id);
+ (*q)->data =
m_strdup
(curenv->message_id);
}
if (pp)
}
if (pp)
@@
-750,7
+752,7
@@
envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags)
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
str_casecmp (curenv->followup_to, "poster"))
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
str_casecmp (curenv->followup_to, "poster"))
- env->newsgroups =
str_dup
(curenv->followup_to);
+ env->newsgroups =
m_strdup
(curenv->followup_to);
}
else
#endif
}
else
#endif
@@
-893,7
+895,7
@@
void mutt_set_followup_to (ENVELOPE * e)
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
- e->followup_to =
str_dup
(e->newsgroups);
+ e->followup_to =
m_strdup
(e->newsgroups);
return;
}
#endif
return;
}
#endif
@@
-964,9
+966,9
@@
static ADDRESS *set_reverse_name (ENVELOPE * env)
if (tmp) {
tmp = rfc822_cpy_adr_real (tmp);
if (!option (OPTREVREAL))
if (tmp) {
tmp = rfc822_cpy_adr_real (tmp);
if (!option (OPTREVREAL))
-
mem_free
(&tmp->personal);
+
p_delete
(&tmp->personal);
if (!tmp->personal)
if (!tmp->personal)
- tmp->personal =
str_dup
(Realname);
+ tmp->personal =
m_strdup
(Realname);
}
return (tmp);
}
}
return (tmp);
}
@@
-985,13
+987,12
@@
ADDRESS *mutt_default_from (void)
adr = rfc822_cpy_adr_real (From);
else if (option (OPTUSEDOMAIN)) {
adr = rfc822_new_address ();
adr = rfc822_cpy_adr_real (From);
else if (option (OPTUSEDOMAIN)) {
adr = rfc822_new_address ();
- adr->mailbox =
- mem_malloc (str_len (Username) + str_len (fqdn) + 2);
+ adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
adr = rfc822_new_address ();
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
adr = rfc822_new_address ();
- adr->mailbox =
str_dup
(NONULL (Username));
+ adr->mailbox =
m_strdup
(NONULL (Username));
}
return (adr);
}
return (adr);
@@
-1076,7
+1077,7
@@
static void fix_end_of_file (const char *data)
if ((fp = safe_fopen (data, "a+")) == NULL)
return;
if ((fp = safe_fopen (data, "a+")) == NULL)
return;
- fseek (fp, -1, SEEK_END);
+ fseek
o
(fp, -1, SEEK_END);
if ((c = fgetc (fp)) != '\n')
fputc ('\n', fp);
safe_fclose (&fp);
if ((c = fgetc (fp)) != '\n')
fputc ('\n', fp);
safe_fclose (&fp);
@@
-1111,8
+1112,8
@@
int ci_send_message (int flags, /* send mode */
char *pgpkeylist = NULL;
/* save current value of "pgp_sign_as" */
char *pgpkeylist = NULL;
/* save current value of "pgp_sign_as" */
- char *signas = NULL;
- c
har *tag = NULL, *err
= NULL;
+ char *signas = NULL
, *err = NULL
;
+ c
onst char *tag
= NULL;
char *ctype;
int rv = -1;
char *ctype;
int rv = -1;
@@
-1139,7
+1140,7
@@
int ci_send_message (int flags, /* send mode */
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
- signas =
str_dup
(PgpSignAs);
+ signas =
m_strdup
(PgpSignAs);
/* Delay expansion of aliases until absolutely necessary--shouldn't
* be necessary unless we are prompting the user or about to execute a
/* Delay expansion of aliases until absolutely necessary--shouldn't
* be necessary unless we are prompting the user or about to execute a
@@
-1194,10
+1195,10
@@
int ci_send_message (int flags, /* send mode */
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
- if (!(ctype =
str_dup
(ContentType)))
- ctype =
str_dup
("text/plain");
+ if (!(ctype =
m_strdup
(ContentType)))
+ ctype =
m_strdup
("text/plain");
mutt_parse_content_type (ctype, msg->content);
mutt_parse_content_type (ctype, msg->content);
-
mem_free
(&ctype);
+
p_delete
(&ctype);
msg->content->unlink = 1;
msg->content->use_disp = 0;
msg->content->unlink = 1;
msg->content->use_disp = 0;
@@
-1212,11
+1213,11
@@
int ci_send_message (int flags, /* send mode */
if (!tempfile) {
mutt_mktemp (buffer);
tempfp = safe_fopen (buffer, "w+");
if (!tempfile) {
mutt_mktemp (buffer);
tempfp = safe_fopen (buffer, "w+");
- msg->content->filename =
str_dup
(buffer);
+ msg->content->filename =
m_strdup
(buffer);
}
else {
tempfp = safe_fopen (tempfile, "a+");
}
else {
tempfp = safe_fopen (tempfile, "a+");
- msg->content->filename =
str_dup
(tempfile);
+ msg->content->filename =
m_strdup
(tempfile);
}
if (!tempfp) {
}
if (!tempfp) {
@@
-1270,7
+1271,7
@@
int ci_send_message (int flags, /* send mode */
#ifdef USE_NNTP
if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
&& !msg->env->newsgroups)
#ifdef USE_NNTP
if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
&& !msg->env->newsgroups)
- msg->env->newsgroups =
str_dup
(((NNTP_DATA *) ctx->data)->group);
+ msg->env->newsgroups =
m_strdup
(((NNTP_DATA *) ctx->data)->group);
#endif
if (!(flags & SENDMAILX) &&
#endif
if (!(flags & SENDMAILX) &&
@@
-1325,7
+1326,7
@@
int ci_send_message (int flags, /* send mode */
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- &&
str_cmp
(Editor, "builtin") != 0))
+ &&
m_strcmp
(Editor, "builtin") != 0))
append_signature (tempfp);
/* include replies/forwarded messages, unless we are given a template */
append_signature (tempfp);
/* include replies/forwarded messages, unless we are given a template */
@@
-1335,7
+1336,7
@@
int ci_send_message (int flags, /* send mode */
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- &&
str_cmp
(Editor, "builtin") != 0))
+ &&
m_strcmp
(Editor, "builtin") != 0))
append_signature (tempfp);
/*
append_signature (tempfp);
/*
@@
-1415,7
+1416,7
@@
int ci_send_message (int flags, /* send mode */
that $realname can be set in a send-hook */
if (msg->env->from && !msg->env->from->personal
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
that $realname can be set in a send-hook */
if (msg->env->from && !msg->env->from->personal
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
- msg->env->from->personal =
str_dup
(Realname);
+ msg->env->from->personal =
m_strdup
(Realname);
if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
safe_fclose (&tempfp);
if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
safe_fclose (&tempfp);
@@
-1449,7
+1450,7
@@
int ci_send_message (int flags, /* send mode */
if (mutt_needs_mailcap (msg->content)) {
if (!mutt_edit_attachment (msg->content))
goto cleanup;
if (mutt_needs_mailcap (msg->content)) {
if (!mutt_edit_attachment (msg->content))
goto cleanup;
- } else if (!Editor ||
str_cmp
("builtin", Editor) == 0)
+ } else if (!Editor ||
m_strcmp
("builtin", Editor) == 0)
mutt_builtin_editor (msg->content->filename, msg, cur);
else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
mutt_builtin_editor (msg->content->filename, msg, cur);
else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
@@
-1578,7
+1579,7
@@
int ci_send_message (int flags, /* send mode */
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
-
mem_free
(&err);
+
p_delete
(&err);
if (!(flags & SENDBATCH))
goto main_loop;
else
if (!(flags & SENDBATCH))
goto main_loop;
else
@@
-1653,7
+1654,7
@@
int ci_send_message (int flags, /* send mode */
mutt_protect (msg, pgpkeylist) == -1) {
msg->content = mutt_remove_multipart (msg->content);
mutt_protect (msg, pgpkeylist) == -1) {
msg->content = mutt_remove_multipart (msg->content);
-
mem_free
(&pgpkeylist);
+
p_delete
(&pgpkeylist);
decode_descriptions (msg->content);
goto main_loop;
decode_descriptions (msg->content);
goto main_loop;
@@
-1701,7
+1702,7
@@
int ci_send_message (int flags, /* send mode */
fcc[0] = '\0';
#endif
fcc[0] = '\0';
#endif
- if (*fcc &&
str_cmp
("/dev/null", fcc) != 0) {
+ if (*fcc &&
m_strcmp
("/dev/null", fcc) != 0) {
BODY *tmpbody = msg->content;
BODY *save_sig = NULL;
BODY *save_parts = NULL;
BODY *tmpbody = msg->content;
BODY *save_sig = NULL;
BODY *save_parts = NULL;
@@
-1712,8
+1713,8
@@
int ci_send_message (int flags, /* send mode */
/* check to see if the user wants copies of all attachments */
if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
if (WithCrypto
/* check to see if the user wants copies of all attachments */
if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
if (WithCrypto
- && (
str_cmp
(msg->content->subtype, "encrypted") == 0 ||
-
str_cmp
(msg->content->subtype, "signed") == 0)) {
+ && (
m_strcmp
(msg->content->subtype, "encrypted") == 0 ||
+
m_strcmp
(msg->content->subtype, "signed") == 0)) {
if (clear_content->type == TYPEMULTIPART) {
if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
/* save initial signature and attachments */
if (clear_content->type == TYPEMULTIPART) {
if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
/* save initial signature and attachments */
@@
-1817,7
+1818,7
@@
int ci_send_message (int flags, /* send mode */
#endif
if (WithCrypto && (msg->security & ENCRYPT))
#endif
if (WithCrypto && (msg->security & ENCRYPT))
-
mem_free
(&pgpkeylist);
+
p_delete
(&pgpkeylist);
if (WithCrypto && free_clear_content)
mutt_free_body (&clear_content);
if (WithCrypto && free_clear_content)
mutt_free_body (&clear_content);
@@
-1839,7
+1840,7
@@
cleanup:
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
if (signas) {
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
if (signas) {
-
mem_free
(&PgpSignAs);
+
p_delete
(&PgpSignAs);
PgpSignAs = signas;
}
}
PgpSignAs = signas;
}
}