cli: change the data structure for notmuch address deduplication

[notmuch] / test / smtp-dummy.c

diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
index 133d6c4eea3bfc43df4780d8d777e2dbbd2fdbbd..bb136687b2fd31a29775d3a25550c1f795ec034a 100644 (file)
--- a/test/smtp-dummy.c
+++ b/test/smtp-dummy.c
@@ -37,7 +37,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <netinet/ip.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <netdb.h>
 #include <unistd.h>
 
@@ -71,7 +73,7 @@ static int
 process_command (FILE *peer, FILE *output, const char *command)
 {
        if (STRNCMP_LITERAL (command, "EHLO ") == 0) {
-               fprintf (peer, "502\r\n");
+               fprintf (peer, "502 not implemented\r\n");
                fflush (peer);
        } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
                fprintf (peer, "250 localhost\r\n");
@@ -117,6 +119,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
 int
 main (int argc, char *argv[])
 {
+       const char * progname;
        char *output_filename;
        FILE *peer_file, *output;
        int sock, peer, err;
@@ -124,10 +127,32 @@ main (int argc, char *argv[])
        struct hostent *hostinfo;
        socklen_t peer_addr_len;
        int reuse;
+       int background;
+
+       progname = argv[0];
+
+       background = 0;
+       for (; argc >= 2; argc--, argv++) {
+               if (argv[1][0] != '-')
+                       break;
+               if (strcmp (argv[1], "--") == 0) {
+                       argc--;
+                       argv++;
+                       break;
+               }
+               if (strcmp (argv[1], "--background") == 0) {
+                       background = 1;
+                       continue;
+               }
+               fprintf(stderr, "%s: unregognized option '%s'\n",
+                       progname, argv[1]);
+               return 1;
+       }
 
        if (argc != 2) {
-               fprintf (stderr, "Usage: %s <output-file>\n", argv[0]);
-               exit (1);
+               fprintf (stderr,
+                        "Usage: %s [--background] <output-file>\n", progname);
+               return 1;
        }
 
        output_filename = argv[1];
@@ -135,14 +160,14 @@ main (int argc, char *argv[])
        if (output == NULL) {
                fprintf (stderr, "Failed to open %s for writing: %s\n",
                         output_filename, strerror (errno));
-               exit (1);
+               return 1;
        }
 
        sock = socket (AF_INET, SOCK_STREAM, 0);
        if (sock == -1) {
                fprintf (stderr, "Error: socket() failed: %s\n",
                         strerror (errno));
-               exit (1);
+               return 1;
        }
 
        reuse = 1;
@@ -150,15 +175,16 @@ main (int argc, char *argv[])
        if (err) {
                fprintf (stderr, "Error: setsockopt() failed: %s\n",
                         strerror (errno));
-               exit (1);
+               return 1;
        }
 
        hostinfo = gethostbyname ("localhost");
        if (hostinfo == NULL) {
                fprintf (stderr, "Unknown host: localhost\n");
-               exit (1);
+               return 1;
        }
 
+       memset (&addr, 0, sizeof (addr));
        addr.sin_family = AF_INET;
        addr.sin_port = htons (25025);
        addr.sin_addr = *(struct in_addr *) hostinfo->h_addr;
@@ -167,7 +193,7 @@ main (int argc, char *argv[])
                fprintf (stderr, "Error: bind() failed: %s\n",
                         strerror (errno));
                close (sock);
-               exit (1);
+               return 1;
        }
 
        err = listen (sock, 1);
@@ -175,7 +201,37 @@ main (int argc, char *argv[])
                fprintf (stderr, "Error: listen() failed: %s\n",
                         strerror (errno));
                close (sock);
-               exit (1);
+               return 1;
+       }
+
+       if (background) {
+               int pid = fork ();
+               if (pid > 0) {
+                       printf ("smtp_dummy_pid='%d'\n", pid);
+                       fflush (stdout);
+                       close (sock);
+                       return 0;
+               }
+               if (pid < 0) {
+                       fprintf (stderr, "Error: fork() failed: %s\n",
+                                strerror (errno));
+                       close (sock);
+                       return 1;
+               }
+               /* Reached if pid == 0 (the child process). */
+               /* Close stdout so that the one interested in pid value will
+                  also get EOF. */
+               close (STDOUT_FILENO);
+               /* dup2() will re-reserve fd of stdout (1) (opportunistically),
+                  in case fd of stderr (2) is open. If that was not open we
+                  don't care fd of stdout (1) either. */
+               dup2 (STDERR_FILENO, STDOUT_FILENO);
+
+               /* This process is now out of reach of shell's job control.
+                  To resolve the rare but possible condition where this
+                  "daemon" is started but never connected this process will
+                  (only) have 30 seconds to exist. */
+               alarm (30);
        }
 
        peer_addr_len = sizeof (peer_addr);
@@ -183,14 +239,14 @@ main (int argc, char *argv[])
        if (peer == -1) {
                fprintf (stderr, "Error: accept() failed: %s\n",
                         strerror (errno));
-               exit (1);
+               return 1;
        }
 
        peer_file = fdopen (peer, "w+");
        if (peer_file == NULL) {
                fprintf (stderr, "Error: fdopen() failed: %s\n",
                         strerror (errno));
-               exit (1);
+               return 1;
        }
 
        do_smtp_to_file (peer_file, output);