summaryrefslogtreecommitdiff
path: root/imap/src/c-client
diff options
context:
space:
mode:
Diffstat (limited to 'imap/src/c-client')
-rw-r--r--imap/src/c-client/c-client.h2
-rw-r--r--imap/src/c-client/imap4r1.c12
-rw-r--r--imap/src/c-client/mail.c4
-rw-r--r--imap/src/c-client/netmsg.c2
-rw-r--r--imap/src/c-client/newsrc.c2
-rw-r--r--imap/src/c-client/nntp.c2
-rw-r--r--imap/src/c-client/rfc822.c6
-rw-r--r--imap/src/c-client/utf8.c6
-rw-r--r--imap/src/c-client/utf8.h2
-rw-r--r--imap/src/c-client/utf8aux.c2
-rw-r--r--imap/src/c-client/utf8aux.h2
11 files changed, 21 insertions, 21 deletions
diff --git a/imap/src/c-client/c-client.h b/imap/src/c-client/c-client.h
index 7bf3710a..b279bff9 100644
--- a/imap/src/c-client/c-client.h
+++ b/imap/src/c-client/c-client.h
@@ -44,7 +44,7 @@ extern "C" {
#include "smtp.h" /* SMTP sending routines */
#include "nntp.h" /* NNTP sending routines */
#include "utf8.h" /* Unicode and charset routines */
-#include "utf8aux.h" /* Unicode auxillary routines */
+#include "utf8aux.h" /* Unicode auxiliary routines */
#include "misc.h" /* miscellaneous utility routines */
#ifdef __cplusplus /* undo the C++ mischief */
diff --git a/imap/src/c-client/imap4r1.c b/imap/src/c-client/imap4r1.c
index aaaa66e4..97a43a86 100644
--- a/imap/src/c-client/imap4r1.c
+++ b/imap/src/c-client/imap4r1.c
@@ -2775,7 +2775,7 @@ void imap_capability (MAILSTREAM *stream)
/* IMAP set ACL
* Accepts: mail stream
* mailbox name
- * authentication identifer
+ * authentication identifier
* new access rights
* Returns: T on success, NIL on failure
*/
@@ -2794,7 +2794,7 @@ long imap_setacl (MAILSTREAM *stream,char *mailbox,char *id,char *rights)
/* IMAP delete ACL
* Accepts: mail stream
* mailbox name
- * authentication identifer
+ * authentication identifier
* Returns: T on success, NIL on failure
*/
@@ -2825,7 +2825,7 @@ long imap_getacl (MAILSTREAM *stream,char *mailbox)
/* IMAP list rights
* Accepts: mail stream
* mailbox name
- * authentication identifer
+ * authentication identifier
* Returns: T on success with data returned via callback, NIL on failure
*/
@@ -4450,7 +4450,7 @@ void imap_parse_unsolicited (MAILSTREAM *stream,IMAPPARSEDREPLY *reply)
while (ac->rights && s && (*s == ' ') && s++ &&
(ac = ac->next = mail_newacllist ()));
if (!ac->rights || (s && *s)) {
- sprintf (LOCAL->tmp,"Invalid ACL identifer/rights for %.80s",
+ sprintf (LOCAL->tmp,"Invalid ACL identifier/rights for %.80s",
(char *) t);
mm_notify (stream,LOCAL->tmp,WARN);
stream->unhealthy = T;
@@ -4499,7 +4499,7 @@ void imap_parse_unsolicited (MAILSTREAM *stream,IMAPPARSEDREPLY *reply)
fs_give ((void **) &id); /* free identifier */
}
else {
- sprintf (LOCAL->tmp,"Missing LISTRIGHTS identifer for %.80s",(char *) t);
+ sprintf (LOCAL->tmp,"Missing LISTRIGHTS identifier for %.80s",(char *) t);
mm_notify (stream,LOCAL->tmp,WARN);
stream->unhealthy = T;
}
@@ -4887,7 +4887,7 @@ THREADNODE *imap_parse_thread (MAILSTREAM *stream,unsigned char **txtptr)
/* skip past any space */
if (**txtptr == ' ') ++*txtptr;
}
- ++*txtptr; /* skip pase end of thread */
+ ++*txtptr; /* skip past end of thread */
parent = NIL; /* close this thread */
}
return ret; /* return parsed thread */
diff --git a/imap/src/c-client/mail.c b/imap/src/c-client/mail.c
index adddb9d4..e591a521 100644
--- a/imap/src/c-client/mail.c
+++ b/imap/src/c-client/mail.c
@@ -5343,7 +5343,7 @@ container_t mail_thread_prune_dummy_work (container_t msg,container_t ane)
/* Test that purported mother is not a child of purported daughter
* Accepts: mother
- * purported daugher
+ * purported daughter
* Returns: T if circular parentage exists, else NIL
*/
@@ -6080,7 +6080,7 @@ void mail_free_searchpgmlist (SEARCHPGMLIST **pgl)
/* Mail garbage collect namespace
- * Accepts: poiner to namespace
+ * Accepts: pointer to namespace
*/
void mail_free_namespace (NAMESPACE **n)
diff --git a/imap/src/c-client/netmsg.c b/imap/src/c-client/netmsg.c
index 4454c3be..617d7bbd 100644
--- a/imap/src/c-client/netmsg.c
+++ b/imap/src/c-client/netmsg.c
@@ -68,7 +68,7 @@ FILE *netmsg_slurp (NETSTREAM *stream,unsigned long *size,unsigned long *hsiz)
return NIL;
}
}
- *size = 0; /* initially emtpy */
+ *size = 0; /* initially empty */
if (hsiz) *hsiz = 0;
while ((s = net_getline (stream)) != NULL) {
if (*s == '.') { /* possible end of text? */
diff --git a/imap/src/c-client/newsrc.c b/imap/src/c-client/newsrc.c
index 0f15264d..c3d31ca0 100644
--- a/imap/src/c-client/newsrc.c
+++ b/imap/src/c-client/newsrc.c
@@ -500,7 +500,7 @@ void newsrc_check_uid (unsigned char *state,unsigned long uid,
while (*state) { /* until run out of state string */
/* collect a number */
for (i = 0; isdigit (*state); i = i*10 + (*state++ - '0'));
- if (*state != '-') j = i; /* coerce single mesage into range */
+ if (*state != '-') j = i; /* coerce single message into range */
else { /* have a range */
for (j = 0; isdigit (*++state); j = j*10 + (*state - '0'));
if (!j) j = i; /* guard against -0 */
diff --git a/imap/src/c-client/nntp.c b/imap/src/c-client/nntp.c
index 67a5d422..3fc2fe0d 100644
--- a/imap/src/c-client/nntp.c
+++ b/imap/src/c-client/nntp.c
@@ -585,7 +585,7 @@ long nntp_status (MAILSTREAM *stream,char *mbx,long flags)
status.uidvalidity = stream->uid_validity;
/* pass status to main program */
mm_status (stream,mbx,&status);
- ret = T; /* succes */
+ ret = T; /* success */
}
/* flush temporary stream */
if (tstream) mail_close (tstream);
diff --git a/imap/src/c-client/rfc822.c b/imap/src/c-client/rfc822.c
index 6433bdbb..a1730954 100644
--- a/imap/src/c-client/rfc822.c
+++ b/imap/src/c-client/rfc822.c
@@ -1396,7 +1396,7 @@ char *rfc822_skip_comment (char **s,long trim)
sprintf (tmp,"Unterminated comment: %.80s",*s);
MM_LOG (tmp,PARSE);
**s = '\0'; /* nuke duplicate messages in case reparse */
- return NIL; /* this is wierd if it happens */
+ return NIL; /* this is weird if it happens */
case ' ': /* whitespace isn't significant */
break;
default: /* random character */
@@ -1432,7 +1432,7 @@ static long rfc822_output_char (RFC822BUFFER *buf,int c)
static long rfc822_output_data (RFC822BUFFER *buf,char *string,long len)
{
- while (len) { /* until request satified */
+ while (len) { /* until request satisfied */
long i;
if ((i = min (len,buf->end - buf->cur)) != 0L) {
memcpy (buf->cur,string,i);
@@ -2231,7 +2231,7 @@ unsigned char *rfc822_8bit (unsigned char *src,unsigned long srcl,
* versions of c-client prior to imap-2005, they did not provide any
* buffer checking at all.
*
- * As a half-hearted attempt, these new compatability functions for the
+ * As a half-hearted attempt, these new compatibility functions for the
* legacy interfaces limit what they write to size SENDBUFLEN and will
* fatal() if more than that is written. However, that isn't good enough
* since several of these functions *append* to the buffer, and return an
diff --git a/imap/src/c-client/utf8.c b/imap/src/c-client/utf8.c
index 844abefd..0a9b6566 100644
--- a/imap/src/c-client/utf8.c
+++ b/imap/src/c-client/utf8.c
@@ -347,7 +347,7 @@ static const SCRIPT utf8_scvalid[] = {
{"Chinese Simplified","China, Singapore",SC_CHINESE_SIMPLIFIED},
{"Chinese Traditional","Taiwan, Hong Kong, Macao",SC_CHINESE_TRADITIONAL},
{"Cyrillic",NIL,SC_CYRILLIC},
- {"Cyrillic Ukranian",NIL,SC_UKRANIAN},
+ {"Cyrillic Ukrainian",NIL,SC_UKRANIAN},
{"Greek",NIL,SC_GREEK},
{"Hebrew",NIL,SC_HEBREW},
{"Japanese",NIL,SC_JAPANESE},
@@ -898,7 +898,7 @@ unsigned long utf8_rmapsize (SIZEDTEXT *text,unsigned short *rmap,
/* Convert UCS-4 to charset using rmap
* Accepts: source UCS-4 character(s)
- * numver of UCS-4 characters
+ * number of UCS-4 characters
* conversion rmap
* pointer to returned sized text
* substitute character if not in rmap, else NIL to return failure
@@ -918,7 +918,7 @@ long ucs4_rmaptext (unsigned long *ucs4,unsigned long len,unsigned short *rmap,
/* Return size of UCS-4 string converted to other CS via rmap
* Accepts: source UCS-4 character(s)
- * numver of UCS-4 characters
+ * number of UCS-4 characters
* conversion rmap
* substitute character if not in rmap, else NIL to return failure
* Returns: length if success, negative if failure (no-convert)
diff --git a/imap/src/c-client/utf8.h b/imap/src/c-client/utf8.h
index 8a73ef9e..0546cdf4 100644
--- a/imap/src/c-client/utf8.h
+++ b/imap/src/c-client/utf8.h
@@ -406,7 +406,7 @@
* values. Although this made sense, it was confusing with the "max ku" and
* "max ten" values used in the double-byte tables; there are 1-origin, but
* the calculated values used for "ku" and "ten" are 0-origin (derived by
- * substracting the "base"). What this all meant is that for double byte
+ * subtracting the "base"). What this all meant is that for double byte
* characters the limit test is of the form (value < max_ku), but for single
* byte characters (which used the same cell to hold the max ku) the limit
* test was (value <= max_ku).
diff --git a/imap/src/c-client/utf8aux.c b/imap/src/c-client/utf8aux.c
index 746ea47e..0928db49 100644
--- a/imap/src/c-client/utf8aux.c
+++ b/imap/src/c-client/utf8aux.c
@@ -12,7 +12,7 @@
*/
/*
- * Program: UTF-8 auxillary routines (c-client and MIME2 support)
+ * Program: UTF-8 auxiliary routines (c-client and MIME2 support)
*
* Author: Mark Crispin
* Networks and Distributed Computing
diff --git a/imap/src/c-client/utf8aux.h b/imap/src/c-client/utf8aux.h
index beb55057..ea54217c 100644
--- a/imap/src/c-client/utf8aux.h
+++ b/imap/src/c-client/utf8aux.h
@@ -12,7 +12,7 @@
*/
/*
- * Program: UTF-8 auxillary routines (c-client and MIME2 support)
+ * Program: UTF-8 auxiliary routines (c-client and MIME2 support)
*
* Author: Mark Crispin
* Networks and Distributed Computing