test-sendfiles: Feed `lzma -cd' stdin rather than a filename.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 8d54e021980432569cac3495c9da9a9d90aa214c..ca6599e0352e3e69e54725ee2def76e31dc3738b 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -27,7 +27,7 @@ static netsec_context *nsc = NULL;
 static int command(const char *, ...);
 static int multiline(void);
 
 static int command(const char *, ...);
 static int multiline(void);
 

-static int traverse (int (*)(char *), const char *, ...);
+static int traverse (int (*)(void *, char *), void *closure, const char *, ...);

 static int vcommand(const char *, va_list);
 static int pop_getline (char *, int, netsec_context *);
 static int pop_sasl_callback(enum sasl_message_type, unsigned const char *,
 static int vcommand(const char *, va_list);
 static int pop_getline (char *, int, netsec_context *);
 static int pop_sasl_callback(enum sasl_message_type, unsigned const char *,


@@ -481,14 +481,14 @@ pop_stat (int *nmsgs, int *nbytes)
 
 
 int
 
 
 int

-pop_retr (int msgno, int (*action)(char *))
+pop_retr (int msgno, int (*action)(void *, char *), void *closure)

 {
 {

-    return traverse (action, "RETR %d", msgno);
+    return traverse (action, closure, "RETR %d", msgno);

 }
 
 
 static int
 }
 
 
 static int

-traverse (int (*action)(char *), const char *fmt, ...)
+traverse (int (*action)(void *, char *), void *closure, const char *fmt, ...)

 {
     int result, snoopstate;
     va_list ap;
 {
     int result, snoopstate;
     va_list ap;


@@ -505,21 +505,21 @@ traverse (int (*action)(char *), const char *fmt, ...)
     if ((snoopstate = netsec_get_snoop(nsc)))
        netsec_set_snoop(nsc, 0);
 
     if ((snoopstate = netsec_get_snoop(nsc)))
        netsec_set_snoop(nsc, 0);
 

-    for (;;)
-       switch (multiline ()) {
-           case NOTOK: 
-               netsec_set_snoop(nsc, snoopstate);
-               return NOTOK;
-
-           case DONE: 
-               strncpy (response, buffer, sizeof(response));
-               netsec_set_snoop(nsc, snoopstate);
-               return OK;
+    for (;;) {
+        result = multiline();
+        if (result == OK) {
+            result = (*action)(closure, response);
+            if (result == OK)
+                continue;
+        } else if (result == DONE) {
+            strncpy(response, buffer, sizeof(response));
+            result = OK;
+        }
+        break;
+    }

 
 

-           case OK: 
-               (*action) (response);
-               break;
-       }
+    netsec_set_snoop(nsc, snoopstate);
+    return result;

 }
 
 
 }