projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify some mime things
[apps/madmutt.git]
/
pop
/
pop_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
b5aa605
..
f4c17e9
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-7,22
+7,10
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "mutt.h"
-#include "mx.h"
#include "pop.h"
#if defined (USE_SSL) || defined (USE_GNUTLS)
# include <lib-sys/mutt_ssl.h>
#include "pop.h"
#if defined (USE_SSL) || defined (USE_GNUTLS)
# include <lib-sys/mutt_ssl.h>
@@
-106,15
+94,17
@@
static int fetch_capa (char *line, void *data)
static int fetch_auth (char *line, void *data)
{
POP_DATA *pop_data = (POP_DATA *) data;
static int fetch_auth (char *line, void *data)
{
POP_DATA *pop_data = (POP_DATA *) data;
+ ssize_t auth_list_len;
if (!pop_data->auth_list) {
if (!pop_data->auth_list) {
- pop_data->auth_list = p_new(char, strlen(line) + 1);
+ auth_list_len = m_strlen(line) + 1;
+ pop_data->auth_list = p_new(char, auth_list_len);
} else {
} else {
- p_realloc(&pop_data->auth_list,
-
strlen(pop_data->auth_list) + strlen(line) + 2
);
- strcat (pop_data->auth_list, " "); /* __STRCAT_CHECKED__ */
+ auth_list_len = m_strlen(pop_data->auth_list) + m_strlen(line) + 2;
+
p_realloc(&pop_data->auth_list, auth_list_len
);
+ m_strcat(pop_data->auth_list, auth_list_len, " ");
}
}
- strcat (pop_data->auth_list, line); /* __STRCAT_CHECKED__ */
+ m_strcat(pop_data->auth_list, auth_list_len, line);
return 0;
}
return 0;
}
@@
-380,7
+370,7
@@
void pop_logout (CONTEXT * ctx)
* -1 - conection lost,
* -2 - invalid command or execution error.
*/
* -1 - conection lost,
* -2 - invalid command or execution error.
*/
-pop_query_status pop_query
_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg
)
+pop_query_status pop_query
(POP_DATA * pop_data, char *buf, size_t buflen
)
{
char *c;
{
char *c;