projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
pop
/
pop_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
b17cb25
..
637d01b
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-21,6
+21,8
@@
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/mem.h"
#include "lib/intl.h"
+#include "lib/debug.h"
+#include "lib/str.h"
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
@@
-63,7
+65,7
@@
void pop_error (POP_DATA * pop_data, char *msg)
t = strchr (pop_data->err_msg, '\0');
c = msg;
t = strchr (pop_data->err_msg, '\0');
c = msg;
- if (!
mutt
_strncmp (msg, "-ERR ", 5)) {
+ if (!
safe
_strncmp (msg, "-ERR ", 5)) {
c2 = msg + 5;
SKIPWS (c2);
c2 = msg + 5;
SKIPWS (c2);
@@
-72,7
+74,7
@@
void pop_error (POP_DATA * pop_data, char *msg)
}
strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
}
strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
-
mutt_remove_trailing_
ws (pop_data->err_msg);
+
str_skip_trail
ws (pop_data->err_msg);
}
/* Parse CAPA output */
}
/* Parse CAPA output */
@@
-219,7
+221,7
@@
pop_query_status pop_connect (POP_DATA * pop_data)
pop_data->status = POP_CONNECTED;
pop_data->status = POP_CONNECTED;
- if (
mutt
_strncmp (buf, "+OK", 3)) {
+ if (
safe
_strncmp (buf, "+OK", 3)) {
*pop_data->err_msg = '\0';
pop_error (pop_data, buf);
mutt_error ("%s", pop_data->err_msg);
*pop_data->err_msg = '\0';
pop_error (pop_data, buf);
mutt_error ("%s", pop_data->err_msg);
@@
-388,7
+390,7
@@
pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, cha
/* print msg instaed of real command */
if (msg) {
dbg = M_SOCK_LOG_FULL;
/* print msg instaed of real command */
if (msg) {
dbg = M_SOCK_LOG_FULL;
- d
print (M_SOCK_LOG_CMD, (debugfile,
"> %s", msg));
+ d
ebug_print (M_SOCK_LOG_CMD, (
"> %s", msg));
}
#endif
}
#endif
@@
-402,7
+404,7
@@
pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, cha
pop_data->status = POP_DISCONNECTED;
return PQ_NOT_CONNECTED;
}
pop_data->status = POP_DISCONNECTED;
return PQ_NOT_CONNECTED;
}
- if (!
mutt
_strncmp (buf, "+OK", 3))
+ if (!
safe
_strncmp (buf, "+OK", 3))
return PQ_OK;
pop_error (pop_data, buf);
return PQ_OK;
pop_error (pop_data, buf);
@@
-482,7
+484,7
@@
static int check_uidl (char *line, void *data)
sscanf (line, "%u %s", &index, line);
for (i = 0; i < ctx->msgcount; i++) {
sscanf (line, "%u %s", &index, line);
for (i = 0; i < ctx->msgcount; i++) {
- if (!
mutt
_strcmp (ctx->hdrs[i]->data, line)) {
+ if (!
safe
_strcmp (ctx->hdrs[i]->data, line)) {
ctx->hdrs[i]->refno = index;
break;
}
ctx->hdrs[i]->refno = index;
break;
}