From: Jean-Marc Pigeon (Delson) Date: Tue, 13 May 2025 13:13:07 +0000 (-0400) Subject: Preparing Test files X-Git-Tag: tag-0.8~109 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=333f1d0eb67170ef55884e5ee59b70f67a0b8dcf;p=jmp%2Fmailleur Preparing Test files --- diff --git a/data-feed/feed00.tst b/data-feed/feed00.tst index a6873d8..eb22d71 100644 --- a/data-feed/feed00.tst +++ b/data-feed/feed00.tst @@ -67,3 +67,26 @@ R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... S:QUIT R:221 2.0.0 Bye, closing connection... #------------------------------------------------------------------------- +#prepare next test +#waiting 1 sec +C:WAIT 1 +#-restarting link +C:RESTART +R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... +S:MAIL FROM: +R:250 2.1.3 postmaster@example.com.. sender ok +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 duplicate recipients will be consolidated +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:501 5.6.0 <> recipient not specified +S:RCPT TO: +R:553 5.6.2 Missing domain part +S:RCPT TO: +R:553 5.6.2 ':' not allowed in email +#------------------------------------------------------------------------- +S:QUIT +R:221 2.0.0 Bye, closing connection... diff --git a/data-feed/feed01.tst b/data-feed/feed01.tst index 5ab46fe..957cd96 100644 --- a/data-feed/feed01.tst +++ b/data-feed/feed01.tst @@ -13,16 +13,10 @@ S:MAIL FROM: R:250 2.1.3 postmaster@example.com.. sender ok S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 duplicate recipients will be consolidated -S:RCPT TO: +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: -R:501 5.6.0 <> recipient not specified -S:RCPT TO: -R:553 5.6.2 Missing domain part -S:RCPT TO: -R:553 5.6.2 ':' not allowed in email #------------------------------------------------------------------------- #-sending data C:DATA @@ -33,6 +27,63 @@ SECOND Line LAST Line . +#------------------------------------------------------------------------- R:250 3.5.3 Message accepted for delivery S:QUIT R:221 2.0.0 Bye, closing connection... +#------------------------------------------------------------------------- +#prepare next test +#waiting 1 sec +C:WAIT 1 +#-restarting link +C:RESTART +R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... +S:MAIL FROM: +R:250 2.1.3 webmaster@example.com.. sender ok +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +#------------------------------------------------------------------------- +#-sending data +C:DATA +Subject: Second email contents + +SECOND FIRST Line +SECOND SECOND Line +SECOND LAST Line + +. +#------------------------------------------------------------------------- +R:250 3.5.3 Message accepted for delivery +S:QUIT +#------------------------------------------------------------------------- +#prepare next test +#waiting 1 sec +C:WAIT 1 +#-restarting link +C:RESTART +R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... +S:MAIL FROM: +R:250 2.1.3 noreply@example.com.. sender ok +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +#------------------------------------------------------------------------- +#-sending data +C:DATA +Subject: Third email contents + +THIRD FIRST Line +THIRD SECOND Line +THIRD LAST Line + +. +#------------------------------------------------------------------------- +R:250 3.5.3 Message accepted for delivery +S:QUIT diff --git a/data-feed/xxfeed.tst b/data-feed/xxfeed.tst index 5ab46fe..957cd96 100644 --- a/data-feed/xxfeed.tst +++ b/data-feed/xxfeed.tst @@ -13,16 +13,10 @@ S:MAIL FROM: R:250 2.1.3 postmaster@example.com.. sender ok S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 duplicate recipients will be consolidated -S:RCPT TO: +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: -R:501 5.6.0 <> recipient not specified -S:RCPT TO: -R:553 5.6.2 Missing domain part -S:RCPT TO: -R:553 5.6.2 ':' not allowed in email #------------------------------------------------------------------------- #-sending data C:DATA @@ -33,6 +27,63 @@ SECOND Line LAST Line . +#------------------------------------------------------------------------- R:250 3.5.3 Message accepted for delivery S:QUIT R:221 2.0.0 Bye, closing connection... +#------------------------------------------------------------------------- +#prepare next test +#waiting 1 sec +C:WAIT 1 +#-restarting link +C:RESTART +R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... +S:MAIL FROM: +R:250 2.1.3 webmaster@example.com.. sender ok +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +#------------------------------------------------------------------------- +#-sending data +C:DATA +Subject: Second email contents + +SECOND FIRST Line +SECOND SECOND Line +SECOND LAST Line + +. +#------------------------------------------------------------------------- +R:250 3.5.3 Message accepted for delivery +S:QUIT +#------------------------------------------------------------------------- +#prepare next test +#waiting 1 sec +C:WAIT 1 +#-restarting link +C:RESTART +R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... +S:MAIL FROM: +R:250 2.1.3 noreply@example.com.. sender ok +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +#------------------------------------------------------------------------- +#-sending data +C:DATA +Subject: Third email contents + +THIRD FIRST Line +THIRD SECOND Line +THIRD LAST Line + +. +#------------------------------------------------------------------------- +R:250 3.5.3 Message accepted for delivery +S:QUIT diff --git a/data-queue/32616-20250510195843-0505-0000 b/data-queue/22941-20250513091116-0801-0000 similarity index 100% rename from data-queue/32616-20250510195843-0505-0000 rename to data-queue/22941-20250513091116-0801-0000 diff --git a/data-queue/22941-20250513091116-0801-0000.trans b/data-queue/22941-20250513091116-0801-0000.trans new file mode 100644 index 0000000..06af57c --- /dev/null +++ b/data-queue/22941-20250513091116-0801-0000.trans @@ -0,0 +1,3 @@ +R 1747141877 0 22941-20250513091116-0801-0000 postmaster@example.com postmaster@example.com +R 1747141877 0 22941-20250513091116-0801-0000 postmaster@example.com user1@sub1.example.com +R 1747141877 0 22941-20250513091116-0801-0000 postmaster@example.com user2@sub2.example.com diff --git a/data-queue/22944-20250513091118-0476-0000 b/data-queue/22944-20250513091118-0476-0000 new file mode 100644 index 0000000..5650b93 --- /dev/null +++ b/data-queue/22944-20250513091118-0476-0000 @@ -0,0 +1,7 @@ +Subject: Second email contents + +SECOND FIRST Line +SECOND SECOND Line +SECOND LAST Line + +. diff --git a/data-queue/22944-20250513091118-0476-0000.trans b/data-queue/22944-20250513091118-0476-0000.trans new file mode 100644 index 0000000..3cf71c9 --- /dev/null +++ b/data-queue/22944-20250513091118-0476-0000.trans @@ -0,0 +1,3 @@ +R 1747141878 0 22944-20250513091118-0476-0000 webmaster@example.com postmaster@example.com +R 1747141878 0 22944-20250513091118-0476-0000 webmaster@example.com user1@sub1.example.com +R 1747141878 0 22944-20250513091118-0476-0000 webmaster@example.com user2@sub2.example.com diff --git a/data-queue/22947-20250513091120-0028-0000 b/data-queue/22947-20250513091120-0028-0000 new file mode 100644 index 0000000..f4a7b86 --- /dev/null +++ b/data-queue/22947-20250513091120-0028-0000 @@ -0,0 +1,7 @@ +Subject: Third email contents + +THIRD FIRST Line +THIRD SECOND Line +THIRD LAST Line + +. diff --git a/data-queue/22947-20250513091120-0028-0000.trans b/data-queue/22947-20250513091120-0028-0000.trans new file mode 100644 index 0000000..7737fc0 --- /dev/null +++ b/data-queue/22947-20250513091120-0028-0000.trans @@ -0,0 +1,3 @@ +R 1747141880 0 22947-20250513091120-0028-0000 noreply@example.com postmaster@example.com +R 1747141880 0 22947-20250513091120-0028-0000 noreply@example.com user1@sub1.example.com +R 1747141880 0 22947-20250513091120-0028-0000 noreply@example.com user2@sub2.example.com diff --git a/data-queue/32616-20250510195843-0505-0000.trans b/data-queue/32616-20250510195843-0505-0000.trans deleted file mode 100644 index 559253b..0000000 --- a/data-queue/32616-20250510195843-0505-0000.trans +++ /dev/null @@ -1,2 +0,0 @@ -R 1746921530 0 32616-20250510195843-0505-0000 postmaster@example.com postmaster@example.com -R 1746921530 0 32616-20250510195843-0505-0000 postmaster@example.com webmaster@example.com diff --git a/data-queue/32665-20250510195917-0429-0000 b/data-queue/32665-20250510195917-0429-0000 deleted file mode 100644 index da06980..0000000 --- a/data-queue/32665-20250510195917-0429-0000 +++ /dev/null @@ -1,7 +0,0 @@ -Subject: Very Simple email contents - -FIRST Line -SECOND Line -LAST Line - -. diff --git a/data-queue/32665-20250510195917-0429-0000.trans b/data-queue/32665-20250510195917-0429-0000.trans deleted file mode 100644 index 4d4f53c..0000000 --- a/data-queue/32665-20250510195917-0429-0000.trans +++ /dev/null @@ -1,2 +0,0 @@ -R 1746921564 0 32665-20250510195917-0429-0000 postmaster@example.com postmaster@example.com -R 1746921564 0 32665-20250510195917-0429-0000 postmaster@example.com webmaster@example.com diff --git a/data-queue/32713-20250510195939-0720-0000 b/data-queue/32713-20250510195939-0720-0000 deleted file mode 100644 index da06980..0000000 --- a/data-queue/32713-20250510195939-0720-0000 +++ /dev/null @@ -1,7 +0,0 @@ -Subject: Very Simple email contents - -FIRST Line -SECOND Line -LAST Line - -. diff --git a/data-queue/32713-20250510195939-0720-0000.trans b/data-queue/32713-20250510195939-0720-0000.trans deleted file mode 100644 index 366d2fb..0000000 --- a/data-queue/32713-20250510195939-0720-0000.trans +++ /dev/null @@ -1,2 +0,0 @@ -R 1746921587 0 32713-20250510195939-0720-0000 postmaster@example.com postmaster@example.com -R 1746921587 0 32713-20250510195939-0720-0000 postmaster@example.com webmaster@example.com diff --git a/lib/unieml.c b/lib/unieml.c index ac36df1..1c7e1d6 100644 --- a/lib/unieml.c +++ b/lib/unieml.c @@ -187,6 +187,36 @@ return status; */ /********************************************************/ /* */ +/* Procedure to remove a file from the queue */ +/* directory. */ +/* */ +/********************************************************/ +PUBLIC _Bool eml_deleteqfile(char *qfilename) + +{ +#define OPEP "unieml.c:eml_createqfile," + +_Bool done; +char *filename; +char fpath[300]; + +done=true; +filename=rou_apppath(QDIR); +(void) snprintf(fpath,sizeof(fpath),"%s/%s",filename,qfilename); +if (unlink(fpath)<0) { + (void) rou_alert(0,"%s Unable to delete file <%s> (error=<%s>) (Bug?)", + OPEP,fpath,strerror(errno)); + done=false; + } +filename=rou_freestr(filename); +return done; +#undef OPEP +} +/* +^L +*/ +/********************************************************/ +/* */ /* Procedure to open a file within the queue */ /* directory. */ /* */ diff --git a/lib/unieml.h b/lib/unieml.h index 68e90c4..5088d4b 100644 --- a/lib/unieml.h +++ b/lib/unieml.h @@ -48,6 +48,9 @@ extern CODTYP eml_getcode(char *keyword); //remove CRLF from string extern int eml_removecrlf(char *string); +//procedure to delete a file within the queue +extern _Bool eml_deleteqfile(char *qfilename); + //procedure to change qfile extension extern _Bool eml_renameqfile(char *qfilename,char *oldext,char *newext);