Removing data-queue content from git

diff --git a/.gitignore b/.gitignore
index e95ada7bc767b848274b45c4a385d14fef5ceccd..ca7a379cd484e1e58873c7a96c3bd6e1abc332f9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 test_area/
+data-feed/
 *.swp
 lib/numver.h

diff --git a/app/sender.c b/app/sender.c
index 0efa306e3ed33e79323f82de8bcfb8acfc93f5ae..620518223dba214b87ad8282798433452b5a6010 100644 (file)
--- a/app/sender.c
+++ b/app/sender.c
@@ -22,6 +22,34 @@
 
 #define SENDER  "sender"        //application name
 
+/*
+\f
+*/
+/********************************************************/
+/*                                                     */
+/*     procedure to dispatch email                     */
+/*                                                     */
+/********************************************************/
+static _Bool dispatcher(TRATYP **tra)
+
+{
+_Bool status;
+
+status=false;
+if (tra!=(TRATYP **)0) {
+  TRATYP **ptr;
+
+  ptr=tra;
+  while (*ptr!=(TRATYP *)0) {
+    (void) eml_dumptra((FILE *)0,*ptr);
+    ptr++;
+    }
+  }
+return status;
+}
+/*
+\f
+*/
 /********************************************************/
 /*                                                     */
 /*     procedure to scan all files                     */
@@ -33,10 +61,14 @@ static _Bool scantodo(char *fname)
 #define OPEP    "sorter.c:scantodo,"
 
 _Bool status;
+FILE *qfile;
+TRATYP **tra;
 int phase;
 _Bool proceed;
 
 status=false;
