projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ascii.* into the lib-lib.
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
e1c8a3d
..
5aa7974
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-14,9
+14,11
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_curses.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_curses.h"
@@
-30,9
+32,6
@@
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-296,7
+295,7
@@
int mutt_write_mime_header (BODY * a, FILE * f)
fprintf (f, "Content-Type: %s/%s", TYPE (a), a->subtype);
if (a->parameter) {
fprintf (f, "Content-Type: %s/%s", TYPE (a), a->subtype);
if (a->parameter) {
- len = 25 +
str_len
(a->subtype); /* approximate len. of content-type */
+ len = 25 +
m_strlen
(a->subtype); /* approximate len. of content-type */
for (p = a->parameter; p; p = p->next) {
char *tmp;
for (p = a->parameter; p; p = p->next) {
char *tmp;
@@
-307,7
+306,7
@@
int mutt_write_mime_header (BODY * a, FILE * f)
fputc (';', f);
buffer[0] = 0;
fputc (';', f);
buffer[0] = 0;
- tmp =
str_dup
(p->value);
+ tmp =
m_strdup
(p->value);
encode = rfc2231_encode_string (&tmp);
rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
encode = rfc2231_encode_string (&tmp);
rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
@@
-322,7
+321,7
@@
int mutt_write_mime_header (BODY * a, FILE * f)
p_delete(&tmp);
p_delete(&tmp);
- tmplen =
str_len (buffer) + str_len
(p->attribute) + 1;
+ tmplen =
m_strlen(buffer) + m_strlen
(p->attribute) + 1;
if (len + tmplen + 2 > 76) {
fputs ("\n\t", f);
if (len + tmplen + 2 > 76) {
fputs ("\n\t", f);
@@
-359,7
+358,7
@@
int mutt_write_mime_header (BODY * a, FILE * f)
t = fn;
buffer[0] = 0;
t = fn;
buffer[0] = 0;
- tmp =
str_dup
(t);
+ tmp =
m_strdup
(t);
encode = rfc2231_encode_string (&tmp);
rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
p_delete(&tmp);
encode = rfc2231_encode_string (&tmp);
rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
p_delete(&tmp);
@@
-892,7
+891,7
@@
int mutt_lookup_mime_type (BODY * att, const char *path)
type = TYPEOTHER;
cur_sze = 0;
type = TYPEOTHER;
cur_sze = 0;
- szf =
str_len
(path);
+ szf =
m_strlen
(path);
for (count = 0; count < 4; count++) {
/*
for (count = 0; count < 4; count++) {
/*
@@
-935,7
+934,7
@@
int mutt_lookup_mime_type (BODY * att, const char *path)
/* cycle through the file extensions */
while ((p = strtok (p, " \t\n"))) {
/* cycle through the file extensions */
while ((p = strtok (p, " \t\n"))) {
- sze =
str_len
(p);
+ sze =
m_strlen
(p);
if ((sze > cur_sze) && (szf >= sze) &&
(str_casecmp (path + szf - sze, p) == 0
|| ascii_strcasecmp (path + szf - sze, p) == 0) && (szf == sze
if ((sze > cur_sze) && (szf >= sze) &&
(str_casecmp (path + szf - sze, p) == 0
|| ascii_strcasecmp (path + szf - sze, p) == 0) && (szf == sze
@@
-1036,7
+1035,7
@@
cleanup:
a->d_filename = a->filename;
if (a->filename && a->unlink)
unlink (a->filename);
a->d_filename = a->filename;
if (a->filename && a->unlink)
unlink (a->filename);
- a->filename =
str_dup
(temp);
+ a->filename =
m_strdup
(temp);
a->unlink = 1;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
a->unlink = 1;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
@@
-1077,7
+1076,7
@@
static void transform_to_7bit (BODY * a, FILE * fpin)
mutt_decode_attachment (a, &s);
fclose (s.fpout);
a->d_filename = a->filename;
mutt_decode_attachment (a, &s);
fclose (s.fpout);
a->d_filename = a->filename;
- a->filename =
str_dup
(buff);
+ a->filename =
m_strdup
(buff);
a->unlink = 1;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
a->unlink = 1;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
@@
-1214,8
+1213,8
@@
BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
body = mutt_new_body ();
body->type = TYPEMESSAGE;
body = mutt_new_body ();
body->type = TYPEMESSAGE;
- body->subtype =
str_dup
("rfc822");
- body->filename =
str_dup
(buffer);
+ body->subtype =
m_strdup
("rfc822");
+ body->filename =
m_strdup
(buffer);
body->unlink = 1;
body->use_disp = 0;
body->disposition = DISPINLINE;
body->unlink = 1;
body->use_disp = 0;
body->disposition = DISPINLINE;
@@
-1281,7
+1280,7
@@
BODY *mutt_make_file_attach (const char *path)
CONTENT *info;
att = mutt_new_body ();
CONTENT *info;
att = mutt_new_body ();
- att->filename =
str_dup
(path);
+ att->filename =
m_strdup
(path);
/* Attempt to determine the appropriate content-type based on the filename
* suffix.
/* Attempt to determine the appropriate content-type based on the filename
* suffix.
@@
-1293,8
+1292,8
@@
BODY *mutt_make_file_attach (const char *path)
mutt_lookup_mime_type (buf, sizeof (buf), xbuf, sizeof (xbuf),
path)) != TYPEOTHER || *xbuf != '\0') {
att->type = n;
mutt_lookup_mime_type (buf, sizeof (buf), xbuf, sizeof (xbuf),
path)) != TYPEOTHER || *xbuf != '\0') {
att->type = n;
- att->subtype =
str_dup
(buf);
- att->xtype =
str_dup
(xbuf);
+ att->subtype =
m_strdup
(buf);
+ att->xtype =
m_strdup
(xbuf);
}
#else
}
#else
@@
-1316,11
+1315,11
@@
BODY *mutt_make_file_attach (const char *path)
* chars if this is really a binary file...
*/
att->type = TYPETEXT;
* chars if this is really a binary file...
*/
att->type = TYPETEXT;
- att->subtype =
str_dup
("plain");
+ att->subtype =
m_strdup
("plain");
}
else {
att->type = TYPEAPPLICATION;
}
else {
att->type = TYPEAPPLICATION;
- att->subtype =
str_dup
("octet-stream");
+ att->subtype =
m_strdup
("octet-stream");
}
}
}
}
@@
-1348,7
+1347,7
@@
BODY *mutt_make_multipart (BODY * b)
new = mutt_new_body ();
new->type = TYPEMULTIPART;
new = mutt_new_body ();
new->type = TYPEMULTIPART;
- new->subtype =
str_dup
("mixed");
+ new->subtype =
m_strdup
("mixed");
new->encoding = get_toplevel_encoding (b);
mutt_generate_boundary (&new->parameter);
new->use_disp = 0;
new->encoding = get_toplevel_encoding (b);
mutt_generate_boundary (&new->parameter);
new->use_disp = 0;
@@
-1402,7
+1401,7
@@
void mutt_write_address_list (ADDRESS * adr, FILE * fp, int linelen,
adr->next = NULL;
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), adr, display);
adr->next = NULL;
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), adr, display);
- len =
str_len
(buf);
+ len =
m_strlen
(buf);
if (count && linelen + len > 74) {
fputs ("\n\t", fp);
linelen = len + 8; /* tab is usually about 8 spaces... */
if (count && linelen + len > 74) {
fputs ("\n\t", fp);
linelen = len + 8; /* tab is usually about 8 spaces... */
@@
-1441,7
+1440,7
@@
void mutt_write_references (LIST * r, FILE * f)
for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
if (refcnt == refmax)
for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
if (refcnt == refmax)
-
mem_realloc (&ref, (refmax += REF_INC) * sizeof (LIST *)
);
+
p_realloc(&ref, refmax += REF_INC
);
ref[refcnt++] = r;
}
ref[refcnt++] = r;
}
@@
-1644,14
+1643,13
@@
static void encode_headers (LIST * h)
i = p - h->data;
++p;
SKIPWS (p);
i = p - h->data;
++p;
SKIPWS (p);
- tmp =
str_dup
(p);
+ tmp =
m_strdup
(p);
if (!tmp)
continue;
rfc2047_encode_string (&tmp);
if (!tmp)
continue;
rfc2047_encode_string (&tmp);
- mem_realloc (&h->data,
- str_len (h->data) + 2 + str_len (tmp) + 1);
+ p_realloc(&h->data, m_strlen(h->data) + 2 + m_strlen(tmp) + 1);
sprintf (h->data + i, ": %s", NONULL (tmp)); /* __SPRINTF_CHECKED__ */
sprintf (h->data + i, ": %s", NONULL (tmp)); /* __SPRINTF_CHECKED__ */
@@
-1725,11
+1723,11
@@
static void mutt_gen_localpart (char *buf, unsigned int len, char *fmt)
break;
case 'O':
snprintf (tmp, sizeof (tmp), "%lo", (unsigned long) now);
break;
case 'O':
snprintf (tmp, sizeof (tmp), "%lo", (unsigned long) now);
- str_ncat (buf, len, tmp,
str_len
(tmp));
+ str_ncat (buf, len, tmp,
m_strlen
(tmp));
break;
case 'p':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) getpid ());
break;
case 'p':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) getpid ());
- str_ncat (buf, len, tmp,
str_len
(tmp));
+ str_ncat (buf, len, tmp,
m_strlen
(tmp));
break;
case 'P':
snprintf (tmp, sizeof (tmp), "%c", MsgIdPfx);
break;
case 'P':
snprintf (tmp, sizeof (tmp), "%c", MsgIdPfx);
@@
-1738,11
+1736,11
@@
static void mutt_gen_localpart (char *buf, unsigned int len, char *fmt)
break;
case 'r':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) rand ());
break;
case 'r':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) rand ());
- str_ncat (buf, len, tmp,
str_len
(tmp));
+ str_ncat (buf, len, tmp,
m_strlen
(tmp));
break;
case 'R':
snprintf (tmp, sizeof (tmp), "%x", (unsigned int) rand ());
break;
case 'R':
snprintf (tmp, sizeof (tmp), "%x", (unsigned int) rand ());
- str_ncat (buf, len, tmp,
str_len
(tmp));
+ str_ncat (buf, len, tmp,
m_strlen
(tmp));
break;
case 's':
snprintf (tmp, sizeof (tmp), "%02d", tm->tm_sec);
break;
case 's':
snprintf (tmp, sizeof (tmp), "%02d", tm->tm_sec);
@@
-1750,11
+1748,11
@@
static void mutt_gen_localpart (char *buf, unsigned int len, char *fmt)
break;
case 'T':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) now);
break;
case 'T':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) now);
- str_ncat (buf, len, tmp,
str_len
(tmp));
+ str_ncat (buf, len, tmp,
m_strlen
(tmp));
break;
case 'X':
snprintf (tmp, sizeof (tmp), "%x", (unsigned int) now);
break;
case 'X':
snprintf (tmp, sizeof (tmp), "%x", (unsigned int) now);
- str_ncat (buf, len, tmp,
str_len
(tmp));
+ str_ncat (buf, len, tmp,
m_strlen
(tmp));
break;
case 'Y':
snprintf (tmp, sizeof (tmp), "%04d", tm->tm_year + 1900); /* this will break in the year 10000 ;-) */
break;
case 'Y':
snprintf (tmp, sizeof (tmp), "%04d", tm->tm_year + 1900); /* this will break in the year 10000 ;-) */
@@
-1787,12
+1785,12
@@
char *mutt_gen_msgid (void)
if (!(fqdn = mutt_fqdn (0)))
fqdn = NONULL (Hostname);
if (!(fqdn = mutt_fqdn (0)))
fqdn = NONULL (Hostname);
- localpart_length = sizeof (buf) -
str_len
(fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */
+ localpart_length = sizeof (buf) -
m_strlen
(fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */
mutt_gen_localpart (localpart, localpart_length, MsgIdFormat);
snprintf (buf, sizeof (buf), "<%s@%s>", localpart, fqdn);
mutt_gen_localpart (localpart, localpart_length, MsgIdFormat);
snprintf (buf, sizeof (buf), "<%s@%s>", localpart, fqdn);
- return (
str_dup
(buf));
+ return (
m_strdup
(buf));
}
static RETSIGTYPE alarm_handler (int sig)
}
static RETSIGTYPE alarm_handler (int sig)
@@
-1825,7
+1823,7
@@
send_msg(const char *path, const char **args, const char *msg, char **tempfile)
char tmp[_POSIX_PATH_MAX];
mutt_mktemp (tmp);
char tmp[_POSIX_PATH_MAX];
mutt_mktemp (tmp);
- *tempfile =
str_dup
(tmp);
+ *tempfile =
m_strdup
(tmp);
}
if ((pid = fork ()) == 0) {
}
if ((pid = fork ()) == 0) {
@@
-1953,7
+1951,7
@@
add_args(const char **args, size_t *argslen, size_t *argsmax, ADDRESS * addr)
/* weed out group mailboxes, since those are for display only */
if (addr->mailbox && !addr->group) {
if (*argslen == *argsmax)
/* weed out group mailboxes, since those are for display only */
if (addr->mailbox && !addr->group) {
if (*argslen == *argsmax)
-
mem_realloc (&args, (*argsmax += 5) * sizeof (char *)
);
+
p_realloc(&args, *argsmax += 5
);
args[(*argslen)++] = addr->mailbox;
}
}
args[(*argslen)++] = addr->mailbox;
}
}
@@
-1964,7
+1962,7
@@
static const char **
add_option(const char **args, size_t *argslen, size_t *argsmax, const char *s)
{
if (*argslen == *argsmax) {
add_option(const char **args, size_t *argslen, size_t *argsmax, const char *s)
{
if (*argslen == *argsmax) {
-
mem_realloc(&args, (*argsmax += 5) * sizeof (char *)
);
+
p_realloc(&args, *argsmax += 5
);
}
args[(*argslen)++] = s;
return (args);
}
args[(*argslen)++] = s;
return (args);
@@
-1992,22
+1990,22
@@
static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */
return i;
}
return i;
}
- s =
str_dup
(cmd);
+ s =
m_strdup
(cmd);
}
else
#endif
}
else
#endif
- s =
str_dup
(Sendmail);
+ s =
m_strdup
(Sendmail);
ps = s;
i = 0;
while ((ps = strtok (ps, " "))) {
if (argslen == argsmax)
ps = s;
i = 0;
while ((ps = strtok (ps, " "))) {
if (argslen == argsmax)
-
mem_realloc (&args, sizeof (char *) * (argsmax += 5)
);
+
p_realloc(&args, argsmax += 5
);
if (i)
args[argslen++] = ps;
else {
if (i)
args[argslen++] = ps;
else {
- path =
str_dup
(ps);
+ path =
m_strdup
(ps);
ps = strrchr (ps, '/');
if (ps)
ps++;
ps = strrchr (ps, '/');
if (ps)
ps++;
@@
-2053,7
+2051,7
@@
static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */
#endif
if (argslen == argsmax)
#endif
if (argslen == argsmax)
-
mem_realloc (&args, sizeof (char *) * (++argsmax)
);
+
p_realloc(&args, ++argsmax
);
args[argslen++] = NULL;
args[argslen++] = NULL;
@@
-2110,9
+2108,9
@@
int mutt_invoke_mta (ADDRESS * from, /* the sender */
string. */
char *mutt_append_string (char *a, const char *b)
{
string. */
char *mutt_append_string (char *a, const char *b)
{
- size_t la =
str_len
(a);
+ size_t la =
m_strlen
(a);
-
mem_realloc (&a, la + str_len
(b) + 1);
+
p_realloc(&a, la + m_strlen
(b) + 1);
strcpy (a + la, b); /* __STRCPY_CHECKED__ */
return (a);
}
strcpy (a + la, b); /* __STRCPY_CHECKED__ */
return (a);
}
@@
-2140,14
+2138,14
@@
char *mutt_quote_string (const char *s)
char *r, *pr;
size_t rlen;
char *r, *pr;
size_t rlen;
- rlen =
str_len
(s) + 3;
+ rlen =
m_strlen
(s) + 3;
pr = r = p_new(char, rlen);
*pr++ = '"';
while (*s) {
if (INVALID_CHAR (*s)) {
size_t o = pr - r;
pr = r = p_new(char, rlen);
*pr++ = '"';
while (*s) {
if (INVALID_CHAR (*s)) {
size_t o = pr - r;
-
mem_realloc
(&r, ++rlen);
+
p_realloc
(&r, ++rlen);
pr = r + o;
*pr++ = '\\';
}
pr = r + o;
*pr++ = '\\';
}
@@
-2177,7
+2175,7
@@
void mutt_prepare_envelope (ENVELOPE * env, int final)
rfc822_cat (buffer, sizeof (buffer), "undisclosed-recipients",
RFC822Specials);
rfc822_cat (buffer, sizeof (buffer), "undisclosed-recipients",
RFC822Specials);
- env->to->mailbox =
str_dup
(buffer);
+ env->to->mailbox =
m_strdup
(buffer);
}
mutt_set_followup_to (env);
}
mutt_set_followup_to (env);