X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bc237bbae1393cacee9d534832a050f1148b0d8b..4a56a28ac:/uip/popsbr.c?ds=inline

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 16eba46d..8d54e021 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -1,5 +1,4 @@
-/*
- * popsbr.c -- POP client subroutines
+/* popsbr.c -- POP client subroutines
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -272,13 +271,13 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
 	    strncpy (buffer, response, sizeof(buffer));
 	    command ("QUIT");
 	    strncpy (response, buffer, sizeof(response));
-				/* and fall */
+	    /* FALLTHRU */
 
 	case NOTOK: 
 	case DONE: 
 	    if (poprint)	    
 		fprintf (stderr, "%s\n", response);
-	    netsec_shutdown(nsc, 1);
+	    netsec_shutdown(nsc);
 	    nsc = NULL;
 	    return NOTOK;
     }
@@ -481,58 +480,6 @@ pop_stat (int *nmsgs, int *nbytes)
 }
 
 
-int
-pop_list (int msgno, int *nmsgs, int *msgs, int *bytes)
-{
-    int i;
-    int *ids = NULL;
-
-    if (msgno) {
-	if (command ("LIST %d", msgno) == NOTOK)
-	    return NOTOK;
-	*msgs = *bytes = 0;
-	if (ids) {
-	    *ids = 0;
-	    sscanf (response, "+OK %d %d %d", msgs, bytes, ids);
-	}
-	else
-	    sscanf (response, "+OK %d %d", msgs, bytes);
-	return OK;
-    }
-
-    if (command ("LIST") == NOTOK)
-	return NOTOK;
-
-    for (i = 0; i < *nmsgs; i++)
-	switch (multiline ()) {
-	    case NOTOK: 
-		return NOTOK;
-	    case DONE: 
-		*nmsgs = ++i;
-		return OK;
-	    case OK: 
-		*msgs = *bytes = 0;
-		if (ids) {
-		    *ids = 0;
-		    sscanf (response, "%d %d %d",
-			    msgs++, bytes++, ids++);
-		}
-		else
-		    sscanf (response, "%d %d", msgs++, bytes++);
-		break;
-	}
-    for (;;)
-	switch (multiline ()) {
-	    case NOTOK: 
-		return NOTOK;
-	    case DONE: 
-		return OK;
-	    case OK: 
-		break;
-	}
-}
-
-
 int
 pop_retr (int msgno, int (*action)(char *))
 {
@@ -583,27 +530,6 @@ pop_dele (int msgno)
 }
 
 
-int
-pop_noop (void)
-{
-    return command ("NOOP");
-}
-
-
-int
-pop_rset (void)
-{
-    return command ("RSET");
-}
-
-
-int
-pop_top (int msgno, int lines, int (*action)(char *))
-{
-    return traverse (action, "TOP %d %d", msgno, lines);
-}
-
-
 int
 pop_quit (void)
 {
@@ -620,7 +546,7 @@ int
 pop_done (void)
 {
     if (nsc)
-	netsec_shutdown(nsc, 1);
+	netsec_shutdown(nsc);
 
     return OK;
 }
@@ -731,11 +657,11 @@ pop_getline (char *s, int n, netsec_context *ns)
      *
      * We get a length back from netsec_readline, but the rest of the POP
      * code doesn't handle it; the assumptions are that everything from
-     * the network can be respresented as C strings.  That should get fixed
+     * the network can be represented as C strings.  That should get fixed
      * someday.
      */
 
-    destlen = len < ((size_t) (n - 1)) ? len : (size_t) (n - 1);
+    destlen = min(len, (size_t)(n - 1));
 
     memcpy(s, p, destlen);
     s[destlen] = '\0';