From cc8ce247d5c81de71d4d744be86342d729a17c65 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 22 Jan 2008 15:36:05 +0000 Subject: [PATCH] (pop_stat, pop_last): Fix last fix. --- lib-src/pop.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/lib-src/pop.c b/lib-src/pop.c index 5dc5de75583..7b9b191add7 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -381,25 +381,18 @@ pop_stat (server, count, size) errno = 0; *count = strtol (&fromserver[4], &end_ptr, 10); /* Check validity of string-to-integer conversion. */ - if (fromserver[4] == 0 || *end_ptr != 0 || errno) + if (fromserver + 4 == end_ptr || *end_ptr != ' ' || errno) { strcpy (pop_error, "Unexpected response from POP server in pop_stat"); pop_trash (server); return (-1); } - fromserver = index (&fromserver[4], ' '); - if (! fromserver) - { - strcpy (pop_error, - "Badly formatted response from server in pop_stat"); - pop_trash (server); - return (-1); - } + fromserver = end_ptr; errno = 0; *size = strtol (fromserver + 1, &end_ptr, 10); - if (*(fromserver + 1) == 0 || *end_ptr != 0 || errno) + if (fromserver + 1 == end_ptr || errno) { strcpy (pop_error, "Unexpected response from POP server in pop_stat"); pop_trash (server); @@ -933,7 +926,7 @@ pop_last (server) int count; errno = 0; count = strtol (&fromserver[4], &end_ptr, 10); - if (fromserver[4] == 0 || *end_ptr != 0 || errno) + if (fromserver + 4 == end_ptr || errno) { strcpy (pop_error, "Unexpected response from server in pop_last"); pop_trash (server); -- 2.39.2