projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less horrible strncpy's
[apps/madmutt.git]
/
pop
/
pop.c
diff --git
a/pop/pop.c
b/pop/pop.c
index
01f8e93
..
365b772
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-11,14
+11,17
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mx.h"
#include "pop.h"
#include "mutt_crypt.h"
#include "mutt.h"
#include "mx.h"
#include "pop.h"
#include "mutt_crypt.h"
+#include "mutt_curses.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>
@@
-106,6
+109,11
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
{
mutt_error _("Can't write header to temporary file!");
{
mutt_error _("Can't write header to temporary file!");
+ break;
+ }
+ case PQ_NOT_CONNECTED:
+ {
+ mutt_error _("Can't fetch header: Not connected!");
break;
}
}
break;
}
}
@@
-124,7
+132,7
@@
static int fetch_uidl (char *line, void *data)
sscanf (line, "%d %s", &index, line);
for (i = 0; i < ctx->msgcount; i++)
sscanf (line, "%d %s", &index, line);
for (i = 0; i < ctx->msgcount; i++)
- if (!
str_cmp
(line, ctx->hdrs[i]->data))
+ if (!
m_strcmp
(line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
break;
if (i == ctx->msgcount) {
@@
-135,7
+143,7
@@
static int fetch_uidl (char *line, void *data)
ctx->msgcount++;
ctx->hdrs[i] = mutt_new_header ();
ctx->msgcount++;
ctx->hdrs[i] = mutt_new_header ();
- ctx->hdrs[i]->data =
str_dup
(line);
+ ctx->hdrs[i]->data =
m_strdup
(line);
}
else if (ctx->hdrs[i]->index != index - 1)
pop_data->clear_cache = 1;
}
else if (ctx->hdrs[i]->index != index - 1)
pop_data->clear_cache = 1;
@@
-240,10
+248,10
@@
int pop_open_mailbox (CONTEXT * ctx)
if (!conn)
return -1;
if (!conn)
return -1;
-
mem_free
(&ctx->path);
- ctx->path =
str_dup
(buf);
+
p_delete
(&ctx->path);
+ ctx->path =
m_strdup
(buf);
- pop_data =
mem_calloc (1, sizeof (POP_DATA)
);
+ pop_data =
p_new(POP_DATA, 1
);
pop_data->conn = conn;
ctx->data = pop_data;
pop_data->conn = conn;
ctx->data = pop_data;
@@
-252,7
+260,7
@@
int pop_open_mailbox (CONTEXT * ctx)
conn->data = pop_data;
conn->data = pop_data;
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return -1;
if (pop_reconnect (ctx) != PQ_OK)
return -1;
@@
-285,7
+293,7
@@
static void pop_clear_cache (POP_DATA * pop_data)
for (i = 0; i < POP_CACHE_LEN; i++) {
if (pop_data->cache[i].path) {
unlink (pop_data->cache[i].path);
for (i = 0; i < POP_CACHE_LEN; i++) {
if (pop_data->cache[i].path) {
unlink (pop_data->cache[i].path);
-
mem_free
(&pop_data->cache[i].path);
+
p_delete
(&pop_data->cache[i].path);
}
}
}
}
}
}
@@
-321,7
+329,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
void *uidl;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
void *uidl;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
-
char *m = _("Fetching message...")
;
+
progress_t bar
;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
POP_CACHE *cache;
HEADER *h = ctx->hdrs[msgno];
POP_DATA *pop_data = (POP_DATA *) ctx->data;
POP_CACHE *cache;
HEADER *h = ctx->hdrs[msgno];
@@
-343,11
+351,11
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
else {
/* clear the previous entry */
unlink (cache->path);
else {
/* clear the previous entry */
unlink (cache->path);
-
mem_free
(&cache->path);
+
p_delete
(&cache->path);
}
}
}
}
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return -1;
if (pop_reconnect (ctx) != PQ_OK)
return -1;
@@
-359,7
+367,9
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
return -1;
}
return -1;
}
- mutt_message (m);
+ bar.size = h->content->length + h->content->offset - 1;
+ bar.msg = _("Fetching message...");
+ mutt_progress_bar (&bar, 0);
mutt_mktemp (path);
msg->fp = safe_fopen (path, "w+");
mutt_mktemp (path);
msg->fp = safe_fopen (path, "w+");
@@
-371,7
+381,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
- ret = pop_fetch_data (pop_data, buf,
m
, fetch_message, msg->fp);
+ ret = pop_fetch_data (pop_data, buf,
&bar
, fetch_message, msg->fp);
if (ret == PQ_OK)
break;
if (ret == PQ_OK)
break;
@@
-396,7
+406,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
- cache->path =
str_dup
(path);
+ cache->path =
m_strdup
(path);
rewind (msg->fp);
uidl = h->data;
mutt_free_envelope (&h->env);
rewind (msg->fp);
uidl = h->data;
mutt_free_envelope (&h->env);
@@
-409,7
+419,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
fgets (buf, sizeof (buf), msg->fp);
}
fgets (buf, sizeof (buf), msg->fp);
}
- h->content->length = ftell (msg->fp) - h->content->offset;
+ h->content->length = ftell
o
(msg->fp) - h->content->offset;
/* This needs to be done in case this is a multipart message */
if (!WithCrypto)
/* This needs to be done in case this is a multipart message */
if (!WithCrypto)
@@
-431,7
+441,7
@@
pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
pop_data->check_time = 0;
pop_data->check_time = 0;
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;
@@
-516,7
+526,7
@@
void pop_fetch_mail (void)
return;
}
return;
}
- url = p =
mem_calloc (strlen (PopHost) + 7, sizeof (char)
);
+ url = p =
p_new(char, strlen (PopHost) + 7
);
if (url_check_scheme (PopHost) == U_UNKNOWN) {
strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */
p = strchr (url, '\0');
if (url_check_scheme (PopHost) == U_UNKNOWN) {
strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */
p = strchr (url, '\0');
@@
-524,7
+534,7
@@
void pop_fetch_mail (void)
strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
ret = pop_parse_path (url, &acct);
strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
ret = pop_parse_path (url, &acct);
-
mem_free
(&url);
+
p_delete
(&url);
if (ret) {
mutt_error (_("%s is an invalid POP path"), PopHost);
return;
if (ret) {
mutt_error (_("%s is an invalid POP path"), PopHost);
return;
@@
-534,12
+544,12
@@
void pop_fetch_mail (void)
if (!conn)
return;
if (!conn)
return;
- pop_data =
mem_calloc (1, sizeof (POP_DATA)
);
+ pop_data =
p_new(POP_DATA, 1
);
pop_data->conn = conn;
if (pop_open_connection (pop_data) < 0) {
mutt_socket_free (pop_data->conn);
pop_data->conn = conn;
if (pop_open_connection (pop_data) < 0) {
mutt_socket_free (pop_data->conn);
-
mem_free
(&pop_data);
+
p_delete
(&pop_data);
return;
}
return;
}
@@
-641,11
+651,11
@@
finish:
if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
mutt_socket_close (conn);
if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
mutt_socket_close (conn);
-
mem_free
(&pop_data);
+
p_delete
(&pop_data);
return;
fail:
mutt_error _("Server closed connection!");
mutt_socket_close (conn);
return;
fail:
mutt_error _("Server closed connection!");
mutt_socket_close (conn);
-
mem_free
(&pop_data);
+
p_delete
(&pop_data);
}
}