+qfile=(FILE *)0;
+tra=(TRATYP **)0;
 phase=0;
 proceed=true;
 while (proceed==true) {
@@ -48,8 +80,27 @@ while (proceed==true) {
         }
       break;
     case 1      :       //Building the "trans" list
+      if ((qfile=eml_openqfile(fname,EXDOING))==(FILE *)0) {
+        (void) rou_alert(0,"%s Unable to open file <%s.%s>",OPEP,fname,EXDOING);
+        phase=999;      //No need to go further
+        }
+      break;
+    case 2      :       //reading the todo file
+      tra=eml_scanqfile(tra,qfile);
+      (void) eml_closeqfile(qfile);
+      if (tra!=(TRATYP **)0) { //No record found
+        (void) rou_alert(0,"%s No transport directive within <%s.%s> (Bug?)",
+                            OPEP,fname,EXDOING); 
+        phase=999;
+        }
+      break;
+    case 3      :       //dispatching email
+      if (dispatcher(tra)==false) {       //trouble backtracking file
+        (void)eml_renameqfile(fname,EXDONE,EXTODO);
+        phase=999;      //No need to go further
+        }
       break;
-    case 2      :       //job completed
+    case 4      :       //job completed
       if (eml_renameqfile(fname,EXDOING,EXDONE)==false) {
         (void) rou_alert(0,"%s Unable to rename file <%s.%s>",OPEP,fname,EXDONE);
         phase=999;      //No need to go further

diff --git a/app/sorter.c b/app/sorter.c
index c6a335e6e12ed80c684ca85af3e3e9400c75293c..0a3f5f09cddae59a9fc42adc2aac484728143234 100644 (file)
--- a/app/sorter.c
+++ b/app/sorter.c
@@ -57,7 +57,7 @@ while (proceed==true) {
           FILE *qfile;
 
           (void) rou_alert(0,"%s fame=<%s>",OPEP,*ptr);
-          if ((qfile=eml_openqfile(*ptr))!=(FILE *)0) {
+          if ((qfile=eml_openqfile(*ptr,(const char *)0))!=(FILE *)0) {
             trans=eml_scanqfile(trans,qfile);
             (void) eml_closeqfile(qfile);
             (void) eml_deleteqfile(*ptr);

diff --git a/data-queue/24634-20250519065528-0893-0000 b/data-queue/24634-20250519065528-0893-0000
deleted file mode 100644 (file)
index da06980..0000000
--- a/data-queue/24634-20250519065528-0893-0000
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: Very Simple email contents
-
-FIRST Line
-SECOND Line
-LAST Line
-
-.

diff --git a/data-queue/24634-20250519065528-0893-0000.trans b/data-queue/24634-20250519065528-0893-0000.trans
deleted file mode 100644 (file)
index e883f2c..0000000
--- a/data-queue/24634-20250519065528-0893-0000.trans
+++ /dev/null
@@ -1,4 +0,0 @@
-L 1747652129 0 24634-20250519065528-0893-0000 postmaster@example.com webmaster@example.com
-R 1747652129 0 24634-20250519065528-0893-0000 postmaster@example.com dom1user1@subdom1.example.com
-R 1747652129 0 24634-20250519065528-0893-0000 postmaster@example.com dom2user1@subdom2.example.com
-R 1747652129 0 24634-20250519065528-0893-0000 postmaster@example.com dom2user2@subdom2.example.com

diff --git a/data-queue/24643-20250519065530-0650-0000 b/data-queue/24643-20250519065530-0650-0000
deleted file mode 100644 (file)
index 5650b93..0000000
--- a/data-queue/24643-20250519065530-0650-0000
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: Second email contents
-
-SECOND FIRST Line
-SECOND SECOND Line
-SECOND LAST Line
-
-.

diff --git a/data-queue/24643-20250519065530-0650-0000.trans b/data-queue/24643-20250519065530-0650-0000.trans
deleted file mode 100644 (file)
index 8b85ccd..0000000
--- a/data-queue/24643-20250519065530-0650-0000.trans
+++ /dev/null
@@ -1,4 +0,0 @@
-R 1747652131 0 24643-20250519065530-0650-0000 webmaster@example.com dom1user1@subdom1.example.com
-R 1747652131 0 24643-20250519065530-0650-0000 webmaster@example.com dom1user2@subdom1.example.com
-R 1747652131 0 24643-20250519065530-0650-0000 webmaster@example.com dom2user1@subdom2.example.com
-R 1747652131 0 24643-20250519065530-0650-0000 webmaster@example.com dom2user2@subdom2.example.com

diff --git a/data-queue/24649-20250519065532-0284-0000 b/data-queue/24649-20250519065532-0284-0000
deleted file mode 100644 (file)
index f4a7b86..0000000
--- a/data-queue/24649-20250519065532-0284-0000
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: Third email contents
-
-THIRD FIRST Line
-THIRD SECOND Line
-THIRD LAST Line
-
-.

diff --git a/data-queue/24649-20250519065532-0284-0000.trans b/data-queue/24649-20250519065532-0284-0000.trans
deleted file mode 100644 (file)
index 5a54423..0000000
--- a/data-queue/24649-20250519065532-0284-0000.trans
+++ /dev/null
@@ -1,4 +0,0 @@
-R 1747652132 0 24649-20250519065532-0284-0000 noreply@example.com dom1user1@subdom1.example.com
-R 1747652132 0 24649-20250519065532-0284-0000 noreply@example.com dom1user2@subdom1.example.com
-R 1747652132 0 24649-20250519065532-0284-0000 noreply@example.com dom2user1@subdom2.example.com
-R 1747652132 0 24649-20250519065532-0284-0000 noreply@example.com dom2user2@subdom2.example.com

diff --git a/data-queue/example.com-1747652224-0002.todo b/data-queue/example.com-1747652224-0002.todo
deleted file mode 100644 (file)
index 2e9bd5c..0000000
--- a/data-queue/example.com-1747652224-0002.todo
+++ /dev/null
@@ -1 +0,0 @@
-L,1747652129,0 24634-20250519065528-0893-0000 postmaster@example.com webmaster@example.com

diff --git a/data-queue/subdom1.example.com-1747652224-0000.todo b/data-queue/subdom1.example.com-1747652224-0000.todo
deleted file mode 100644 (file)
index 6f4e7ea..0000000
--- a/data-queue/subdom1.example.com-1747652224-0000.todo
+++ /dev/null
@@ -1,5 +0,0 @@
-R,1747652132,0 24649-20250519065532-0284-0000 noreply@example.com dom1user1@subdom1.example.com
-R,1747652132,0 24649-20250519065532-0284-0000 noreply@example.com dom1user2@subdom1.example.com
-R,1747652129,0 24634-20250519065528-0893-0000 postmaster@example.com dom1user1@subdom1.example.com
-R,1747652131,0 24643-20250519065530-0650-0000 webmaster@example.com dom1user1@subdom1.example.com
-R,1747652131,0 24643-20250519065530-0650-0000 webmaster@example.com dom1user2@subdom1.example.com

diff --git a/data-queue/subdom2.example.com-1747652224-0001.todo b/data-queue/subdom2.example.com-1747652224-0001.todo
deleted file mode 100644 (file)
index 4bf9286..0000000
--- a/data-queue/subdom2.example.com-1747652224-0001.todo
+++ /dev/null
@@ -1,6 +0,0 @@
-R,1747652132,0 24649-20250519065532-0284-0000 noreply@example.com dom2user1@subdom2.example.com
-R,1747652132,0 24649-20250519065532-0284-0000 noreply@example.com dom2user2@subdom2.example.com
-R,1747652129,0 24634-20250519065528-0893-0000 postmaster@example.com dom2user1@subdom2.example.com
-R,1747652129,0 24634-20250519065528-0893-0000 postmaster@example.com dom2user2@subdom2.example.com
-R,1747652131,0 24643-20250519065530-0650-0000 webmaster@example.com dom2user1@subdom2.example.com
-R,1747652131,0 24643-20250519065530-0650-0000 webmaster@example.com dom2user2@subdom2.example.com

diff --git a/lib/geseml.c b/lib/geseml.c
index 2564fdaf7957e3fa7903fac8ed01b214b8923699..2cf65dee8f27538ba0bdaa25a93dd23232a879e4 100644 (file)
--- a/lib/geseml.c
+++ b/lib/geseml.c
@@ -122,7 +122,7 @@ char line[300];
 
 (void) strcpy(line,"Empty");
 if (tra!=(TRATYP *)0) {
-  (void) snprintf(line,sizeof(line),"%c,%lu,%u %s %s %s",
+  (void) snprintf(line,sizeof(line),"%c %lu %u %s %s %s",
                                     tra->code,
                                     tra->date,
                                     tra->delay,

diff --git a/lib/unieml.c b/lib/unieml.c
index f93f1617b4300703b88986af0606852dcd01bd36..92c59425785b9a61e9846f041dca903fcf1ed04a 100644 (file)
--- a/lib/unieml.c
+++ b/lib/unieml.c
@@ -438,7 +438,7 @@ return dnames;
 /*      directory.                                      */
 /*                                                      */
 /********************************************************/
-PUBLIC FILE *eml_openqfile(char *qfilename)
+PUBLIC FILE *eml_openqfile(char *qfilename,const char *ext)
 
 {
 #define OPEP    "unieml.c:eml_openqfile,"
@@ -450,6 +450,10 @@ char fullname[300];
 qfile=(FILE *)0;
 dirname=rou_apppath(QDIR);
 (void) snprintf(fullname,sizeof(fullname),"%s/%s",dirname,qfilename);
+if ((ext!=(const char *)0)&&((strlen(fullname)+strlen(ext)+3)<sizeof(fullname))) {
+  (void) strcat(fullname,".");
+  (void) strcat(fullname,ext);
+  }
 if ((qfile=fopen(fullname,"r"))==(FILE *)0) {
   (void) rou_alert(0,"%s Unable to open file <%s> (error-<%s> bug?)",
                      OPEP,fullname,strerror(errno));

diff --git a/lib/unieml.h b/lib/unieml.h
index 5ed8f8ab06b3c81505adf41f80057035a7e9bb47..213b142469466874e988c6954b6f1a40e3b00068 100644 (file)
--- a/lib/unieml.h
+++ b/lib/unieml.h
@@ -86,7 +86,7 @@ extern int eml_closeqfile(FILE *qfile);
 extern char **eml_getqfilelist(char **dnames,char *ext);
 
 //procedure to open a specific qfile
-extern FILE *eml_openqfile(char *qfilename);
+extern FILE *eml_openqfile(char *qfilename,const char *ext);
 
 //procedure to check email address format
 //of an email address