From 4abd90075b95244f6c5d3c60ebbd38d7f0156f85 Mon Sep 17 00:00:00 2001 From: sperber Date: Tue, 21 Jan 2003 08:18:05 +0000 Subject: [PATCH] Remove "POP3-" prefix from various internal procedure names. --- scheme/lib/pop3.scm | 61 ++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/scheme/lib/pop3.scm b/scheme/lib/pop3.scm index b7921ab..2cd68e2 100644 --- a/scheme/lib/pop3.scm +++ b/scheme/lib/pop3.scm @@ -70,7 +70,7 @@ hostname)) ;; read the challenge the server sends in its welcome banner - (let* ((banner (pop3-read-response connection)) + (let* ((banner (read-response connection)) (match (regexp-search (rx (: "+OK " (* (~ #\<)) #\< (submatch (+ (~ #\>))) #\>)) banner)) @@ -108,8 +108,8 @@ ((pop3-connection-challenge connection) (pop3-apop-login connection login password)))) (lambda () - (pop3-send-command connection (build-command "USER" login)) - (pop3-send-command connection (build-command "PASS" password)) + (send-command connection (build-command "USER" login)) + (send-command connection (build-command "PASS" password)) (set-pop3-connection-login! connection login) (set-pop3-connection-password! connection password) (set-pop3-connection-state! connection 'connected)))))) @@ -143,36 +143,35 @@ (digest (number->string (md5-digest->number (md5-digest-for-string key)) 16)) - (status (pop3-send-command connection - (build-command "APOP" login digest)))) - (set-pop3-connection-login! connection login) - (set-pop3-connection-password! connection password) - (set-pop3-connection-state! connection 'connected) - status)) - + (status (send-command connection + (build-command "APOP" login digest)))) + (set-pop3-connection-login! connection login) + (set-pop3-connection-password! connection password) + (set-pop3-connection-state! connection 'connected) + status)) ;; return number of messages and number of bytes waiting at the maildrop (define (pop3-stat connection) - (pop3-check-transaction-state connection pop3-stat) - (let* ((response (pop3-send-command connection "STAT")) + (check-transaction-state connection pop3-stat) + (let* ((response (send-command connection "STAT")) (match (regexp-search (rx (posix-string "([0-9]+) ([0-9]+)")) response))) (values (string->number (match:substring match 1)) (string->number (match:substring match 2))))) (define (pop3-get connection msgid) - (pop3-check-transaction-state connection pop3-get) - (let* ((status (pop3-send-command connection - (build-command "RETR" (number->string msgid)))) + (check-transaction-state connection pop3-get) + (let* ((status (send-command connection + (build-command "RETR" (number->string msgid)))) (port (socket:inport (pop3-connection-command-socket connection))) (headers (read-rfc822-headers port read-crlf-line)) (body (multiline-response->lines port))) (values headers body))) (define (pop3-headers connection msgid) - (pop3-check-transaction-state connection pop3-headers) - (let* ((status (pop3-send-command connection - (build-command "TOP" (number->string msgid) "0"))) + (check-transaction-state connection pop3-headers) + (let* ((status (send-command connection + (build-command "TOP" (number->string msgid) "0"))) (port (socket:inport (pop3-connection-command-socket connection))) (headers (read-rfc822-headers port read-crlf-line))) (exhaust-multiline-response port) @@ -182,8 +181,8 @@ ;; ain't in the RFC, but seems to be supported by several servers. (define (pop3-last connection) - (pop3-check-transaction-state connection pop3-last) - (let ((response (pop3-send-command connection "LAST"))) + (check-transaction-state connection pop3-last) + (let ((response (send-command connection "LAST"))) (string->number (car ((infix-splitter) response))))) ;; mark the message number MSGID for deletion. Note that the messages @@ -191,21 +190,21 @@ ;; can be undeleted using the RSET command. (define (pop3-delete connection msgid) - (pop3-check-transaction-state connection pop3-delete) - (pop3-send-command connection (build-command "DELE" (number->string msgid))) + (check-transaction-state connection pop3-delete) + (send-command connection (build-command "DELE" (number->string msgid))) (values)) ;; any messages which have been marked for deletion are unmarked (define (pop3-reset connection) - (pop3-check-transaction-state connection pop3-reset) - (pop3-send-command connection "RSET") + (check-transaction-state connection pop3-reset) + (send-command connection "RSET") (values)) (define (pop3-quit connection) - (pop3-check-transaction-state connection pop3-quit) - (let ((status (pop3-send-command connection "QUIT"))) + (check-transaction-state connection pop3-quit) + (let ((status (send-command connection "QUIT"))) (close-socket (pop3-connection-command-socket connection)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -225,11 +224,11 @@ (define-condition-type 'pop3-error '(error)) (define pop3-error? (condition-predicate 'pop3-error)) -(define (pop3-check-transaction-state connection caller) +(define (check-transaction-state connection caller) (if (not (eq? (pop3-connection-state connection) 'connected)) (error "not in transaction state" caller))) -(define (pop3-read-response connection) +(define (read-response connection) (let* ((sock (pop3-connection-command-socket connection)) (in (socket:inport sock)) (line (read-crlf-line in))) @@ -237,7 +236,7 @@ line)) ;; this could perhaps be improved -(define (pop3-handle-response response command) +(define (handle-response response command) (let ((match (regexp-search (rx (posix-string "^\\+OK(.*)")) response))) (if match (match:substring match 1) @@ -255,13 +254,13 @@ (newline log) (force-output log))))) -(define (pop3-send-command connection command) +(define (send-command connection command) (let* ((sock (pop3-connection-command-socket connection)) (out (socket:outport sock))) (write-string command out) (write-crlf out) (pop3-log connection (string-append "<- " command)) - (pop3-handle-response (pop3-read-response connection) command))) + (handle-response (read-response connection) command))) (define (multiline-response->lines port) (let loop ((reverse-lines '()))