summaryrefslogtreecommitdiff
path: root/imap/src/osdep/unix
diff options
context:
space:
mode:
Diffstat (limited to 'imap/src/osdep/unix')
-rw-r--r--imap/src/osdep/unix/Makefile4
-rw-r--r--imap/src/osdep/unix/ckp_cyg.c2
-rw-r--r--imap/src/osdep/unix/ckp_pam.c2
-rw-r--r--imap/src/osdep/unix/ckp_pmb.c2
-rw-r--r--imap/src/osdep/unix/ckp_psx.c2
-rw-r--r--imap/src/osdep/unix/mbx.c2
-rw-r--r--imap/src/osdep/unix/mh.c6
-rw-r--r--imap/src/osdep/unix/mix.c10
-rw-r--r--imap/src/osdep/unix/mtx.c2
-rw-r--r--imap/src/osdep/unix/mx.c4
-rw-r--r--imap/src/osdep/unix/news.c6
-rw-r--r--imap/src/osdep/unix/nl_unix.c2
-rw-r--r--imap/src/osdep/unix/os_vu2.c2
-rw-r--r--imap/src/osdep/unix/scandir.c4
-rw-r--r--imap/src/osdep/unix/tcp_unix.c2
-rw-r--r--imap/src/osdep/unix/tenex.c2
16 files changed, 27 insertions, 27 deletions
diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile
index c4e1411f..7b1bff38 100644
--- a/imap/src/osdep/unix/Makefile
+++ b/imap/src/osdep/unix/Makefile
@@ -37,7 +37,7 @@ BUNDLED=
# The optimization level here for GCC ports is set here for a reason. It's
# to get you to read this text.
-# The general concensus seems to be that -O2 is the one to use.
+# The general consensus seems to be that -O2 is the one to use.
# Over the years, I've been told to use many different settings, including -O6.
# In recent versions of GCC [as of 2/2005], -O6 generates bad code that, among
# other ill effects, causes infinite loops.
@@ -130,7 +130,7 @@ CREATEPROTO=unixproto
EMPTYPROTO=unixproto
-# Commands possibly overriden by the individual port
+# Commands possibly overridden by the individual port
ARRC=ar rc
CC=cc
diff --git a/imap/src/osdep/unix/ckp_cyg.c b/imap/src/osdep/unix/ckp_cyg.c
index 28e07394..86fe1d0e 100644
--- a/imap/src/osdep/unix/ckp_cyg.c
+++ b/imap/src/osdep/unix/ckp_cyg.c
@@ -27,7 +27,7 @@
*/
/* This module is against my better judgement. If you want to run an imapd
- * or ipop[23]d you should use the native NT or W2K ports intead of this
+ * or ipop[23]d you should use the native NT or W2K ports instead of this
* Cygwin port. There is no surety that this module works right or will work
* right in the future.
*/
diff --git a/imap/src/osdep/unix/ckp_pam.c b/imap/src/osdep/unix/ckp_pam.c
index 5bc31f3d..d6acfda3 100644
--- a/imap/src/osdep/unix/ckp_pam.c
+++ b/imap/src/osdep/unix/ckp_pam.c
@@ -117,7 +117,7 @@ struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[])
* pam_unix.so.1
*/
/*
- * This pam_open_session() call is inconsistant with how we handle other
+ * This pam_open_session() call is inconsistent with how we handle other
* platforms, where we don't write [uw]tmp records. However, unlike our
* code on other platforms, pam_acct_mgmt() will check those records for
* inactivity and deny the authentication.
diff --git a/imap/src/osdep/unix/ckp_pmb.c b/imap/src/osdep/unix/ckp_pmb.c
index c8a935cd..5c098f35 100644
--- a/imap/src/osdep/unix/ckp_pmb.c
+++ b/imap/src/osdep/unix/ckp_pmb.c
@@ -109,7 +109,7 @@ struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[])
* pam_unix.so.1
*/
/*
- * This pam_open_session() call is inconsistant with how we handle other
+ * This pam_open_session() call is inconsistent with how we handle other
* platforms, where we don't write [uw]tmp records. However, unlike our
* code on other platforms, pam_acct_mgmt() will check those records for
* inactivity and deny the authentication.
diff --git a/imap/src/osdep/unix/ckp_psx.c b/imap/src/osdep/unix/ckp_psx.c
index d8ebdaad..0f425bd3 100644
--- a/imap/src/osdep/unix/ckp_psx.c
+++ b/imap/src/osdep/unix/ckp_psx.c
@@ -67,7 +67,7 @@ struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[])
* max number of days a password is valid if positive
* warn number of days of password expiration warning
* expire date account expires if positive
- * inact number of days an accout can be inactive (not checked!)
+ * inact number of days an account can be inactive (not checked!)
* The expiration day is the *last* day that the password or account
* is valid.
*/
diff --git a/imap/src/osdep/unix/mbx.c b/imap/src/osdep/unix/mbx.c
index 18c4fa20..1f41efce 100644
--- a/imap/src/osdep/unix/mbx.c
+++ b/imap/src/osdep/unix/mbx.c
@@ -1168,7 +1168,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
ret = NIL; /* mark failure */
break;
}
- mail_date (tmp,&elt); /* write preseved date */
+ mail_date (tmp,&elt); /* write preserved date */
}
else internal_date (tmp); /* get current date in IMAP format */
/* write header */
diff --git a/imap/src/osdep/unix/mh.c b/imap/src/osdep/unix/mh.c
index ac71b6ba..ebc930e3 100644
--- a/imap/src/osdep/unix/mh.c
+++ b/imap/src/osdep/unix/mh.c
@@ -701,7 +701,7 @@ void mh_load_message (MAILSTREAM *stream,unsigned long msgno,long flags)
}
nlseen = T; /* note newline seen */
break;
- default: /* ordinary chararacter */
+ default: /* ordinary character */
i++;
nlseen = NIL;
break;
@@ -1200,10 +1200,10 @@ int mh_select (struct direct *name)
}
-/* MH file name comparision
+/* MH file name comparison
* Accepts: first candidate directory entry
* second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
*/
int mh_numsort (const void *d1,const void *d2)
diff --git a/imap/src/osdep/unix/mix.c b/imap/src/osdep/unix/mix.c
index c53cabc0..20d2b012 100644
--- a/imap/src/osdep/unix/mix.c
+++ b/imap/src/osdep/unix/mix.c
@@ -975,7 +975,7 @@ long mix_ping (MAILSTREAM *stream)
}
}
if (sysibx) mail_close (sysibx);
- /* reenable APPENDUID/COPYUID */
+ /* re-enable APPENDUID/COPYUID */
mail_parameters (NIL,SET_APPENDUID,(void *) au);
mail_parameters (NIL,SET_COPYUID,(void *) cu);
snarfing = NIL; /* no longer snarfing */
@@ -1163,7 +1163,7 @@ int mix_select (struct direct *name)
}
-/* MIX msg file name comparision
+/* MIX msg file name comparison
* Accepts: first candidate directory entry
* second candidate directory entry
* Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2
@@ -1884,7 +1884,7 @@ FILE *mix_parse (MAILSTREAM *stream,FILE **idxf,long iflags,long sflags)
return NIL;
}
prevuid = uid;
- ++nmsgs; /* this is another mesage */
+ ++nmsgs; /* this is another message */
/* within current known range of messages? */
while (nmsgs <= stream->nmsgs) {
/* yes, get corresponding elt */
@@ -2156,7 +2156,7 @@ char *mix_meta_slurp (MAILSTREAM *stream,unsigned long *seq)
char *s;
char *ret = NIL;
if (fstat (LOCAL->mfd,&sbuf))
- MM_LOG ("Error obtaining size of mix metatdata file",ERROR);
+ MM_LOG ("Error obtaining size of mix metadata file",ERROR);
if (sbuf.st_size > LOCAL->buflen) {
/* should be just a few dozen bytes */
if (sbuf.st_size > METAMAX) fatal ("absurd mix metadata file size");
@@ -2199,7 +2199,7 @@ long mix_meta_update (MAILSTREAM *stream)
*
* If more stuff gets added to the metadata, or if you change the value
* of NUSERFLAGS, MAXUSERFLAG or CHUNKSIZE, be sure to recalculate the
- * above assertation.
+ * above assertion.
*/
sprintf (LOCAL->buf,SEQFMT,LOCAL->metaseq = mix_modseq (LOCAL->metaseq));
sprintf (LOCAL->buf + strlen (LOCAL->buf),MTAFMT,
diff --git a/imap/src/osdep/unix/mtx.c b/imap/src/osdep/unix/mtx.c
index 4346eceb..bc7f296e 100644
--- a/imap/src/osdep/unix/mtx.c
+++ b/imap/src/osdep/unix/mtx.c
@@ -1036,7 +1036,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
ret = NIL; /* mark failure */
break;
}
- mail_date (tmp,&elt); /* write preseved date */
+ mail_date (tmp,&elt); /* write preserved date */
}
else internal_date (tmp); /* get current date in IMAP format */
/* write header */
diff --git a/imap/src/osdep/unix/mx.c b/imap/src/osdep/unix/mx.c
index 10d56b0a..3f90ab9e 100644
--- a/imap/src/osdep/unix/mx.c
+++ b/imap/src/osdep/unix/mx.c
@@ -1119,10 +1119,10 @@ int mx_select (struct direct *name)
}
-/* MX file name comparision
+/* MX file name comparison
* Accepts: first candidate directory entry
* second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
*/
int mx_numsort (const void *d1,const void *d2)
diff --git a/imap/src/osdep/unix/news.c b/imap/src/osdep/unix/news.c
index 1af24273..51eb2e61 100644
--- a/imap/src/osdep/unix/news.c
+++ b/imap/src/osdep/unix/news.c
@@ -411,10 +411,10 @@ int news_select (struct direct *name)
}
-/* News file name comparision
+/* News file name comparison
* Accepts: first candidate directory entry
* second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
*/
int news_numsort (const void *d1,const void *d2)
@@ -533,7 +533,7 @@ void news_load_message (MAILSTREAM *stream,unsigned long msgno,long flags)
}
nlseen = T; /* note newline seen */
break;
- default: /* ordinary chararacter */
+ default: /* ordinary character */
i++;
nlseen = NIL;
break;
diff --git a/imap/src/osdep/unix/nl_unix.c b/imap/src/osdep/unix/nl_unix.c
index 5ae96b08..7b900c6b 100644
--- a/imap/src/osdep/unix/nl_unix.c
+++ b/imap/src/osdep/unix/nl_unix.c
@@ -84,7 +84,7 @@ unsigned long strcrlflen (STRING *s)
break;
case '\012': /* line feed? */
i++;
- default: /* ordinary chararacter */
+ default: /* ordinary character */
break;
}
SETPOS (s,pos); /* restore old position */
diff --git a/imap/src/osdep/unix/os_vu2.c b/imap/src/osdep/unix/os_vu2.c
index be574e07..0b9c026a 100644
--- a/imap/src/osdep/unix/os_vu2.c
+++ b/imap/src/osdep/unix/os_vu2.c
@@ -52,7 +52,7 @@ extern int errno; /* just in case */
#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))
-/* Old Ultrix has its own wierd inet_addr() that returns a in_addr struct. */
+/* Old Ultrix has its own weird inet_addr() that returns a in_addr struct. */
/* Portable inet_addr () that returns a u_long
* Accepts: dotted host string
diff --git a/imap/src/osdep/unix/scandir.c b/imap/src/osdep/unix/scandir.c
index c5e4541b..8f6b4d46 100644
--- a/imap/src/osdep/unix/scandir.c
+++ b/imap/src/osdep/unix/scandir.c
@@ -68,10 +68,10 @@ int scandir (char *dirname,struct direct ***namelist,select_t select,
return nitems; /* and size */
}
-/* Alphabetic file name comparision
+/* Alphabetic file name comparison
* Accepts: first candidate directory entry
* second candidate directory entry
- * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2
+ * Returns: negative if d1 < d2, 0 if d1 == d2, positive if d1 > d2
*/
int alphasort (void *d1,void *d2)
diff --git a/imap/src/osdep/unix/tcp_unix.c b/imap/src/osdep/unix/tcp_unix.c
index c98b479c..bc5fe33a 100644
--- a/imap/src/osdep/unix/tcp_unix.c
+++ b/imap/src/osdep/unix/tcp_unix.c
@@ -208,7 +208,7 @@ TCPSTREAM *tcp_open (char *host,char *service,unsigned long port)
&cleanup)) && !silent)
mm_log (tmp,WARN);
(*bn) (BLOCK_NONE,NIL);
- } while ((sock < 0) && s);/* repeat until success or no more addreses */
+ } while ((sock < 0) && s);/* repeat until success or no more addresses */
}
ip_nametoaddr (NIL,NIL,NIL,NIL,NIL,&cleanup);
}
diff --git a/imap/src/osdep/unix/tenex.c b/imap/src/osdep/unix/tenex.c
index 8815fee1..2e1a5790 100644
--- a/imap/src/osdep/unix/tenex.c
+++ b/imap/src/osdep/unix/tenex.c
@@ -1128,7 +1128,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
ret = NIL; /* mark failure */
break;
}
- mail_date (tmp,&elt); /* write preseved date */
+ mail_date (tmp,&elt); /* write preserved date */
}
else internal_date (tmp); /* get current date in IMAP format */
i = GETPOS (message); /* remember current position */
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-05 02:39:45 +0000