Added support for reporting the sender and recipients in mailq.

2 files changed, 13 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index fad1528..f5c9027 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ This file lists all the major user-visible changes to nullmailer.
 -------------------------------------------------------------------------------
 Changes in version 1.04
 
+- Added support for reporting the sender and recipients in mailq.
+
 - Added a send timeout in nullmailer-send, to kill sending messages that
   stall.
 
diff --git a/src/mailq.cc b/src/mailq.cc
index 77ae525..b227aad 100644
--- a/src/mailq.cc
+++ b/src/mailq.cc
@@ -23,6 +23,7 @@
 #include "defines.h"
 #include "fdbuf/fdbuf.h"
 #include "itoa.h"
+#include "mystring/mystring.h"
 #include <dirent.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ -33,6 +34,8 @@
 
 int main(int, char*[])
 {
+  mystring line;
+
   if(chdir(QUEUE_MSG_DIR))
     fail("Cannot change directory to queue.");
   DIR* dir = opendir(QUEUE_MSG_DIR);
@@ -52,7 +55,14 @@ int main(int, char*[])
       fout << "?????";
     else
       fout << itoa(statbuf.st_size);
-    fout << " bytes" << endl;
+    fout << " bytes";
+    fdibuf in(name);
+    if (in.getline(line)) {
+      fout << " from <" << line << '>';
+      while (in.getline(line) && !!line)
+	fout << "\n  to <" << line << '>';
+    }
+    fout << endl;
   }
   closedir(dir);
   return 0;