From baf92b3531e9dab6aa3a6222f8047e4e6b9cf0cf Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bmanners@krakenrobotics.com>
Date: Wed, 16 Sep 2020 20:57:40 -0400
Subject: [PATCH] SMTP65: Added prompt to allow user to hold or delete messages
 from OUTBOX

---
 apps/smtp65.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/apps/smtp65.c b/apps/smtp65.c
index 9e6ec59..4019569 100644
--- a/apps/smtp65.c
+++ b/apps/smtp65.c
@@ -23,7 +23,11 @@
 
 #include "email_common.h"
 
+#define BELL      7
 #define BACKSPACE 8
+#define NORMAL    0x0e
+#define INVERSE   0x0f
+#define CLRLINE   0x1a
 
 // Both pragmas are obligatory to have cc65 generate code
 // suitable to access the W5100 auto-increment registers.
@@ -497,11 +501,11 @@ void update_sent_mbox(char *name) {
 }
 
 void main(int argc, char *argv[]) {
-  static char sendbuf[80], recipients[160];
+  static char sendbuf[80], recipients[160], subject[80];
   uint8_t linecount;
   DIR *dp;
   struct dirent *d;
-  char *p, *q;
+  char *p, *q, c;
   uint8_t eth_init = ETH_INIT_DEFAULT, connected = 0;
 
   if ((argc == 2) && (strcmp(argv[1], "EMAIL") == 0))
@@ -580,6 +584,7 @@ void main(int argc, char *argv[]) {
       }
       ++linecount;
       if (!strncmp(linebuf, "To: ", 4) || (!strncmp(linebuf, "cc: ",4))) {
+        printf("%s", linebuf);
         linebuf[strlen(linebuf) - 1] = '\0'; // Chop off \r
         if (strlen(linebuf + 4) > 0) {
           if (strlen(recipients) > 0)
@@ -587,8 +592,53 @@ void main(int argc, char *argv[]) {
           strcat(recipients, linebuf + 4);
         }
       }
+      if (!strncmp(linebuf, "Subject: ", 9))
+        printf("%s", linebuf);
     }
 
+    printf("\n%cS)end message | H)old message in OUTBOX | D)elete message from OUTBOX           %c",
+           INVERSE, NORMAL);
+    while (1) {
+      c = cgetc();
+      switch (c) {
+      case 'S':
+      case 's':
+        goto sendmessage;
+      case 'H':
+      case 'h':
+        printf("\n  Holding message\n");
+        fclose(fp);
+        goto skiptonext;
+      case 'D':
+      case 'd':
+        printf("Sure? (y/n)");
+        while (1) {
+          c = cgetc();
+          switch (c) {
+          case 'Y':
+          case 'y':
+            putchar(CLRLINE);
+            printf("\n  Deleting message\n");
+            fclose(fp);
+            goto unlink;
+          case 'N':
+          case 'n':
+            putchar(CLRLINE);
+            printf("\n  Holding message\n");
+            fclose(fp);
+            goto skiptonext;
+          default:
+            putchar(BELL);
+          }
+        }
+        break;
+      default:
+        putchar(BELL);
+      }
+    }
+
+sendmessage:
+
     if (!connected) {
       printf("Connecting to %s   - ", cfg_smtp_server);
 
@@ -674,6 +724,8 @@ void main(int argc, char *argv[]) {
 
     printf("Removing from OUTBOX ...\n");
     sprintf(filename, "%s/OUTBOX/%s", cfg_emaildir, d->d_name);
+
+unlink:
     if (unlink(filename))
       printf("Can't remove %s\n", filename);
 
@@ -690,7 +742,7 @@ skiptonext:
     printf("Disconnecting\n");
     w5100_disconnect();
   } else
-    printf("\n** No messages in OUTBOX to send **\n");
+    printf("\n** No messages were sent **\n");
 
   confirm_exit();
 }