From 0be3580af064ca1970c4e599ce16064691f8cf05 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 12 Feb 2024 14:06:20 -0500 Subject: [PATCH] Fix misc typos Fix the following typos in code and documentation: occured -> occurred subcribe -> subscribe existance -> existence Signed-off-by: Michael Jeanson --- UPGRADE | 2 +- man/mlmmj-bounce.1 | 2 +- src/listcontrol.c | 2 +- src/mlmmj-maintd.c | 20 ++++++++++---------- tests/mlmmj-maintd.sh | 28 ++++++++++++++-------------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/UPGRADE b/UPGRADE index 12cdfee5..f542fdc9 100644 --- a/UPGRADE +++ b/UPGRADE @@ -32,7 +32,7 @@ This applies to everyone using mlmmj < 1.1.0: completely rewritten and the subject is now translateable as well. Don't forget to create the new directories needed for digest and - nomail version of the list. listdir/subcribers.d and listdir/nomailsubs.d + nomail version of the list. listdir/subscribers.d and listdir/nomailsubs.d This applies to everyone using mlmmj < 0.8.3: --------------------------------------------- diff --git a/man/mlmmj-bounce.1 b/man/mlmmj-bounce.1 index 0d050908..a988e904 100644 --- a/man/mlmmj-bounce.1 +++ b/man/mlmmj-bounce.1 @@ -48,7 +48,7 @@ When the .Fl p option is used it sends out a probe email including info that it's a bounce probe and a list of the bounced message numbers. -The existance of a +The existence of a .Pa /bounce/.probe file indicates that a probe have been sent out. .Sh AUTHORS diff --git a/src/listcontrol.c b/src/listcontrol.c index 45205547..2a02604a 100644 --- a/src/listcontrol.c +++ b/src/listcontrol.c @@ -280,7 +280,7 @@ int listcontrol(strlist *fromemails, struct ml *ml, const char *controlstr, /* listname+subscribe@domain.tld */ case CTRL_SUBSCRIBE: if (sub.typereq == NULL) { - sub.typereq = "A subcribe"; + sub.typereq = "A subscribe"; sub.ctrlstr = NULL; sub.type = "regular"; sub.typesub = SUB_NORMAL; diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c index 7b132afd..cb378bcf 100644 --- a/src/mlmmj-maintd.c +++ b/src/mlmmj-maintd.c @@ -665,52 +665,52 @@ void do_maintenance(struct ml *ml, const char *mlmmjsend, const char *mlmmjbounc log("clean_moderation\n"); if (!clean_moderation(ml->fd, ml->ctrlfd, logfd)) - log_err("An error occured while cleaning moderation, see %s", + log_err("An error occurred while cleaning moderation, see %s", MAINTD_LOGFILE); log("clean_discarded\n"); if (!clean_discarded(ml->fd, logfd)) - log_err("An error occured while cleaning discarded mails, see " + log_err("An error occurred while cleaning discarded mails, see " "%s", MAINTD_LOGFILE); log("clean_subconf\n"); if (!clean_subconf(ml->fd, logfd)) - log_err("An error occured while cleaning subscribtion " + log_err("An error occurred while cleaning subscribtion " "confirmations, mails, see %s", MAINTD_LOGFILE); log("clean_unsubconf\n"); if (!clean_unsubconf(ml->fd, logfd)) - log_err("An error occured while cleaning unsubscribtion " + log_err("An error occurred while cleaning unsubscribtion " "confirmations, mails, see %s", MAINTD_LOGFILE); log("resend_queue\n"); if (!resend_queue(ml, logfd)) - log_err("An error occured while resending queued mails, see %s", + log_err("An error occurred while resending queued mails, see %s", MAINTD_LOGFILE); log("resend_requeue\n"); if (!resend_requeue(ml, mlmmjsend, logfd)) - log_err("An error occured while resending requeued mails, see " + log_err("An error occurred while resending requeued mails, see " "%s", MAINTD_LOGFILE); log("clean_nolongerbouncing\n"); if (!clean_nolongerbouncing(ml->fd, logfd)) - log_err("An error occured while cleaning no longer bouncing " + log_err("An error occurred while cleaning no longer bouncing " "traces, see %s", MAINTD_LOGFILE); log("unsub_bouncers\n"); if (!unsub_bouncers(ml->fd, ml->ctrlfd, logfd)) - log_err("An error occured while unsubscribing bouncing emails, " + log_err("An error occurred while unsubscribing bouncing emails, " "see %s", MAINTD_LOGFILE); log("probe_bouncers\n"); if (!probe_bouncers(ml, mlmmjbounce, logfd)) - log_err("An error occured while sending probes for bouncers, " + log_err("An error occurred while sending probes for bouncers, " "see %s", MAINTD_LOGFILE); log("run_digests\n"); if (!run_digests(ml, mlmmjsend, logfd)) - log_err("An error occured while running digests, see %s", + log_err("An error occurred while running digests, see %s", MAINTD_LOGFILE); close(logfd); diff --git a/tests/mlmmj-maintd.sh b/tests/mlmmj-maintd.sh index ec7bd261..8ef5b227 100755 --- a/tests/mlmmj-maintd.sh +++ b/tests/mlmmj-maintd.sh @@ -178,7 +178,7 @@ basics_5_body() echo test@mlmmjtest > lists/ml/control/listaddress rmdir lists/ml/queue/discarded - atf_check -s exit:0 -e match:"An error occured while cleaning discarded mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while cleaning discarded mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -204,7 +204,7 @@ basics_6_body() echo test@mlmmjtest > lists/ml/control/listaddress rm -rf lists/ml/queue - atf_check -s exit:0 -e match:"An error occured while cleaning discarded mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while cleaning discarded mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -231,7 +231,7 @@ basics_7_body() echo test@mlmmjtest > lists/ml/control/listaddress rm -rf lists/ml/requeue - atf_check -s exit:0 -e match:"An error occured while resending requeued mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while resending requeued mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -257,9 +257,9 @@ basics_8_body() echo test@mlmmjtest > lists/ml/control/listaddress rm -rf lists/ml/bounce - atf_check -s exit:0 -e match:"An error occured while cleaning no longer bouncing traces, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F - atf_check -s exit:0 -e match:"An error occured while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F - atf_check -s exit:0 -e match:"An error occured while sending probes for bouncers, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while cleaning no longer bouncing traces, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while sending probes for bouncers, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -287,7 +287,7 @@ basics_9_body() echo test@mlmmjtest > lists/ml/control/listaddress rm -rf lists/ml/subconf - atf_check -s exit:0 -e match:"An error occured while cleaning subscribtion confirmations, mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while cleaning subscribtion confirmations, mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -313,7 +313,7 @@ basics_10_body() echo test@mlmmjtest > lists/ml/control/listaddress rm -rf lists/ml/unsubconf - atf_check -s exit:0 -e match:"An error occured while cleaning unsubscribtion confirmations, mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while cleaning unsubscribtion confirmations, mails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -339,7 +339,7 @@ basics_11_body() echo test@mlmmjtest > lists/ml/control/listaddress rm -rf lists/ml/moderation - atf_check -s exit:0 -e match:"An error occured while cleaning moderation, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while cleaning moderation, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -440,7 +440,7 @@ digests_3_body() echo test@mlmmjtest > lists/ml/control/listaddress echo "-1" > lists/ml/index - atf_check -s exit:0 -e match:"An error occured while running digests, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while running digests, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -468,7 +468,7 @@ digests_4_body() echo "0" > lists/ml/index touch lists/ml/lastdigest chmod -w lists/ml/lastdigest - atf_check -s exit:0 -e match:"An error occured while running digests, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F + atf_check -s exit:0 -e match:"An error occurred while running digests, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L lists/ml -F output="Starting maintenance run at clean_moderation @@ -575,7 +575,7 @@ unsub_bouncers_5_body() # Log if invalid format echo "a:a #plop" > list/bounce/plop=meh - atf_check -s exit:0 -e match:"An error occured while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L list -F + atf_check -s exit:0 -e match:"An error occurred while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L list -F atf_check -s exit:0 test -f list/bounce/plop=meh output="Starting maintenance run at @@ -605,7 +605,7 @@ unsub_bouncers_6_body() # Log unreabable bouncefile echo "a:1234 #plop" > list/bounce/plop=meh chmod -r list/bounce/plop=meh - atf_check -s exit:0 -e match:"An error occured while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L list -F + atf_check -s exit:0 -e match:"An error occurred while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L list -F atf_check -s exit:0 test -f list/bounce/plop=meh output="Starting maintenance run at @@ -679,7 +679,7 @@ unsub_bouncers_10_body() echo "a:1234 # plop" > list/bounce/plop=meh echo "plop@meh" > list/digesters.d/p rm -rf list/nomailsubs.d - atf_check -s exit:0 -e match:"An error occured while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L list -F + atf_check -s exit:0 -e match:"An error occurred while unsubscribing bouncing emails, see mlmmj-maintd.lastrun.log" $mlmmjmaintd -L list -F atf_check -s exit:0 test -f list/bounce/plop=meh atf_check -s exit:1 test -f list/digesters.d/p output="Starting maintenance run at -- 2.47.2