X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2f8fe2f420c89ff5d5eaddc00abf910fbd518b1f..40fb2103c2986cbb91add4afed635886c4f87ae5:/lib-src/pop.c diff --git a/lib-src/pop.c b/lib-src/pop.c index 2cf8f9243f..adf80c544b 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -119,24 +119,24 @@ extern int h_errno; #endif #endif -#ifndef _P +#ifndef __P # ifdef __STDC__ -# define _P(a) a +# define __P(a) a # else -# define _P(a) () +# define __P(a) () # endif /* __STDC__ */ #endif /* ! __P */ -static int socket_connection _P((char *, int)); -static int pop_getline _P((popserver, char **)); -static int sendline _P((popserver, char *)); -static int fullwrite _P((int, char *, int)); -static int getok _P((popserver)); +static int socket_connection __P((char *, int)); +static int pop_getline __P((popserver, char **)); +static int sendline __P((popserver, char *)); +static int fullwrite __P((int, char *, int)); +static int getok __P((popserver)); #if 0 -static int gettermination _P((popserver)); +static int gettermination __P((popserver)); #endif -static void pop_trash _P((popserver)); -static char *find_crlf _P((char *, int)); +static void pop_trash __P((popserver)); +static char *find_crlf __P((char *, int)); #define ERROR_MAX 160 /* a pretty arbitrary size, but needs to be bigger than the original @@ -261,7 +261,7 @@ pop_open (host, username, password, flags) #else #define DONT_NEED_PASSWORD 0 #endif - + if ((! password) && (! DONT_NEED_PASSWORD)) { if (! (flags & POP_NO_GETPASS)) @@ -296,7 +296,7 @@ pop_open (host, username, password, flags) free ((char *) server); return (0); } - + server->file = sock; server->data = 0; server->buffer_index = 0; @@ -367,7 +367,7 @@ pop_stat (server, count, size) strcpy (pop_error, "In multi-line query in pop_stat"); return (-1); } - + if (sendline (server, "STAT") || (pop_getline (server, &fromserver) < 0)) return (-1); @@ -387,7 +387,7 @@ pop_stat (server, count, size) } *count = atoi (&fromserver[4]); - + fromserver = index (&fromserver[4], ' '); if (! fromserver) { @@ -560,7 +560,7 @@ pop_list (server, message, IDs, sizes) * of lines with '>'. * msg_buf Output parameter to which a buffer containing the * message is assigned. - * + * * Return value: The number of bytes in msg_buf, which may contain * embedded nulls, not including its final null, or -1 on error * with pop_error set. @@ -643,7 +643,7 @@ pop_retrieve (server, message, markfrom, msg_buf) free (ptr); return (-1); -} +} int pop_retrieve_first (server, message, response) @@ -896,7 +896,7 @@ pop_last (server) popserver server; { char *fromserver; - + if (server->in_multi) { strcpy (pop_error, "In multi-line query in pop_last"); @@ -1009,7 +1009,7 @@ static int have_winsock = 0; * Arguments: * host The host to which to connect. * flags Option flags. - * + * * Return value: A file descriptor indicating the connection, or -1 * indicating failure, in which case an error has been copied * into pop_error. @@ -1054,17 +1054,6 @@ socket_connection (host, flags) } #endif - do - { - hostent = gethostbyname (host); - try_count++; - if ((! hostent) && ((h_errno != TRY_AGAIN) || (try_count == 5))) - { - strcpy (pop_error, "Could not determine POP server's address"); - return (-1); - } - } while (! hostent); - bzero ((char *) &addr, sizeof (addr)); addr.sin_family = AF_INET; @@ -1112,9 +1101,20 @@ socket_connection (host, flags) strncat (pop_error, strerror (errno), ERROR_MAX - sizeof (POP_SOCKET_ERROR)); return (-1); - + } + do + { + hostent = gethostbyname (host); + try_count++; + if ((! hostent) && ((h_errno != TRY_AGAIN) || (try_count == 5))) + { + strcpy (pop_error, "Could not determine POP server's address"); + return (-1); + } + } while (! hostent); + while (*hostent->h_addr_list) { bcopy (*hostent->h_addr_list, (char *) &addr.sin_addr, @@ -1125,7 +1125,7 @@ socket_connection (host, flags) } #define CONNECT_ERROR "Could not connect to POP server: " - + if (! *hostent->h_addr_list) { CLOSESOCKET (sock); @@ -1133,7 +1133,7 @@ socket_connection (host, flags) strncat (pop_error, strerror (errno), ERROR_MAX - sizeof (CONNECT_ERROR)); return (-1); - + } #ifdef KERBEROS @@ -1157,7 +1157,7 @@ socket_connection (host, flags) if ((rem = krb5_auth_con_init (kcontext, &auth_context))) goto krb5error; - + if (rem = krb5_cc_default (kcontext, &ccdef)) goto krb5error; @@ -1215,7 +1215,7 @@ socket_connection (host, flags) CLOSESOCKET (sock); return (-1); } -#else /* ! KERBEROS5 */ +#else /* ! KERBEROS5 */ ticket = (KTEXT) malloc (sizeof (KTEXT_ST)); realhost = strdup (hostent->h_name); rem = krb_sendauth (0L, sock, ticket, "pop", realhost, @@ -1285,7 +1285,7 @@ pop_getline (server, line) found = server->buffer_index; data_used = (cp + 2) - server->buffer - found; - + *cp = '\0'; /* terminate the string to be returned */ server->data -= data_used; server->buffer_index += data_used; @@ -1354,7 +1354,7 @@ pop_getline (server, line) char *cp; server->data += ret; server->buffer[server->data] = '\0'; - + cp = find_crlf (server->buffer + search_offset, server->data - search_offset); if (cp) @@ -1461,7 +1461,7 @@ fullwrite (fd, buf, nbytes) * * Arguments: * server The server to read from. - * + * * Returns: 0 for success, else for failure and puts error in pop_error. * * Side effects: On failure, may make the connection unusable. @@ -1492,7 +1492,7 @@ getok (server) pop_trash (server); return (-1); } -} +} #if 0 /* @@ -1538,7 +1538,7 @@ gettermination (server) * Changes made to the maildrop since the session was started (or * since the last pop_reset) may be lost. */ -void +void pop_close (server) popserver server; { @@ -1607,3 +1607,6 @@ find_crlf (in_string, len) } #endif /* MAIL_USE_POP */ + +/* arch-tag: ceb37041-b7ad-49a8-a63d-286618b8367d + (do not change this comment) */