projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move some string functions in lib-lib !
[apps/madmutt.git]
/
pop
/
pop.c
diff --git
a/pop/pop.c
b/pop/pop.c
index
be2d105
..
9b53409
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-103,7
+103,7
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
}
}
}
}
-
fclose (
f);
+
m_fclose(&
f);
unlink (tempfile);
return ret;
}
unlink (tempfile);
return ret;
}
@@
-362,7
+362,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
if (ret == PQ_OK)
break;
if (ret == PQ_OK)
break;
-
safe_fclose
(&msg->fp);
+
m_fclose
(&msg->fp);
unlink (path);
if (ret == PQ_ERR) {
unlink (path);
if (ret == PQ_ERR) {
@@
-490,7
+490,7
@@
static int pop_check_mailbox (CONTEXT * ctx,
void pop_fetch_mail (void)
{
char buffer[LONG_STRING];
void pop_fetch_mail (void)
{
char buffer[LONG_STRING];
- char msgbuf[S
HORT_S
TRING];
+ char msgbuf[STRING];
char *url, *p;
int i, delanswer, last = 0, msgs, bytes, rset = 0;
pop_query_status ret;
char *url, *p;
int i, delanswer, last = 0, msgs, bytes, rset = 0;
pop_query_status ret;
@@
-499,6
+499,7
@@
void pop_fetch_mail (void)
MESSAGE *msg = NULL;
ACCOUNT act;
POP_DATA *pop_data;
MESSAGE *msg = NULL;
ACCOUNT act;
POP_DATA *pop_data;
+ ssize_t plen;
if (!PopHost) {
mutt_error _("POP host is not defined.");
if (!PopHost) {
mutt_error _("POP host is not defined.");
@@
-506,12
+507,13
@@
void pop_fetch_mail (void)
return;
}
return;
}
- url = p = p_new(char, strlen (PopHost) + 7);
+ plen = m_strlen(PopHost) + 7;
+ url = p = p_new(char, plen);
if (url_check_scheme (PopHost) == U_UNKNOWN) {
if (url_check_scheme (PopHost) == U_UNKNOWN) {
- strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */
- p
= strchr (url, '\0')
;
+ plen -= m_strcpy(url, plen, "pop://");
+ p
+= plen
;
}
}
- strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
+ m_strcpy(p, plen, PopHost);
ret = pop_parse_path (url, &act);
p_delete(&url);
ret = pop_parse_path (url, &act);
p_delete(&url);