summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Varshavchik2022-03-22 07:02:07 -0400
committerSam Varshavchik2022-03-22 07:02:07 -0400
commitc211a259e1f81d4a7aa5825777641b06eb74f109 (patch)
treedb5fea1574b51b2d828d10ecb16a0684b133aa29
parent3f6737c2b26ec6d3b3e51d1f909424f3f3a7840a (diff)
parent869e8b780c21d90ef50c91ad9e4c677f6047fb01 (diff)
downloadcourier-libs-c211a259e1f81d4a7aa5825777641b06eb74f109.tar.bz2
Merge branch 'master' of github.com:svarshavchik/courier-libs
Diffstat
-rw-r--r--cgi/cgidaemon.c2
-rw-r--r--imap/ChangeLog4
-rw-r--r--imap/imapd.c2
-rw-r--r--maildir/maildiraclt.h2
-rw-r--r--maildir/maildirwatch.h2
-rw-r--r--rfc1035/spf.c2
-rw-r--r--rfc2045/rfc3676parser.c2
-rw-r--r--rfc2045/rfc3676parser.h2
-rw-r--r--sqwebmail/html/en-us/eventshow.html4
-rw-r--r--sqwebmail/html/en-us/folders.html2
-rw-r--r--sqwebmail/html/en-us/gpgerr.html2
-rw-r--r--sqwebmail/html/en-us/newevent.html4
-rw-r--r--sqwebmail/msg2html.c2
-rw-r--r--unicode/book.xml6
-rw-r--r--unicode/courier-unicode.h.in12
-rw-r--r--unicode/mkultcase.pl2
16 files changed, 26 insertions, 26 deletions
diff --git a/cgi/cgidaemon.c b/cgi/cgidaemon.c
index 25bf01a..376a71a 100644
--- a/cgi/cgidaemon.c
+++ b/cgi/cgidaemon.c
@@ -46,7 +46,7 @@ static void err(const char *func, const char *msg)
"<html><head><title>Internal error</title></head>\n"
"<body><h1>Internal Error</h1>\n"
"<p>The webmail system is temporarily unavailable. An error"
- " occured in function %s: %s</p></body></html>\n", func,
+ " occurred in function %s: %s</p></body></html>\n", func,
msg);
fflush(stdout);
exit(0);
diff --git a/imap/ChangeLog b/imap/ChangeLog
index b2c7d20..4b62227 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1101,7 +1101,7 @@
"emailAddress", for compatibility with OpenSSL.
* tcpd/libcouriergnutls.c (verify_client): Check for the required
- certificate occured in the wrong spot.
+ certificate occurred in the wrong spot.
* tcpd/libcouriergnutls.c (tls_connect): Add call to
gnutls_certificate_set_subject() to actually request the client cert.
@@ -1785,7 +1785,7 @@
2004-05-08 Brian Candler <B.Candler@pobox.com>
- * pop3dserver.c (do_retr): If error occured during RETR drop the
+ * pop3dserver.c (do_retr): If error occurred during RETR drop the
connection (only sane thing to do).
2004-05-02 Brian Candler <B.Candler@pobox.com>
diff --git a/imap/imapd.c b/imap/imapd.c
index 71af3fe..8529657 100644
--- a/imap/imapd.c
+++ b/imap/imapd.c
@@ -6023,7 +6023,7 @@ int uid=0;
libmail_kwmDestroy(storeinfo_s.keywords);
free(msgset);
writes(tag);
- writes(" NO An error occured while"
+ writes(" NO An error occurred while"
" updating keywords: ");
writes(strerror(errno));
writes(".\r\n");
diff --git a/maildir/maildiraclt.h b/maildir/maildiraclt.h
index 3f39a98..e5829db 100644
--- a/maildir/maildiraclt.h
+++ b/maildir/maildiraclt.h
@@ -213,7 +213,7 @@ int maildir_acl_delete(const char *maildir,
**
** The callback function should return >0 if identifier refers to the entity
** whose access rights are to be computed; 0 if it does not, <0 if an error
-** occured.
+** occurred.
**
** As a special case, maildir_acl_compute() handles "anonymous" and "anyone"
** identifiers on its own.
diff --git a/maildir/maildirwatch.h b/maildir/maildirwatch.h
index 5f49623..6545c09 100644
--- a/maildir/maildirwatch.h
+++ b/maildir/maildirwatch.h
@@ -85,7 +85,7 @@ int maildirwatch_start(struct maildirwatch *p,
** Returns: 1 - Monitoring has started, or we're in fallback mode.
** 0 - Not yet, *fdret is initialized to file descriptor to wait on.
** (not used at this time).
-** -1 - A fatal error occured, fall back to polling mode.
+** -1 - A fatal error occurred, fall back to polling mode.
**
** maildirwatch_started() returns right away, without blocking.
*/
diff --git a/rfc1035/spf.c b/rfc1035/spf.c
index 7b9d40b..63735ff 100644
--- a/rfc1035/spf.c
+++ b/rfc1035/spf.c
@@ -1046,7 +1046,7 @@ static void setexp(const char *exp,
{
set_err_msg(info->errmsg_buf,
info->errmsg_buf_size,
- "A DNS lookup error occured while"
+ "A DNS lookup error occurred while"
" fetching the SPF explanation record.");
}
else
diff --git a/rfc2045/rfc3676parser.c b/rfc2045/rfc3676parser.c
index e52da45..79519e3 100644
--- a/rfc2045/rfc3676parser.c
+++ b/rfc2045/rfc3676parser.c
@@ -210,7 +210,7 @@ int rfc3676parser(rfc3676_parser_t handle,
size_t txt_cnt)
{
if (handle->errflag)
- return handle->errflag; /* Error occured previously */
+ return handle->errflag; /* Error occurred previously */
/* Convert to unicode and invoke parse_unicode() */
diff --git a/rfc2045/rfc3676parser.h b/rfc2045/rfc3676parser.h
index 497792c..b16343b 100644
--- a/rfc2045/rfc3676parser.h
+++ b/rfc2045/rfc3676parser.h
@@ -163,7 +163,7 @@ namespace mail {
void end(
/*
- ** Set to true if a unicode conversion error occured.
+ ** Set to true if a unicode conversion error occurred.
*/
bool &unicode_errflag);
diff --git a/sqwebmail/html/en-us/eventshow.html b/sqwebmail/html/en-us/eventshow.html
index 27afc9a..696ff98 100644
--- a/sqwebmail/html/en-us/eventshow.html
+++ b/sqwebmail/html/en-us/eventshow.html
@@ -21,9 +21,9 @@
[#$NOTFOUNDERR=<font style="color: #ff0000" size="+1" class="error">ERROR: Event not found.</font><br /><br />#]
-[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occured when updating the calendar: <div style="margin-left: 3.5em;"><span class="tt">%s</span></div></font><br /><br />#]
+[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occurred when updating the calendar: <div style="margin-left: 3.5em;"><span class="tt">%s</span></div></font><br /><br />#]
-[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occured trying to lock the calendar. Please try again.</font><br /><br />#]
+[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occurred trying to lock the calendar. Please try again.</font><br /><br />#]
[#$CANCELIMAGE=@@cancel.png, width="28" height="20" alt="Cancel&nbsp;event" title="Cancel&nbsp;event" border="0"@@#]
[#$UNCANCELIMAGE=@@uncancel.png, width="28" height="20" alt="Uncancel&nbsp;event" title="Uncancel&nbsp;event" border="0"@@#]
diff --git a/sqwebmail/html/en-us/folders.html b/sqwebmail/html/en-us/folders.html
index 3a0090a..aa1f13e 100644
--- a/sqwebmail/html/en-us/folders.html
+++ b/sqwebmail/html/en-us/folders.html
@@ -32,7 +32,7 @@
[#$CALENDAR=<div class="eventsummarytitle" align="center"><a href="%s">Your Calendar</a></div>#]
[#$NOEVENTS=<em>No upcoming calendar events</em>#]
-[#$CALENDARLOGINERR=The following error occured when trying to log in to the calendar server:#]
+[#$CALENDARLOGINERR=The following error occurred when trying to log in to the calendar server:#]
[#$CANCELLED=CANCELLED:&nbsp;#]
[#$BOOKED=PENDING:&nbsp;#]
[#$PUBLICFOLDERS=<em>Public Folders</em>#]
diff --git a/sqwebmail/html/en-us/gpgerr.html b/sqwebmail/html/en-us/gpgerr.html
index 81924b2..257615f 100644
--- a/sqwebmail/html/en-us/gpgerr.html
+++ b/sqwebmail/html/en-us/gpgerr.html
@@ -56,7 +56,7 @@
<!-- Sections. Folders, Create Messages, Preferences, Etc. -->
[#include:navbar#]</div>
-<p>The following error has occured while encrypting or signing this
+<p>The following error has occurred while encrypting or signing this
message:</p>
<div style="margin-left: 3.5em;">
diff --git a/sqwebmail/html/en-us/newevent.html b/sqwebmail/html/en-us/newevent.html
index 0a82190..ca6ebf5 100644
--- a/sqwebmail/html/en-us/newevent.html
+++ b/sqwebmail/html/en-us/newevent.html
@@ -21,9 +21,9 @@
[#$CONFLICTERR2=SCHEDULING CONFLICT:&nbsp;#]
-[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: The following error has occured when saving this event: <div style="margin-left: 3.5em;"><pre>%s</pre></div>If the calendar server is down, save/postpone this event, and try logging in again from the main menu.</font><br /><br />#]
+[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: The following error has occurred when saving this event: <div style="margin-left: 3.5em;"><pre>%s</pre></div>If the calendar server is down, save/postpone this event, and try logging in again from the main menu.</font><br /><br />#]
-[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occured trying to lock the calendar for update. Please try again.</font><br /><br />#]
+[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occurred trying to lock the calendar for update. Please try again.</font><br /><br />#]
[#$NOTFOUNDERR=<font style="color: #ff0000" size="+1" class="error">ERROR: The original event was not found. This can happen if this event was updated or modified by someone else. Save this event info, and check your calendar for updates to this event.</font><br /><br />#]
diff --git a/sqwebmail/msg2html.c b/sqwebmail/msg2html.c
index a3025ae..74ecfb6 100644
--- a/sqwebmail/msg2html.c
+++ b/sqwebmail/msg2html.c
@@ -1322,7 +1322,7 @@ struct msg2html_textplain_info {
*/
int flowed;
- int conv_err; /* A transcoding error has occured */
+ int conv_err; /* A transcoding error has occurred */
/*
** Optionally replace smiley sequences with image URLs
diff --git a/unicode/book.xml b/unicode/book.xml
index 7744501..f6a5dfd 100644
--- a/unicode/book.xml
+++ b/unicode/book.xml
@@ -2829,7 +2829,7 @@ if (unicode_composition_init(str, strsize, flags, &compositions) == 0)
<function>unicode_convert_toutf8</function>()
returns a non <literal>NULL</literal> value
*<parameter>error</parameter> gets set to a non-zero value if
- a character conversion error has occured, and some characters
+ a character conversion error has occurred, and some characters
could not be converted.
</para>
@@ -3395,7 +3395,7 @@ if (unicode_composition_init(str, strsize, flags, &compositions) == 0)
<para>
The callback function should return 0. A non-zero value
indicates to the line breaking algorithm that an error has
- occured.
+ occurred.
<function>unicode_lb_next</function>() and
<function>unicode_lb_next_cnt</function>() return zero either if
they never invoked the callback function, or if each call to the
@@ -3712,7 +3712,7 @@ if (unicode_composition_init(str, strsize, flags, &compositions) == 0)
<para>
The callback function should return 0. A non-zero value
indicates to the word breaking algorithm that an error has
- occured.
+ occurred.
<function>unicode_wb_next</function>() and
<function>unicode_wb_next_cnt</function>() return zero either if
they never invoked the callback function, or if each call to the
diff --git a/unicode/courier-unicode.h.in b/unicode/courier-unicode.h.in
index b9e2ee9..8ef2dc5 100644
--- a/unicode/courier-unicode.h.in
+++ b/unicode/courier-unicode.h.in
@@ -1112,7 +1112,7 @@ unicode_convert_tocbuf_fromutf8_init(const char *dst_chset,
** Convert a character string to UTF-8.
**
** Returns a malloc-ed buffer holding the UTF-8 string, or NULL if an
-** error occured.
+** error occurred.
*/
char *unicode_convert_toutf8(/* Text to convert to UTF-8 */
const char *text,
@@ -1123,7 +1123,7 @@ char *unicode_convert_toutf8(/* Text to convert to UTF-8 */
/*
** If non-NULL, and a non-NULL pointer is
** returned, *error is set to non-zero if
- ** a character conversion error has occured.
+ ** a character conversion error has occurred.
*/
int *error);
@@ -1131,7 +1131,7 @@ char *unicode_convert_toutf8(/* Text to convert to UTF-8 */
** Convert UTF-8 text to another character set.
**
** Returns a malloc-ed buffer holding the string converted to the specified
-** character set, or NULL if an error occured.
+** character set, or NULL if an error occurred.
*/
char *unicode_convert_fromutf8(/* A UTF-8 string */
@@ -1147,7 +1147,7 @@ char *unicode_convert_fromutf8(/* A UTF-8 string */
/*
** If non-NULL, and a non-NULL pointer is
** returned, *error is set to non-zero if
- ** a character conversion error has occured.
+ ** a character conversion error has occurred.
*/
int *error);
@@ -1156,7 +1156,7 @@ char *unicode_convert_fromutf8(/* A UTF-8 string */
** buffer.
**
** Returns a malloc-ed buffer holding the string converted to the specified
-** character set, or NULL if an error occured.
+** character set, or NULL if an error occurred.
*/
char *unicode_convert_tobuf(/* A string to convert */
@@ -1176,7 +1176,7 @@ char *unicode_convert_tobuf(/* A string to convert */
/*
** If non-NULL, and a non-NULL pointer is
** returned, *error is set to non-zero if
- ** a character conversion error has occured.
+ ** a character conversion error has occurred.
*/
int *error);
diff --git a/unicode/mkultcase.pl b/unicode/mkultcase.pl
index 918637a..083f14d 100644
--- a/unicode/mkultcase.pl
+++ b/unicode/mkultcase.pl
@@ -99,7 +99,7 @@ for ($i=0; $i<$tabsize; $i++)
print "\n" if ($idx % 4) == 3;
++$idx;
}
- } split(/\n/, $bucket[$i]);
+ } sort split(/\n/, $bucket[$i]);
}
print "{0,0,0,0}};
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-30 05:41:47 +0000