From b9231eb35a06f6109b7bb58e435c721863e29eb2 Mon Sep 17 00:00:00 2001 From: Davor Ocelic Date: Sun, 28 Jun 2020 19:06:39 +0200 Subject: [PATCH] Rename `Mail` to `Email` --- Makefile.am | 6 +++--- mail.c => email.c | 40 ++++++++++++++++++++-------------------- email.h | 16 ++++++++++++++++ mail.urs => email.urs | 0 examples/multiple.ur | 12 ++++++------ examples/multiple.urs | 2 +- examples/test.ur | 6 +++--- lib.urp | 8 ++++---- mail.h | 16 ---------------- 9 files changed, 53 insertions(+), 53 deletions(-) rename mail.c => email.c (88%) create mode 100644 email.h rename mail.urs => email.urs (100%) delete mode 100644 mail.h diff --git a/Makefile.am b/Makefile.am index 8bc5c7f..a9a8519 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 -LIB = @URWEB_LIB@/ur/mail +LIB = @URWEB_LIB@/ur/email -lib_LTLIBRARIES = liburweb_mail.la +lib_LTLIBRARIES = liburweb_email.la -liburweb_mail_la_SOURCES = mail.c +liburweb_email_la_SOURCES = email.c AM_CPPFLAGS = -I@URWEB_INC@ AM_CFLAGS = -Wimplicit -Wall -Werror diff --git a/mail.c b/email.c similarity index 88% rename from mail.c rename to email.c index 195e9ab..6909022 100644 --- a/mail.c +++ b/email.c @@ -8,7 +8,7 @@ struct headers { uw_Basis_string from, to, cc, bcc, subject, user_agent; }; -typedef struct headers *uw_Mail_headers; +typedef struct headers *uw_Email_headers; static uw_Basis_string copy_string(uw_Basis_string s) { if (s == NULL) @@ -24,8 +24,8 @@ static void free_string(uw_Basis_string s) { free(s); } -static uw_Mail_headers copy_headers(uw_Mail_headers h) { - uw_Mail_headers h2 = malloc(sizeof(struct headers)); +static uw_Email_headers copy_headers(uw_Email_headers h) { + uw_Email_headers h2 = malloc(sizeof(struct headers)); h2->from = copy_string(h->from); h2->to = copy_string(h->to); h2->cc = copy_string(h->cc); @@ -35,7 +35,7 @@ static uw_Mail_headers copy_headers(uw_Mail_headers h) { return h2; } -static void free_headers(uw_Mail_headers h) { +static void free_headers(uw_Email_headers h) { free_string(h->from); free_string(h->to); free_string(h->cc); @@ -45,7 +45,7 @@ static void free_headers(uw_Mail_headers h) { free(h); } -uw_Mail_headers uw_Mail_empty = NULL; +uw_Email_headers uw_Email_empty = NULL; static void header(uw_context ctx, uw_Basis_string s) { if (strlen(s) > 100) @@ -63,8 +63,8 @@ static void address(uw_context ctx, uw_Basis_string s) { uw_error(ctx, FATAL, "E-mail address contains comma"); } -uw_Mail_headers uw_Mail_from(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) { - uw_Mail_headers h2 = uw_malloc(ctx, sizeof(struct headers)); +uw_Email_headers uw_Email_from(uw_context ctx, uw_Basis_string s, uw_Email_headers h) { + uw_Email_headers h2 = uw_malloc(ctx, sizeof(struct headers)); if (h) *h2 = *h; @@ -80,8 +80,8 @@ uw_Mail_headers uw_Mail_from(uw_context ctx, uw_Basis_string s, uw_Mail_headers return h2; } -uw_Mail_headers uw_Mail_to(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) { - uw_Mail_headers h2 = uw_malloc(ctx, sizeof(struct headers)); +uw_Email_headers uw_Email_to(uw_context ctx, uw_Basis_string s, uw_Email_headers h) { + uw_Email_headers h2 = uw_malloc(ctx, sizeof(struct headers)); if (h) *h2 = *h; else @@ -98,8 +98,8 @@ uw_Mail_headers uw_Mail_to(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) return h2; } -uw_Mail_headers uw_Mail_cc(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) { - uw_Mail_headers h2 = uw_malloc(ctx, sizeof(struct headers)); +uw_Email_headers uw_Email_cc(uw_context ctx, uw_Basis_string s, uw_Email_headers h) { + uw_Email_headers h2 = uw_malloc(ctx, sizeof(struct headers)); if (h) *h2 = *h; else @@ -116,8 +116,8 @@ uw_Mail_headers uw_Mail_cc(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) return h2; } -uw_Mail_headers uw_Mail_bcc(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) { - uw_Mail_headers h2 = uw_malloc(ctx, sizeof(struct headers)); +uw_Email_headers uw_Email_bcc(uw_context ctx, uw_Basis_string s, uw_Email_headers h) { + uw_Email_headers h2 = uw_malloc(ctx, sizeof(struct headers)); if (h) *h2 = *h; else @@ -134,8 +134,8 @@ uw_Mail_headers uw_Mail_bcc(uw_context ctx, uw_Basis_string s, uw_Mail_headers h return h2; } -uw_Mail_headers uw_Mail_subject(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) { - uw_Mail_headers h2 = uw_malloc(ctx, sizeof(struct headers)); +uw_Email_headers uw_Email_subject(uw_context ctx, uw_Basis_string s, uw_Email_headers h) { + uw_Email_headers h2 = uw_malloc(ctx, sizeof(struct headers)); if (h) *h2 = *h; @@ -151,8 +151,8 @@ uw_Mail_headers uw_Mail_subject(uw_context ctx, uw_Basis_string s, uw_Mail_heade return h2; } -uw_Mail_headers uw_Mail_user_agent(uw_context ctx, uw_Basis_string s, uw_Mail_headers h) { - uw_Mail_headers h2 = uw_malloc(ctx, sizeof(struct headers)); +uw_Email_headers uw_Email_user_agent(uw_context ctx, uw_Basis_string s, uw_Email_headers h) { + uw_Email_headers h2 = uw_malloc(ctx, sizeof(struct headers)); if (h) *h2 = *h; @@ -170,7 +170,7 @@ uw_Mail_headers uw_Mail_user_agent(uw_context ctx, uw_Basis_string s, uw_Mail_he typedef struct { uw_context ctx; - uw_Mail_headers h; + uw_Email_headers h; uw_Basis_string server, ca, user, password, body, xbody; uw_Basis_bool ssl; } job; @@ -408,10 +408,10 @@ static void free_job(void *p, int will_retry) { free(j); } -uw_unit uw_Mail_send(uw_context ctx, uw_Basis_string server, +uw_unit uw_Email_send(uw_context ctx, uw_Basis_string server, uw_Basis_bool ssl, uw_Basis_string ca, uw_Basis_string user, uw_Basis_string password, - uw_Mail_headers h, uw_Basis_string body, uw_Basis_string xbody) { + uw_Email_headers h, uw_Basis_string body, uw_Basis_string xbody) { job *j; if (!h || !h->from) diff --git a/email.h b/email.h new file mode 100644 index 0000000..85ae39d --- /dev/null +++ b/email.h @@ -0,0 +1,16 @@ +#include + +typedef struct headers *uw_Email_headers; + +extern uw_Email_headers uw_Email_empty; + +uw_Email_headers uw_Email_from(uw_context, uw_Basis_string, uw_Email_headers); +uw_Email_headers uw_Email_to(uw_context, uw_Basis_string, uw_Email_headers); +uw_Email_headers uw_Email_cc(uw_context, uw_Basis_string, uw_Email_headers); +uw_Email_headers uw_Email_bcc(uw_context, uw_Basis_string, uw_Email_headers); +uw_Email_headers uw_Email_subject(uw_context, uw_Basis_string, uw_Email_headers); + +uw_unit uw_Email_send(uw_context, uw_Basis_string server, + uw_Basis_bool ssl, uw_Basis_string ca, + uw_Basis_string user, uw_Basis_string password, + uw_Email_headers, uw_Basis_string body, uw_Basis_string xbody); diff --git a/mail.urs b/email.urs similarity index 100% rename from mail.urs rename to email.urs diff --git a/examples/multiple.ur b/examples/multiple.ur index 826786a..1fd1a25 100644 --- a/examples/multiple.ur +++ b/examples/multiple.ur @@ -1,7 +1,7 @@ val server = "smtp://you.com:465" val user = "you" val password = "pass" -val send = Mail.send server True None user password +val send = Email.send server True None user password fun solicitText (user : string) : transaction string = key <- rand; @@ -31,18 +31,18 @@ fun solicitText (user : string) : transaction string "Your System.\n" ) -val sendOneMail (from : string) (to : string) (subject : string) (text : string) : transaction unit - = send (Mail.subject subject (Mail.to to (Mail.from from Mail.empty))) text None +val sendOneEmail (from : string) (to : string) (subject : string) (text : string) : transaction unit + = send (Email.subject subject (Email.to to (Email.from from Email.empty))) text None -val sendMails : transaction unit +val sendEmails : transaction unit = users <- return ("urweb.test1@mailinator.com" :: "urweb.test2@mailinator.com" :: "urweb.test3@mailinator.com" :: []); List.app (fn user => text <- solicitText user; - sendOneMail "MarkoSchuetz@gmail.com" user "soliciting your data" text + sendOneEmail "MarkoSchuetz@gmail.com" user "soliciting your data" text ) users fun main () : transaction page - = sendMails; + = sendEmails; return Sent diff --git a/examples/multiple.urs b/examples/multiple.urs index 65bf3f4..24bb252 100644 --- a/examples/multiple.urs +++ b/examples/multiple.urs @@ -1,2 +1,2 @@ -val sendMails : transaction unit +val sendEmails : transaction unit val main : unit -> transaction page diff --git a/examples/test.ur b/examples/test.ur index cecedc0..0dcb8d2 100644 --- a/examples/test.ur +++ b/examples/test.ur @@ -1,15 +1,15 @@ val server = "smtp://you.com:465" val user = "you" val password = "pass" -val send = Mail.send server True None user password +val send = Email.send server True None user password fun sendPlain r = - send (Mail.from r.From (Mail.to r.To (Mail.subject r.Subject Mail.empty))) + send (Email.from r.From (Email.to r.To (Email.subject r.Subject Email.empty))) r.Body None; return Sent fun sendHtml r = - send (Mail.from r.From (Mail.to r.To (Mail.subject r.Subject Mail.empty))) + send (Email.from r.From (Email.to r.To (Email.subject r.Subject Email.empty))) r.Body (Some Spread the love!); return Sent diff --git a/lib.urp b/lib.urp index 27b1c85..2d35f58 100644 --- a/lib.urp +++ b/lib.urp @@ -1,4 +1,4 @@ -ffi mail -include mail.h -link -lurweb_mail -lcurl -effectful Mail.send +ffi email +include email.h +link -lurweb_email -lcurl +effectful Email.send diff --git a/mail.h b/mail.h deleted file mode 100644 index 1144b28..0000000 --- a/mail.h +++ /dev/null @@ -1,16 +0,0 @@ -#include - -typedef struct headers *uw_Mail_headers; - -extern uw_Mail_headers uw_Mail_empty; - -uw_Mail_headers uw_Mail_from(uw_context, uw_Basis_string, uw_Mail_headers); -uw_Mail_headers uw_Mail_to(uw_context, uw_Basis_string, uw_Mail_headers); -uw_Mail_headers uw_Mail_cc(uw_context, uw_Basis_string, uw_Mail_headers); -uw_Mail_headers uw_Mail_bcc(uw_context, uw_Basis_string, uw_Mail_headers); -uw_Mail_headers uw_Mail_subject(uw_context, uw_Basis_string, uw_Mail_headers); - -uw_unit uw_Mail_send(uw_context, uw_Basis_string server, - uw_Basis_bool ssl, uw_Basis_string ca, - uw_Basis_string user, uw_Basis_string password, - uw_Mail_headers, uw_Basis_string body, uw_Basis_string xbody);