projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Released nmh 1.3-RC2
[mmh]
/
uip
/
popsbr.c
diff --git
a/uip/popsbr.c
b/uip/popsbr.c
index
9d5f312
..
8e14d52
100644
(file)
--- a/
uip/popsbr.c
+++ b/
uip/popsbr.c
@@
-104,9
+104,9
@@
static int pop_auth_sasl(char *, char *, char *);
static int sasl_fgetc(FILE *);
#endif /* CYRUS_SASL */
static int sasl_fgetc(FILE *);
#endif /* CYRUS_SASL */
-static int traverse (int (*)(), const char *, ...);
+static int traverse (int (*)(char *), const char *, ...);
static int vcommand(const char *, va_list);
static int vcommand(const char *, va_list);
-static int getline (char *, int, FILE *);
+static int sasl_getline (char *, int, FILE *);
static int putline (char *, FILE *);
static int putline (char *, FILE *);
@@
-455,7
+455,7
@@
parse_proxy(char *proxy, char *host)
int pargc = 2;
int hlen = strlen(host);
int plen = 1;
int pargc = 2;
int hlen = strlen(host);
int plen = 1;
- char *cur, *pro;
+ unsigned char *cur, *pro;
char *c;
/* skip any initial space */
char *c;
/* skip any initial space */
@@
-597,7
+597,7
@@
pop_init (char *host, char *user, char *pass, char *proxy, int snoop,
SIGNAL (SIGPIPE, SIG_IGN);
SIGNAL (SIGPIPE, SIG_IGN);
- switch (getline (response, sizeof response, input)) {
+ switch (sasl_getline (response, sizeof response, input)) {
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
@@
-823,7
+823,7
@@
pop_list (int msgno, int *nmsgs, int *msgs, int *bytes)
int
int
-pop_retr (int msgno, int (*action)())
+pop_retr (int msgno, int (*action)(char *))
{
#ifndef NNTP
return traverse (action, "RETR %d", (targ_t) msgno);
{
#ifndef NNTP
return traverse (action, "RETR %d", (targ_t) msgno);
@@
-834,7
+834,7
@@
pop_retr (int msgno, int (*action)())
static int
static int
-traverse (int (*action)(), const char *fmt, ...)
+traverse (int (*action)(char *), const char *fmt, ...)
{
int result;
va_list ap;
{
int result;
va_list ap;
@@
-895,7
+895,7
@@
pop_rset (void)
int
int
-pop_top (int msgno, int lines, int (*action)())
+pop_top (int msgno, int lines, int (*action)(char *))
{
#ifndef NNTP
return traverse (action, "TOP %d %d", (targ_t) msgno, (targ_t) lines);
{
#ifndef NNTP
return traverse (action, "TOP %d %d", (targ_t) msgno, (targ_t) lines);
@@
-928,20
+928,20
@@
pop_xtnd (int (*action)(), char *fmt, ...)
snprintf (buffer, sizeof(buffer), fmt, a, b, c, d);
ap = brkstring (buffer, " ", "\n"); /* a hack, i know... */
snprintf (buffer, sizeof(buffer), fmt, a, b, c, d);
ap = brkstring (buffer, " ", "\n"); /* a hack, i know... */
- if (!strcasecmp(ap[0], "x-bboards")) { /* XTND "X-BBOARDS group */
+ if (!mh_strcasecmp(ap[0], "x-bboards")) { /* XTND "X-BBOARDS group */
/* most of these parameters are meaningless under NNTP.
* bbc.c was modified to set AKA and LEADERS as appropriate,
* the rest are left blank.
*/
return OK;
}
/* most of these parameters are meaningless under NNTP.
* bbc.c was modified to set AKA and LEADERS as appropriate,
* the rest are left blank.
*/
return OK;
}
- if (!strcasecmp (ap[0], "archive") && ap[1]) {
+ if (!mh_strcasecmp (ap[0], "archive") && ap[1]) {
snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */
xtnd_last = 0;
xtnd_first = 1; /* setup to fail in pop_stat */
return OK;
}
snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */
xtnd_last = 0;
xtnd_first = 1; /* setup to fail in pop_stat */
return OK;
}
- if (!strcasecmp (ap[0], "bboards")) {
+ if (!mh_strcasecmp (ap[0], "bboards")) {
if (ap[1]) { /* XTND "BBOARDS group" */
snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */
if (ap[1]) { /* XTND "BBOARDS group" */
snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */
@@
-1041,7
+1041,7
@@
vcommand (const char *fmt, va_list ap)
fprintf(stderr, "(decrypted) ");
#endif /* CYRUS_SASL */
fprintf(stderr, "(decrypted) ");
#endif /* CYRUS_SASL */
- switch (getline (response, sizeof response, input)) {
+ switch (sasl_getline (response, sizeof response, input)) {
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
@@
-1072,7
+1072,7
@@
multiline (void)
{
char buffer[BUFSIZ + TRMLEN];
{
char buffer[BUFSIZ + TRMLEN];
- if (getline (buffer, sizeof buffer, input) != OK)
+ if (sasl_getline (buffer, sizeof buffer, input) != OK)
return NOTOK;
#ifdef DEBUG
if (poprint) {
return NOTOK;
#ifdef DEBUG
if (poprint) {
@@
-1101,7
+1101,7
@@
multiline (void)
*/
static int
*/
static int
-getline (char *s, int n, FILE *iop)
+sasl_getline (char *s, int n, FILE *iop)
{
int c;
char *p;
{
int c;
char *p;