diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2000-01-17 02:18:39 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2000-01-17 02:18:39 +0000 |
| commit | f1fa3732087b628f3950c4624319257b02d4f8d7 (patch) | |
| tree | c304596b462128c21510ac5000b3b9a7822c8191 /pop3.c | |
| parent | 91edebd962aa90b42cb75b39064dd7e4e27841f1 (diff) | |
| download | fetchmail-f1fa3732087b628f3950c4624319257b02d4f8d7.tar.gz fetchmail-f1fa3732087b628f3950c4624319257b02d4f8d7.tar.bz2 fetchmail-f1fa3732087b628f3950c4624319257b02d4f8d7.zip | |
drive.c now tracks stage.
svn path=/trunk/; revision=2712
Diffstat (limited to 'pop3.c')
| -rw-r--r-- | pop3.c | 20 |
1 files changed, 1 insertions, 19 deletions
@@ -29,12 +29,6 @@ extern char *strstr(); /* needed on sysV68 R3V7.1. */ #endif /* strstr */ -static int pop3_phase; -#define PHASE_GETAUTH 0 -#define PHASE_GETRANGE 1 -#define PHASE_GETSIZES 2 -#define PHASE_FETCH 3 -#define PHASE_LOGOUT 4 static int last; #ifdef SDPS_ENABLE char *sdps_envfrom; @@ -75,7 +69,7 @@ int pop3_ok (int sock, char *argbuf) } else if (strncmp(buf,"-ERR", 4) == 0) { - if (pop3_phase > PHASE_GETAUTH) + if (stage > STAGE_GETAUTH) ok = PS_PROTOCOL; /* * We're checking for "lock busy", "unable to lock", @@ -126,8 +120,6 @@ int pop3_getauth(int sock, struct query *ctl, char *greeting) char *challenge; #endif /* OPIE_ENABLE */ - pop3_phase = PHASE_GETAUTH; - #ifdef SDPS_ENABLE /* * This needs to catch both demon.co.uk and demon.net. @@ -385,8 +377,6 @@ static int pop3_getrange(int sock, int ok; char buf [POPBUFSIZE+1]; - pop3_phase = PHASE_GETRANGE; - /* Ensure that the new list is properly empty */ ctl->newsaved = (struct idlist *)NULL; @@ -478,8 +468,6 @@ static int pop3_getsizes(int sock, int count, int *sizes) { int ok; - /* pop3_phase = PHASE_GETSIZES */ - if ((ok = gen_transact(sock, "LIST")) != 0) return(ok); else @@ -523,8 +511,6 @@ static int pop_fetch_headers(int sock, struct query *ctl,int number,int *lenp) int ok; char buf[POPBUFSIZE+1]; - /* pop3_phase = PHASE_FETCH */ - gen_send(sock, "TOP %d 0", number); if ((ok = pop3_ok(sock, buf)) != 0) return(ok); @@ -541,8 +527,6 @@ static int pop3_fetch(int sock, struct query *ctl, int number, int *lenp) int ok; char buf[POPBUFSIZE+1]; - /* pop3_phase = PHASE_FETCH */ - #ifdef SDPS_ENABLE /* * See http://www.demon.net/services/mail/sdps-tech.html @@ -631,8 +615,6 @@ static int pop3_logout(int sock, struct query *ctl) { int ok; - /* pop3_phase = PHASE_LOGOUT */ - ok = gen_transact(sock, "QUIT"); if (!ok) expunge_uids(ctl); |