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]
/
nntp
/
newsrc.c
diff --git
a/nntp/newsrc.c
b/nntp/newsrc.c
index
e20fff2
..
4dadc20
100644
(file)
--- a/
nntp/newsrc.c
+++ b/
nntp/newsrc.c
@@
-18,7
+18,6
@@
#include "sort.h"
#include "mx.h"
#include "mime.h"
#include "sort.h"
#include "mx.h"
#include "mime.h"
-#include "mailbox.h"
#include "nntp.h"
#include "rfc822.h"
#include "rfc1524.h"
#include "nntp.h"
#include "rfc822.h"
#include "rfc1524.h"
@@
-27,6
+26,7
@@
#include "lib/mem.h"
#include "lib/str.h"
#include "lib/intl.h"
#include "lib/mem.h"
#include "lib/str.h"
#include "lib/intl.h"
+#include "lib/debug.h"
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
@@
-74,7
+74,7
@@
static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
strfcpy (group, line, len);
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, group)) == NULL) {
data =
strfcpy (group, line, len);
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, group)) == NULL) {
data =
- (NNTP_DATA *) safe_calloc (1, sizeof (NNTP_DATA) +
safe
_strlen (group) + 1);
+ (NNTP_DATA *) safe_calloc (1, sizeof (NNTP_DATA) +
mutt
_strlen (group) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
@@
-125,7
+125,7
@@
static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
data->lastMessage = data->entries[x - 1].last;
data->num = x;
mutt_newsgroup_stat (data);
data->lastMessage = data->entries[x - 1].last;
data->num = x;
mutt_newsgroup_stat (data);
- d
print (2, (debugfile, "parse_line:
Newsgroup %s\n", data->group));
+ d
ebug_print (2, ("
Newsgroup %s\n", data->group));
return 0;
}
return 0;
}
@@
-205,7
+205,7
@@
static int nntp_parse_cacheindex (NNTP_SERVER * news)
return 0;
rewind (index);
while (fgets (buf, sizeof (buf), index)) {
return 0;
rewind (index);
while (fgets (buf, sizeof (buf), index)) {
- buf[
safe
_strlen (buf) - 1] = 0; /* strip ending '\n' */
+ buf[
mutt
_strlen (buf) - 1] = 0; /* strip ending '\n' */
if (!safe_strncmp (buf, "#: ", 3) &&
!safe_strcasecmp (buf + 3, news->conn->account.host))
break;
if (!safe_strncmp (buf, "#: ", 3) &&
!safe_strcasecmp (buf + 3, news->conn->account.host))
break;
@@
-217,10
+217,10
@@
static int nntp_parse_cacheindex (NNTP_SERVER * news)
if (!*cp)
continue;
cp[0] = 0;
if (!*cp)
continue;
cp[0] = 0;
- if (!
safe
_strcmp (buf, "#:"))
+ if (!
mutt
_strcmp (buf, "#:"))
break;
sscanf (cp + 1, "%s %d %d", file, &l, &m);
break;
sscanf (cp + 1, "%s %d %d", file, &l, &m);
- if (!
safe
_strcmp (buf, "ALL")) {
+ if (!
mutt
_strcmp (buf, "ALL")) {
news->cache = safe_strdup (file);
news->newgroups_time = m;
}
news->cache = safe_strdup (file);
news->newgroups_time = m;
}
@@
-228,7
+228,7
@@
static int nntp_parse_cacheindex (NNTP_SERVER * news)
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, buf)) == NULL) {
data =
(NNTP_DATA *) safe_calloc (1,
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, buf)) == NULL) {
data =
(NNTP_DATA *) safe_calloc (1,
- sizeof (NNTP_DATA) +
safe
_strlen (buf) + 1);
+ sizeof (NNTP_DATA) +
mutt
_strlen (buf) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, buf);
data->nserv = news;
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, buf);
data->nserv = news;
@@
-343,7
+343,7
@@
NNTP_SERVER *mutt_select_newsserver (char *server)
return NULL;
}
return NULL;
}
- buf = p = safe_calloc (
safe
_strlen (server) + 10, sizeof (char));
+ buf = p = safe_calloc (
mutt
_strlen (server) + 10, sizeof (char));
if (url_check_scheme (server) == U_UNKNOWN) {
strcpy (buf, "nntp://");
p = strchr (buf, '\0');
if (url_check_scheme (server) == U_UNKNOWN) {
strcpy (buf, "nntp://");
p = strchr (buf, '\0');
@@
-438,7
+438,7
@@
void nntp_get_status (CONTEXT * ctx, HEADER * h, char *group, int article)
if (!data) {
#ifdef DEBUG
if (group)
if (!data) {
#ifdef DEBUG
if (group)
- d
print (3, (debugfile,
"newsgroup %s not found\n", group));
+ d
ebug_print (3, (
"newsgroup %s not found\n", group));
#endif
return;
}
#endif
return;
}
@@
-512,8
+512,8
@@
static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
line = *buf + (*pline - line);
}
strcpy (line, data->group);
line = *buf + (*pline - line);
}
strcpy (line, data->group);
- len -=
safe
_strlen (line) + 1;
- line +=
safe
_strlen (line);
+ len -=
mutt
_strlen (line) + 1;
+ line +=
mutt
_strlen (line);
*line++ = data->subscribed ? ':' : '!';
*line++ = ' ';
*line = '\0';
*line++ = data->subscribed ? ':' : '!';
*line++ = ' ';
*line = '\0';
@@
-645,8
+645,8
@@
int mutt_newsrc_update (NNTP_SERVER * news)
if (!data || !data->rc)
continue;
nntp_create_newsrc_line (data, &buf, &line, &llen);
if (!data || !data->rc)
continue;
nntp_create_newsrc_line (data, &buf, &line, &llen);
- d
print (2, (debugfile, "Added to newsrc: %s
", line));
- line +=
safe
_strlen (line);
+ d
ebug_print (2, ("Added to newsrc: %s\n
", line));
+ line +=
mutt
_strlen (line);
}
/* newrc being fully rewritten */
if (news->newsrc &&
}
/* newrc being fully rewritten */
if (news->newsrc &&
@@
-672,7
+672,7
@@
static FILE *mutt_mkname (char *s)
return fp;
nntp_cache_expand (buf, "cache-XXXXXX");
return fp;
nntp_cache_expand (buf, "cache-XXXXXX");
- pc = buf +
safe
_strlen (buf) - 12; /* positioning to "cache-XXXXXX" */
+ pc = buf +
mutt
_strlen (buf) - 12; /* positioning to "cache-XXXXXX" */
if ((fd = mkstemp (buf)) == -1)
return NULL;
strcpy (s, pc); /* generated name */
if ((fd = mkstemp (buf)) == -1)
return NULL;
strcpy (s, pc); /* generated name */
@@
-716,7
+716,7
@@
void nntp_clear_cacheindex (NNTP_SERVER * news)
if (!data || data->subscribed || !data->cache)
continue;
nntp_delete_cache (data);
if (!data || data->subscribed || !data->cache)
continue;
nntp_delete_cache (data);
- d
print (2, (debugfile,
"Removed from .index: %s\n", data->group));
+ d
ebug_print (2, (
"Removed from .index: %s\n", data->group));
}
return;
}
}
return;
}
@@
-879,7
+879,7
@@
NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
return NULL;
if (!(data = (NNTP_DATA *) hash_find (news->newsgroups, group))) {
data =
return NULL;
if (!(data = (NNTP_DATA *) hash_find (news->newsgroups, group))) {
data =
- (NNTP_DATA *) safe_calloc (1, sizeof (NNTP_DATA) +
safe
_strlen (group) + 1);
+ (NNTP_DATA *) safe_calloc (1, sizeof (NNTP_DATA) +
mutt
_strlen (group) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
@@
-972,7
+972,7
@@
void nntp_buffy (char *s)
if (data && data->subscribed && data->unread) {
if (Context && Context->magic == M_NNTP &&
if (data && data->subscribed && data->unread) {
if (Context && Context->magic == M_NNTP &&
- !
safe
_strcmp (data->group, ((NNTP_DATA *) Context->data)->group)) {
+ !
mutt
_strcmp (data->group, ((NNTP_DATA *) Context->data)->group)) {
unsigned int i, unread = 0;
for (i = 0; i < Context->msgcount; i++)
unsigned int i, unread = 0;
for (i = 0; i < Context->msgcount; i++)