Protocol labels for in-out messages.

svn path=/trunk/; revision=646

4 files changed, 8 insertions, 8 deletions

diff --git a/driver.c b/driver.c
index 545dabfc..5dc22f9c 100644
--- a/driver.c
+++ b/driver.c
@@ -1154,7 +1154,7 @@ va_dcl {
 	if (shroud && (cp = strstr(buf, shroud)))
 	    memset(cp, '*', strlen(shroud));
 	buf[strlen(buf)-1] = '\0';
-	error(0, 0, "> %s", buf);
+	error(0, 0, "%s> %s", protocol->name, buf);
     }
 }
 
@@ -1196,7 +1196,7 @@ va_dcl {
       if (shroud && (cp = strstr(buf, shroud)))
 	  memset(cp, '*', strlen(shroud));
       buf[strlen(buf)-1] = '\0';
-      error(0, 0, "> %s", buf);
+      error(0, 0, "%s> %s", protocol->name, buf);
   }
 
   /* we presume this does its own response echoing */
diff --git a/imap.c b/imap.c
index fc9634d1..7887453c 100644
--- a/imap.c
+++ b/imap.c
@@ -29,7 +29,7 @@ int imap_ok (FILE *sockfp,  char *argbuf)
 	    return(PS_SOCKET);
 
 	if (outlevel == O_VERBOSE)
-	    error(0, 0, "< %s", buf);
+	    error(0, 0, "IMAP< %s", buf);
 
 	/* interpret untagged status responses */
 	if (strstr(buf, "EXISTS"))
@@ -123,7 +123,7 @@ static int imap_getsizes(FILE *sockfp, int count, int *sizes)
 	int num, size;
 
 	if (outlevel == O_VERBOSE)
-	    error(0, 0, "< %s", buf);
+	    error(0, 0, "IMAP< %s", buf);
 	if (strstr(buf, "OK"))
 	    break;
 	else if (sscanf(buf, "* %d FETCH (RFC822.SIZE %d)", &num, &size) == 2)
diff --git a/pop2.c b/pop2.c
index 3fc40ede..32cba243 100644
--- a/pop2.c
+++ b/pop2.c
@@ -25,7 +25,7 @@ int pop2_ok (FILE *sockfp, char *argbuf)
     pound_arg = equal_arg = -1;
     if (SockGets(buf, sizeof(buf), sockfp) >= 0) {
 	if (outlevel == O_VERBOSE)
-	    error(0, 0, "< %s", buf);
+	    error(0, 0, "POP2< %s", buf);
 
 	if (buf[0] == '+')
 	    ok = 0;
diff --git a/pop3.c b/pop3.c
index fac92dc3..fb621a33 100644
--- a/pop3.c
+++ b/pop3.c
@@ -32,7 +32,7 @@ int pop3_ok (FILE *sockfp, char *argbuf)
 
     if (SockGets(buf, sizeof(buf), sockfp) >= 0) {
 	if (outlevel == O_VERBOSE)
-	    error(0, 0, "< %s", buf);
+	    error(0, 0, "POP3< %s", buf);
 
 	bufp = buf;
 	if (*bufp == '+' || *bufp == '-')
@@ -168,7 +168,7 @@ static int pop3_getrange(FILE *sockfp, struct query *ctl, int*countp, int*newp)
  		while (SockGets(buf, sizeof(buf), sockfp) >= 0)
 		{
  		    if (outlevel == O_VERBOSE)
-			error(0, 0, "< %s", buf);
+			error(0, 0, "POP3< %s", buf);
  		    if (buf[0] == '.')
  			break;
  		    else if (sscanf(buf, "%d %s", &num, id) == 2)
@@ -201,7 +201,7 @@ static int pop3_getsizes(FILE *sockfp, int count, int *sizes)
 	    int num, size;
 
 	    if (outlevel == O_VERBOSE)
-		error(0, 0, "< %s", buf);
+		error(0, 0, "POP3< %s", buf);
 	    if (buf[0] == '.')
 		break;
 	    else if (sscanf(buf, "%d %d", &num, &size) == 2)