diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2020-01-15 21:41:39 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2020-01-15 21:41:39 -0700 |
| commit | 06c6ab430b223f6923fe74a4b8d11f3e626848a8 (patch) | |
| tree | 2b483acf3ec2da573992c20b766a480e22f4c45a /pith | |
| parent | 9822842646bc2b940d4b98a260ee4e3ac26fce57 (diff) | |
| download | alpine-06c6ab430b223f6923fe74a4b8d11f3e626848a8.tar.xz | |
* Fix a number of misspellings in the source code of Alpine. I hav only
fixed those that belong to the source code of Alpine and do not come
from an external source. List contributed by Jens Schleusener.
Diffstat (limited to 'pith')
101 files changed, 166 insertions, 166 deletions
diff --git a/pith/IO.ReadMe b/pith/IO.ReadMe index 55f98067..0a0286e8 100644 --- a/pith/IO.ReadMe +++ b/pith/IO.ReadMe @@ -41,7 +41,7 @@ is 32 bits wide. The superset comes about from the handling of escape sequences and error conditions. Besides the 21 bits of UCS-4 characters other values that might be returned are values like KEY_UP, KEY_RESIZE, F1-F12, PF1-PF12, NO_OP_COMMAND, NO_OP_IDLE, BADESC, KEY_JUNK, -and NODATA. The way that read_char and GetKey work are slightly differnt +and NODATA. The way that read_char and GetKey work are slightly different from each other. GetKey has some special bits (CTRL, FUNC, MENU) that it might OR together with a character and some of the return values are possible in only one or the other function. diff --git a/pith/abdlc.h b/pith/abdlc.h index a2c3b642..673c9336 100644 --- a/pith/abdlc.h +++ b/pith/abdlc.h @@ -21,7 +21,7 @@ #include "../pith/adrbklib.h" -/* exported protoypes */ +/* exported prototypes */ DL_CACHE_S *get_dlc(long); void warp_to_dlc(DL_CACHE_S *, long); void warp_to_beginning(void); diff --git a/pith/ablookup.h b/pith/ablookup.h index 78d0aafc..21c16286 100644 --- a/pith/ablookup.h +++ b/pith/ablookup.h @@ -80,7 +80,7 @@ typedef struct completelist { } COMPLETE_S; -/* exported protoypes */ +/* exported prototypes */ char *get_nickname_from_addr(ADDRESS *, char *, size_t); char *get_fcc_from_addr(ADDRESS *, char *, size_t); int get_contactinfo_from_addr(ADDRESS *, char **, char **, char **, char **); diff --git a/pith/addrbook.h b/pith/addrbook.h index 39e039d3..1cc93de2 100644 --- a/pith/addrbook.h +++ b/pith/addrbook.h @@ -21,7 +21,7 @@ #include "adrbklib.h" -/* exported protoypes */ +/* exported prototypes */ void addrbook_new_disp_form(PerAddrBook *, char **, int, int (*)(PerAddrBook *, int *)); long first_selectable_line(long); int line_is_selectable(long); diff --git a/pith/addrstring.h b/pith/addrstring.h index 0bc9ef48..63ac934c 100644 --- a/pith/addrstring.h +++ b/pith/addrstring.h @@ -21,7 +21,7 @@ #define RAWFIELD "-RAW-FIELD-" -/* exported protoypes */ +/* exported prototypes */ char *addr_string(ADDRESS *, char *, size_t); char *addr_string_mult(ADDRESS *, char *, size_t); char *simple_addr_string(ADDRESS *, char *, size_t); diff --git a/pith/adjtime.h b/pith/adjtime.h index 41514be8..c2478fe2 100644 --- a/pith/adjtime.h +++ b/pith/adjtime.h @@ -28,7 +28,7 @@ typedef struct our_time_val { } TIMEVAL_S; -/* exported protoypes */ +/* exported prototypes */ time_t get_adj_time(void); time_t get_adj_name_file_mtime(char *); diff --git a/pith/atttype.h b/pith/atttype.h index b0eaa9a1..24b50332 100644 --- a/pith/atttype.h +++ b/pith/atttype.h @@ -41,7 +41,7 @@ typedef struct parmlist { } PARMLIST_S; -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_ATTTYPE_INCLUDED */ diff --git a/pith/busy.h b/pith/busy.h index 08bd2cad..722d72de 100644 --- a/pith/busy.h +++ b/pith/busy.h @@ -27,7 +27,7 @@ typedef int (*percent_done_t)(); /* returns %done for progress status msg */ #endif -/* exported protoypes */ +/* exported prototypes */ /* currently mandatory to implement stubs */ diff --git a/pith/charset.c b/pith/charset.c index e4d7875d..124b15fc 100644 --- a/pith/charset.c +++ b/pith/charset.c @@ -79,7 +79,7 @@ trans_euc_to_2022_jp(unsigned char *src) /* * Worst possible increase is every other character an 8-bit character. - * In that case, each of those gets 6 extra charactes for the escape + * In that case, each of those gets 6 extra characters for the escape * sequences. We're not too concerned about the extra length because * these are relatively short strings. */ @@ -140,7 +140,7 @@ trans_euc_to_2022_jp(unsigned char *src) * * RFC 1522 support is *very* loosely based on code contributed * by Lars-Erik Johansson <lej@cdg.chalmers.se>. Thanks to Lars-Erik, - * and appologies for taking such liberties with his code. + * and apologies for taking such liberties with his code. */ #define RFC1522_INIT "=?" diff --git a/pith/charset.h b/pith/charset.h index 7f6dbcb7..7fb79995 100644 --- a/pith/charset.h +++ b/pith/charset.h @@ -30,7 +30,7 @@ typedef struct conversion_table { } CONV_TABLE; -/* Conversion table quality of tranlation */ +/* Conversion table quality of translation */ #define CV_NO_TRANSLATE_POSSIBLE 1 /* We don't know how to */ /* translate this pair */ #define CV_NO_TRANSLATE_NEEDED 2 /* Not necessary, no-op */ @@ -44,7 +44,7 @@ typedef struct conversion_table { #define CSET_MAX 64 -/* exported protoypes */ +/* exported prototypes */ char *body_charset(MAILSTREAM *, long, unsigned char *); unsigned char *trans_euc_to_2022_jp(unsigned char *); unsigned char *rfc1522_decode_to_utf8(unsigned char *, size_t, char *); diff --git a/pith/color.h b/pith/color.h index b5b9f012..f74a4ce9 100644 --- a/pith/color.h +++ b/pith/color.h @@ -78,7 +78,7 @@ typedef struct spec_color_s { #define DEFAULT_IND_OP_BACK_RGB "255,255,255" -/* exported protoypes */ +/* exported prototypes */ char *color_embed(char *, char *); int colorcmp(char *, char *); int color_a_quote(long, char *, LT_INS_S **, void *); diff --git a/pith/conf.c b/pith/conf.c index 3ce1c8a2..9fc2bc4d 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -349,7 +349,7 @@ CONF_TXT_T cf_text_stat_msg_delay[] = "The number of seconds to sleep after writ CONF_TXT_T cf_text_busy_cue_rate[] = "Number of times per-second to update busy cue messages"; -CONF_TXT_T cf_text_psleep[] = "UNIX ONLY (except MAC OSX): When an attachment is opened, this variable controls the number\n#of seconds to wait between checks if the user has ended viewing the attachment.\n#minimun value: 60 seconds, maximum value: 600 seconds (10 minutes). Default: 60 seconds"; +CONF_TXT_T cf_text_psleep[] = "UNIX ONLY (except MAC OSX): When an attachment is opened, this variable controls the number\n#of seconds to wait between checks if the user has ended viewing the attachment.\n#minimum value: 60 seconds, maximum value: 600 seconds (10 minutes). Default: 60 seconds"; CONF_TXT_T cf_text_mailcheck[] = "The approximate number of seconds between checks for new mail"; @@ -2491,7 +2491,7 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **)) && strncmp(VAR_LAST_VERS_USED, ps->vers_internal, 4) >= 0)){ ps->show_new_version = 0; } - /* Otherwise just do lexicographic comparision... */ + /* Otherwise just do lexicographic comparison... */ else if(VAR_LAST_VERS_USED && strcmp(VAR_LAST_VERS_USED, ps->vers_internal) >= 0){ ps->show_new_version = 0; diff --git a/pith/conf.h b/pith/conf.h index a7651145..387e851e 100644 --- a/pith/conf.h +++ b/pith/conf.h @@ -836,7 +836,7 @@ struct sm_folder { #define CONF_TXT_T char -/* exported protoypes */ +/* exported prototypes */ void init_init_vars(struct pine *); void init_pinerc(struct pine *, char **); void init_vars(struct pine *, void (*)(struct pine *, char **)); diff --git a/pith/conftype.h b/pith/conftype.h index 7a67fab8..e6f042a7 100644 --- a/pith/conftype.h +++ b/pith/conftype.h @@ -782,7 +782,7 @@ typedef struct smime_stuff { #endif /* SMIME */ -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_CONFTYPE_INCLUDED */ diff --git a/pith/context.c b/pith/context.c index 1aae6c56..ae3bfe1a 100644 --- a/pith/context.c +++ b/pith/context.c @@ -48,7 +48,7 @@ char *context_percent_quote(char *); * quote a literal '[' or ']' in a context name. * * 3) an empty view in context implies a view of '*', so that's - * what get's put in the view string + * what gets put in the view string * * The 2nd,3rd,4th, and 5th args all have length at least len. * diff --git a/pith/copyaddr.h b/pith/copyaddr.h index 872f2fb0..e09f003b 100644 --- a/pith/copyaddr.h +++ b/pith/copyaddr.h @@ -18,7 +18,7 @@ #define PITH_COPYADDR_INCLUDED -/* exported protoypes */ +/* exported prototypes */ ADDRESS *copyaddr(ADDRESS *); ADDRESS *copyaddrlist(ADDRESS *); diff --git a/pith/detach.h b/pith/detach.h index e117c325..98a48960 100644 --- a/pith/detach.h +++ b/pith/detach.h @@ -59,7 +59,7 @@ extern FETCH_READC_S *g_fr_desc; #define DT_NOINTR (long) 0x20000 #define DT_BINARY (long) 0x40000 -/* exported protoypes */ +/* exported prototypes */ char *detach_raw(MAILSTREAM *, long, char *, gf_io_t, int); char *detach(MAILSTREAM *, long, char *, long, long *, gf_io_t, FILTLIST_S *, long); int valid_filter_command(char **); diff --git a/pith/detoken.h b/pith/detoken.h index 14e6b670..7d906bd5 100644 --- a/pith/detoken.h +++ b/pith/detoken.h @@ -22,7 +22,7 @@ #include "../pith/repltype.h" -/* exported protoypes */ +/* exported prototypes */ char *detoken(ACTION_S *, ENVELOPE *, int, int, int, REDRAFT_POS_S **, int *); char *detoken_src(char *, int, ENVELOPE *, ACTION_S *, REDRAFT_POS_S **, int *); diff --git a/pith/editorial.h b/pith/editorial.h index 9310a740..35fa77e7 100644 --- a/pith/editorial.h +++ b/pith/editorial.h @@ -22,7 +22,7 @@ #include "../pith/filter.h" -/* exported protoypes */ +/* exported prototypes */ char *format_editorial(char *, int, int, HANDLE_S **, gf_io_t); diff --git a/pith/escapes.h b/pith/escapes.h index 56907239..7c998387 100644 --- a/pith/escapes.h +++ b/pith/escapes.h @@ -18,7 +18,7 @@ #define PITH_ESCAPES_INCLUDED -/* exported protoypes */ +/* exported prototypes */ int match_escapes(char *); diff --git a/pith/filter.c b/pith/filter.c index 6288606d..66abe420 100644 --- a/pith/filter.c +++ b/pith/filter.c @@ -976,8 +976,8 @@ gf_pipe(gf_io_t gc, gf_io_t pc) #ifdef _WINDOWS if(!(gf_byte_count & 0x3ff)) /* Under windows we yield to allow event processing. - * Progress display is handled throught the alarm() - * mechinism. + * Progress display is handled through the alarm() + * mechanism. */ mswin_yield (); #endif @@ -1017,7 +1017,7 @@ gf_bytes_piped(void) * pc -- function to write filtered output with * aux_filters -- additional filters to pass data thru after "cmd" * - * Returns: NULL on sucess, reason for failure (not alloc'd!) on error + * Returns: NULL on success, reason for failure (not alloc'd!) on error */ char * gf_filter(char *cmd, char *prepend, STORE_S *source_so, gf_io_t pc, @@ -2392,7 +2392,7 @@ gf_rich2plain(FILTER_S *f, int flg) { static int rich_bold_on = 0, rich_uline_on = 0; -/* BUG: qoute incoming \255 values */ +/* BUG: quote incoming \255 values */ GF_INIT(f, f->next); if(flg == GF_DATA){ @@ -2567,7 +2567,7 @@ gf_enriched2plain(FILTER_S *f, int flg) { static int enr_uline_on = 0, enr_bold_on = 0; -/* BUG: qoute incoming \255 values */ +/* BUG: quote incoming \255 values */ GF_INIT(f, f->next); if(flg == GF_DATA){ @@ -2919,8 +2919,8 @@ typedef struct _html_opts { unsigned handles_loc:1; /* Local handles requested? */ unsigned showserver:1; /* Display server after anchors */ unsigned outputted:1; /* any */ - unsigned no_relative_links:1; /* Disable embeded relative links */ - unsigned related_content:1; /* Embeded related content */ + unsigned no_relative_links:1; /* Disable embedded relative links */ + unsigned related_content:1; /* Embedded related content */ unsigned html:1; /* Output content in HTML */ unsigned html_imgs:1; /* Output IMG tags in HTML content */ } HTML_OPT_S; @@ -3609,7 +3609,7 @@ static ELPROP_S html_element_table[] = { {"SAMP", 4, html_samp}, /* Sample Text (NO OP) */ {"CITE", 4, html_cite}, /* Citation (NO OP) */ {"CODE", 4, html_code}, /* Code Text (NO OP) */ - {"INS", 3, html_ins}, /* Text Inseted (NO OP) */ + {"INS", 3, html_ins}, /* Text Inserted (NO OP) */ {"DEL", 3, html_del}, /* Text Deleted (NO OP) */ {"SUP", 3, html_sup}, /* Text Superscript (NO OP) */ {"SUB", 3, html_sub}, /* Text Superscript (NO OP) */ @@ -3644,8 +3644,8 @@ static ELPROP_S html_element_table[] = { {"THEAD", 5, html_thead}, /* Table Table Head */ {"TBODY", 5, html_tbody}, /* Table Table Body */ {"TFOOT", 5, html_tfoot}, /* Table Table Foot */ - {"COL", 3, html_col}, /* Table Column Attibutes */ - {"COLGROUP", 8, html_colgroup}, /* Table Column Group Attibutes */ + {"COL", 3, html_col}, /* Table Column Attributes */ + {"COLGROUP", 8, html_colgroup}, /* Table Column Group Attributes */ {NULL, 0, NULL} }; @@ -3745,7 +3745,7 @@ html_pop(FILTER_S *fd, ELPROP_S *ep) /* - * Deal with data passed a hander in its GF_DATA state + * Deal with data passed a handler in its GF_DATA state */ static void html_handoff(HANDLER_S *hd, int ch) @@ -5637,7 +5637,7 @@ html_ol(HANDLER_S *hd, int ch, int cmd) else{ PARAMETER *p; /* - * Signal that we're expecting to see <LI> as our next elemnt + * Signal that we're expecting to see <LI> as our next element * and set the the initial ordered count. */ hd->x = 1L; /* set default */ @@ -6463,7 +6463,7 @@ html_pre(HANDLER_S *hd, int ch, int cmd) /* - * HTML <CENTER> (Centerd Text) element handler + * HTML <CENTER> (Centered Text) element handler */ int html_center(HANDLER_S *hd, int ch, int cmd) @@ -7405,7 +7405,7 @@ html_element_collector(FILTER_S *fd, int ch) /* * Remember the comment for possible later processing, if - * it get's too long, remember first and last few chars + * it gets too long, remember first and last few chars * so we know when to terminate (and throw some garbage * in between when we toss out what's between. */ @@ -7887,7 +7887,7 @@ html_entity_collector(FILTER_S *f, int ch, UCS *ucs, char **alt) void gf_html2plain(FILTER_S *f, int flg) { -/* BUG: qoute incoming \255 values (see "yuml" above!) */ +/* BUG: quote incoming \255 values (see "yuml" above!) */ if(flg == GF_DATA){ register int c; GF_INIT(f, f->next); diff --git a/pith/filter.h b/pith/filter.h index 8c253686..72661963 100644 --- a/pith/filter.h +++ b/pith/filter.h @@ -37,7 +37,7 @@ /* gf_wrap flags */ #define GFW_NONE 0x000 /* no flags */ -#define GFW_HANDLES 0x001 /* anticpate handle data */ +#define GFW_HANDLES 0x001 /* anticipate handle data */ #define GFW_ONCOMMA 0x002 /* prefer comma wrap to spaces */ #define GFW_FLOWED 0x004 #define GFW_FLOW_RESULT 0x008 @@ -99,7 +99,7 @@ typedef struct _rss_feed_s { /* - * This searchs for lines beginning with From<space> so that we can QP-encode + * This searches for lines beginning with From<space> so that we can QP-encode * them. It also searches for lines consisting of only a dot. Some mailers * will mangle these lines. The reason it is ifdef'd is because most people * seem to prefer the >From style escape provided by a lot of mail software @@ -156,7 +156,7 @@ typedef struct _rss_feed_s { } -/* exported protoypes */ +/* exported prototypes */ int generic_readc_locale(unsigned char *c, int (*get_a_char)(unsigned char *, void *), void *extraarg, diff --git a/pith/filttype.h b/pith/filttype.h index a8bf17d1..83c57734 100644 --- a/pith/filttype.h +++ b/pith/filttype.h @@ -70,7 +70,7 @@ typedef struct cbuf_s { } CBUF_S; -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_FILTTYPE_INCLUDED */ diff --git a/pith/flag.c b/pith/flag.c index d4ec3c05..4a24ba23 100644 --- a/pith/flag.c +++ b/pith/flag.c @@ -140,7 +140,7 @@ flag_search(MAILSTREAM *stream, int flags, MsgNo set_start, MSGNO_S *set_msgmap, } /* - * No search-worthy messsages?, prod the server for + * No search-worthy messages?, prod the server for * any flag updates and clear the searched bits... */ if(full_set){ diff --git a/pith/flag.h b/pith/flag.h index 48c8f052..7a30f017 100644 --- a/pith/flag.h +++ b/pith/flag.h @@ -141,7 +141,7 @@ typedef long MsgNo; -/* exported protoypes */ +/* exported prototypes */ long count_flagged(MAILSTREAM *, long); MsgNo first_sorted_flagged(unsigned long, MAILSTREAM *, long, int); MsgNo next_sorted_flagged(unsigned long, MAILSTREAM *, long, int *); diff --git a/pith/folder.c b/pith/folder.c index ee250943..64d57922 100644 --- a/pith/folder.c +++ b/pith/folder.c @@ -553,7 +553,7 @@ init_folders(struct pine *ps) /* * Build context that's a list of folders the user's defined - * as receiveing new messages. At some point, this should + * as receiving new messages. At some point, this should * probably include adding a prefix with the new message count. * fake new context... */ @@ -1529,7 +1529,7 @@ default_save_context(CONTEXT_S *cntxt) /* * folder_complete - foldername completion routine * - * Result: returns 0 if the folder doesn't have a any completetion + * Result: returns 0 if the folder doesn't have a any completion * 1 if the folder has a completion (*AND* "name" is * replaced with the completion) * @@ -1861,7 +1861,7 @@ folder_is_target_of_nick(char *longname, CONTEXT_S *cntxt) **** WARNING **** DON'T count on the folder pointer being valid after this returns - *** ALL FOLDER ELEMENT READS SHOULD BE THRU folder_entry() *** + *** ALL FOLDER ELEMENT READS SHOULD BE THROUGH folder_entry() *** ----*/ int diff --git a/pith/folder.h b/pith/folder.h index e15dd3c2..01d78942 100644 --- a/pith/folder.h +++ b/pith/folder.h @@ -58,7 +58,7 @@ typedef struct _existdata { #define FEX_ISDIR 0x0002 /* file_exists: name is a dir */ #define FEX_ISMARKED 0x0004 /* file_exists: is interesting */ #define FEX_UNMARKED 0x0008 /* file_exists: known UNinteresting */ -#define FEX_ERROR 0x1000 /* file_exists: error occured */ +#define FEX_ERROR 0x1000 /* file_exists: error occurred */ #define BFL_NONE 0x00 /* build_folder_list: no flag */ #define BFL_FLDRONLY 0x01 /* ignore directories */ @@ -82,7 +82,7 @@ typedef struct _existdata { #define UFU_ANNOUNCE 0x02 /* announce increases with q_status */ -/* exported protoypes */ +/* exported prototypes */ char *folder_lister_desc(CONTEXT_S *, FDIR_S *); void reset_context_folders(CONTEXT_S *); FDIR_S *next_folder_dir(CONTEXT_S *, char *, int, MAILSTREAM **); diff --git a/pith/foldertype.h b/pith/foldertype.h index 9085fc01..8ed0e87d 100644 --- a/pith/foldertype.h +++ b/pith/foldertype.h @@ -107,7 +107,7 @@ typedef struct selected_s { /*------------------------------ - Stucture to keep track of the various folder collections being + Structure to keep track of the various folder collections being dealt with. ----*/ typedef struct context { @@ -158,7 +158,7 @@ typedef struct context { ((X)->dir->status & CNTXT_PARTFIND) == 0) -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_FOLDERTYPE_INCLUDED */ diff --git a/pith/handle.h b/pith/handle.h index a15c67d2..afbd1373 100644 --- a/pith/handle.h +++ b/pith/handle.h @@ -82,7 +82,7 @@ typedef struct handle_s { typedef int (*url_tool_t)(char *); -/* exported protoypes */ +/* exported prototypes */ HANDLE_S *get_handle(HANDLE_S *, int); void init_handles(HANDLE_S **); HANDLE_S *new_handle(HANDLE_S **); diff --git a/pith/help.h b/pith/help.h index fd3807cd..fce7b7da 100644 --- a/pith/help.h +++ b/pith/help.h @@ -49,7 +49,7 @@ extern int rmhifirst, rmhilast; extern int rm_not_right_now; -/* exported protoypes */ +/* exported prototypes */ HelpType help_name2section(char *, int); void debugjournal_to_file(FILE *); void add_review_message(char *, int); diff --git a/pith/help_c_gen.c b/pith/help_c_gen.c index b4c5ee9d..94e7dbc6 100644 --- a/pith/help_c_gen.c +++ b/pith/help_c_gen.c @@ -48,7 +48,7 @@ void preamble(FILE *ofp) { fprintf(ofp, "\n\t\t/*\n"); - fprintf(ofp, "\t\t * AUTMATICALLY GENERATED FILE!\n"); + fprintf(ofp, "\t\t * AUTOMATICALLY GENERATED FILE!\n"); fprintf(ofp, "\t\t * DO NOT EDIT!!\n"); fprintf(ofp, "\t\t * See help_c_gen.c.\n\t\t */\n\n\n"); fprintf(ofp, "#include <stdio.h>\n#include \"headers.h\"\n#include \"helptext.h\"\n\n"); diff --git a/pith/help_h_gen.c b/pith/help_h_gen.c index 1e7b904e..8a739fce 100644 --- a/pith/help_h_gen.c +++ b/pith/help_h_gen.c @@ -36,7 +36,7 @@ void preamble(FILE *ofp) { fprintf(ofp, "\n\t\t/*\n"); - fprintf(ofp, "\t\t * AUTMATICALLY GENERATED FILE!\n"); + fprintf(ofp, "\t\t * AUTOMATICALLY GENERATED FILE!\n"); fprintf(ofp, "\t\t * DO NOT EDIT!!\n"); fprintf(ofp, "\t\t * See help_h_gen.c.\n\t\t */\n\n\n"); fprintf(ofp, "#ifndef PITH_HELPTEXT_INCLUDED\n"); diff --git a/pith/icache.h b/pith/icache.h index fff2a992..394dba7c 100644 --- a/pith/icache.h +++ b/pith/icache.h @@ -28,7 +28,7 @@ #define IC_CLEAR_WIDTHS_DONE 0x02 -/* exported protoypes */ +/* exported prototypes */ void clear_index_cache_ent(MAILSTREAM *, long, unsigned); void clear_index_cache(MAILSTREAM *, unsigned); void clear_index_cache_for_thread(MAILSTREAM *, PINETHRD_S *, MSGNO_S *); diff --git a/pith/ical.c b/pith/ical.c index 950f4018..e2f482fa 100644 --- a/pith/ical.c +++ b/pith/ical.c @@ -34,7 +34,7 @@ ICAL_PARAMETER_S *ical_parameter_cpy(ICAL_PARAMETER_S *param); char *ical_get_value(char **); unsigned char *ical_decode(char *, unsigned short); -/* pase component */ +/* parse component */ void *ical_parse_vcalendar(char **); void *ical_parse_vevent(char **); void *ical_parse_vtodo(char **); @@ -251,7 +251,7 @@ ical_decode(char *text, unsigned short encoding) /* Return code: 0 - if no errors - -1 - if an error occured + -1 - if an error occurred Args: a pointer to the text. If there is an error, the text is not modified. */ int @@ -637,7 +637,7 @@ ical_cline_cpy(ICLINE_S *icl) return rv; } -/* Given a \r\n-ending line (called *text), isolate the ocurrence +/* Given a \r\n-ending line (called *text), isolate the occurrence * of the token in that line. * Return the token, and modify the pointer to *text to point to the * end of the token. Modify sep to contain the character following diff --git a/pith/imap.h b/pith/imap.h index c7b25b8f..979f532d 100644 --- a/pith/imap.h +++ b/pith/imap.h @@ -118,7 +118,7 @@ extern MMLOGIN_S *cert_failure_list; #endif -/* exported protoypes */ +/* exported prototypes */ char *imap_referral(MAILSTREAM *, char *, long); long imap_proxycopy(MAILSTREAM *, char *, char *, long); char *cached_user_name(char *); diff --git a/pith/indxtype.h b/pith/indxtype.h index 33ef5d95..15e451db 100644 --- a/pith/indxtype.h +++ b/pith/indxtype.h @@ -245,7 +245,7 @@ typedef struct index_data { typedef enum {NoKW, KW, KWInit} SubjKW; -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_INDXTYPE_INCLUDED */ diff --git a/pith/init.h b/pith/init.h index 0ad07eb7..30ffb099 100644 --- a/pith/init.h +++ b/pith/init.h @@ -27,7 +27,7 @@ #define LEGAL_NOTICE \ "For Copyright information press \"?\"" -/* exported protoypes */ +/* exported prototypes */ int init_username(struct pine *); int init_userdir(struct pine *); int init_hostname(struct pine *); diff --git a/pith/keyword.h b/pith/keyword.h index 27e99687..3d44b831 100644 --- a/pith/keyword.h +++ b/pith/keyword.h @@ -29,7 +29,7 @@ typedef struct keywords { } KEYWORD_S; -/* exported protoypes */ +/* exported prototypes */ KEYWORD_S *init_keyword_list(char **); KEYWORD_S *new_keyword_s(char *, char *); void free_keyword_list(KEYWORD_S **); diff --git a/pith/ldap.c b/pith/ldap.c index 6826b13c..cc0b7727 100644 --- a/pith/ldap.c +++ b/pith/ldap.c @@ -62,7 +62,7 @@ int our_ldap_set_lderrno(LDAP *, int, char *, char *); * Args string -- the string to use in the lookup * * Returns NULL -- lookup failed - * Address -- A single address is returned if lookup was successfull. + * Address -- A single address is returned if lookup was successful. */ ADDRESS * wp_lookups(char *string, WP_ERR_S *wp_err, int recursing) diff --git a/pith/ldap.h b/pith/ldap.h index b7a82e0b..0bb9f2a2 100644 --- a/pith/ldap.h +++ b/pith/ldap.h @@ -60,7 +60,7 @@ typedef struct ldap_serv { * * We may run into the problem of LDAP databases containing non-UTF-8 data * because they are old. They should have all UTF-8 data and that is what - * we are assuming. If we wanted to accomodate these servers we could + * we are assuming. If we wanted to accommodate these servers we could * translate the data when we use it. LDAP data is only used in a few * places so it might not be too hard to fix it. There are four calls * into the LDAP library that produce character strings which are @@ -165,7 +165,7 @@ extern int wp_exit; extern int wp_nobail; -/* exported protoypes */ +/* exported prototypes */ ADDRESS *wp_lookups(char *, WP_ERR_S *, int); #ifdef ENABLE_LDAP int ldap_lookup_all(char *, int, int, LDAPLookupStyle, CUSTOM_FILT_S *, diff --git a/pith/list.h b/pith/list.h index d7f71d6e..d8847679 100644 --- a/pith/list.h +++ b/pith/list.h @@ -23,7 +23,7 @@ #define PL_COMMAQUOTE 0x02 /* backslash quotes comma */ -/* exported protoypes */ +/* exported prototypes */ char **parse_list(char *, int, int, char **); char **copy_list_array(char **); void free_list_array(char ***); diff --git a/pith/mailcap.c b/pith/mailcap.c index 1216e653..9fd9410e 100644 --- a/pith/mailcap.c +++ b/pith/mailcap.c @@ -300,7 +300,7 @@ mc_parse_line(char **line, char **tokens) /* - * Retuns 1 if line is a comment, 0 otherwise + * Returns 1 if line is a comment, 0 otherwise */ int mc_comment(char **line) @@ -325,7 +325,7 @@ mc_comment(char **line) /* - * Retuns 0 if EOL, 1 otherwise + * Returns 0 if EOL, 1 otherwise */ int mc_token(char **token, char **line) @@ -532,7 +532,7 @@ mc_sane_command(char *command) #ifdef LATER /* * NOTE: Maybe we'll do this later. The problem is when the - * mailcap's been misconfigured. We then end up supressing + * mailcap's been misconfigured. We then end up suppressing * valuable output when the user actually tries to launch the * spec'd viewer. */ @@ -548,7 +548,7 @@ mc_sane_command(char *command) /* - * Returns the mailcap entry for type/subtype from the successfull + * Returns the mailcap entry for type/subtype from the successful * mailcap entry, or NULL if none. Command string still contains % stuff. */ MailcapEntry * diff --git a/pith/mailcap.h b/pith/mailcap.h index 08cc39da..e4482e92 100644 --- a/pith/mailcap.h +++ b/pith/mailcap.h @@ -24,7 +24,7 @@ typedef struct mcap_cmd { } MCAP_CMD_S; -/* exported protoypes */ +/* exported prototypes */ char *mc_conf_path(char *, char *, char *, int, char *); int mailcap_can_display(int, char *, BODY *, int); MCAP_CMD_S *mailcap_build_command(int, char *, BODY *, char *, int *, int); diff --git a/pith/mailcmd.c b/pith/mailcmd.c index 9a852c91..830977d9 100644 --- a/pith/mailcmd.c +++ b/pith/mailcmd.c @@ -1663,7 +1663,7 @@ expunge_and_close(MAILSTREAM *stream, char **final_msg, long unsigned int flags) } /* - * Make darn sure any mm_log fallout caused above get's seen... + * Make darn sure any mm_log fallout caused above gets seen... */ if(!no_close){ flush_status_messages(1); diff --git a/pith/mailcmd.h b/pith/mailcmd.h index 0e008951..560779de 100644 --- a/pith/mailcmd.h +++ b/pith/mailcmd.h @@ -49,7 +49,7 @@ #define MCMD_ISAGG(O) ((O) & (MCMD_AGG | MCMD_AGG_2)) -/* exported protoypes */ +/* exported prototypes */ int any_messages(MSGNO_S *, char *, char *); void bogus_utf8_command(char *, char *); int can_set_flag(struct pine *, char *, int); diff --git a/pith/mailindx.c b/pith/mailindx.c index 3d7e5c70..2faefed8 100644 --- a/pith/mailindx.c +++ b/pith/mailindx.c @@ -4181,7 +4181,7 @@ index_data_env(INDEXDATA_S *idata, ENVELOPE *env) idata->date = (char *) env->date; idata->newsgroups = env->newsgroups; - idata->valid_to = 1; /* signal that everythings here */ + idata->valid_to = 1; /* signal that everything is here */ idata->valid_cc = 1; idata->valid_sender = 1; idata->valid_news = 1; diff --git a/pith/maillist.h b/pith/maillist.h index 8300baae..a0e642af 100644 --- a/pith/maillist.h +++ b/pith/maillist.h @@ -50,7 +50,7 @@ typedef struct rfc2369_s { } RFC2369_S; -/* exported protoypes */ +/* exported prototypes */ char **rfc2369_hdrs(char **); int rfc2369_parse_fields(char *, RFC2369_S *); diff --git a/pith/mailpart.h b/pith/mailpart.h index a9350867..8ae1ddc2 100644 --- a/pith/mailpart.h +++ b/pith/mailpart.h @@ -51,7 +51,7 @@ #define MIME_VCALENDAR_A(a) MIME_VCALENDAR((a)->body->type, (a)->body->subtype) -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_MAILPART_INCLUDED */ diff --git a/pith/mailview.c b/pith/mailview.c index cd50e88b..a56dd1d3 100644 --- a/pith/mailview.c +++ b/pith/mailview.c @@ -3131,7 +3131,7 @@ pine_rfc822_cat(char *src, const char *specials, gf_io_t pc) Result: A formatted, malloced string is returned. -The resuling lines formatted are 80 columns wide. +The resulting lines formatted are 80 columns wide. ----------------------------------------------------------------------*/ void format_newsgroup_string(char *field_name, char *newsgrps, int flags, gf_io_t pc) diff --git a/pith/mailview.h b/pith/mailview.h index 3495debf..9007f944 100644 --- a/pith/mailview.h +++ b/pith/mailview.h @@ -122,7 +122,7 @@ typedef struct header_s { } -/* exported protoypes */ +/* exported prototypes */ int format_message(long, ENVELOPE *, BODY *, HANDLE_S **, int, gf_io_t); int format_attachment_list(long int, BODY *, HANDLE_S **, int, int, gf_io_t); char *format_body(long int, BODY *, HANDLE_S **, HEADER_S *, int, int, gf_io_t); diff --git a/pith/margin.h b/pith/margin.h index d542704b..dab09d81 100644 --- a/pith/margin.h +++ b/pith/margin.h @@ -18,7 +18,7 @@ #define PITH_MARGIN_INCLUDED -/* exported protoypes */ +/* exported prototypes */ int *format_view_margin(void); int *non_messageview_margin(void); diff --git a/pith/mimedesc.c b/pith/mimedesc.c index daf6668b..c51161a2 100644 --- a/pith/mimedesc.c +++ b/pith/mimedesc.c @@ -487,7 +487,7 @@ static struct set_names { {"ISO-8859-14", "Latin 8 (Celtic)"}, {"ISO-8859-15", "Latin 9 (Euro)"}, {"KOI8-R", "Latin & Russian"}, - {"KOI8-U", "Latin & Ukranian"}, + {"KOI8-U", "Latin & Ukrainian"}, {"VISCII", "Latin & Vietnamese"}, {"GB2312", "Latin & Simplified Chinese"}, {"BIG5", "Latin & Traditional Chinese"}, @@ -506,7 +506,7 @@ static struct set_names { /*---------------------------------------------------------------------- - Return a nicely formatted discription of the type of the part + Return a nicely formatted description of the type of the part ----*/ char * @@ -736,7 +736,7 @@ fcc_size_guess(struct mail_bodystruct *body) * is a per-line increase in that because of the CRLFs and * because the number of characters in the line might not * be a factor of 3. So push it up by 3/2 instead. This still - * won't catch all the cases. In particular, attachements with + * won't catch all the cases. In particular, attachments with * lots of short lines (< 10) will expand by more than that, * but that's ok since this is an optimization. That's why * so_cs_puts uses the 3/2 factor when it does a resize, so diff --git a/pith/mimetype.h b/pith/mimetype.h index 36d4b2a1..06be87b0 100644 --- a/pith/mimetype.h +++ b/pith/mimetype.h @@ -39,7 +39,7 @@ typedef struct { typedef int (* MT_OPERATORPROC)(MT_MAP_T *, FILE *); -/* exported protoypes */ +/* exported prototypes */ int set_mime_type_by_extension(BODY *, char *); int set_mime_extension_by_type(char *, char *); int check_mime_type_by_extension(char *, char *); diff --git a/pith/msgno.h b/pith/msgno.h index 728f4af4..4b0e922c 100644 --- a/pith/msgno.h +++ b/pith/msgno.h @@ -181,7 +181,7 @@ typedef struct msg_nos { #define MI_CLOSING 0x04 -/* exported protoypes */ +/* exported prototypes */ void msgno_init(MSGNO_S **, long, SortOrder, int); void msgno_reset_isort(MSGNO_S *); void msgno_give(MSGNO_S **); diff --git a/pith/newmail.c b/pith/newmail.c index b896a701..43799216 100644 --- a/pith/newmail.c +++ b/pith/newmail.c @@ -64,7 +64,7 @@ int check_point(MAILSTREAM *, CheckPointTime, int); Limit frequency of checks because checks use some resources. That is they generate an IMAP packet or require locking the local mailbox. - (Acutally the lock isn't required, a stat will do, but the current + (Actually the lock isn't required, a stat will do, but the current c-client mail code locks before it stats.) Returns >= 0 only if there is a change in the given mail stream. Otherwise diff --git a/pith/newmail.h b/pith/newmail.h index 26be9d5e..c83b7b6e 100644 --- a/pith/newmail.h +++ b/pith/newmail.h @@ -39,7 +39,7 @@ typedef enum {GoodTime = 0, BadTime, VeryBadTime, DoItNow} CheckPointTime; #define IT_MCLOSED 1 -/* exported protoypes */ +/* exported prototypes */ long new_mail(int, CheckPointTime, int); void format_new_mail_msg(char *, long, ENVELOPE *, char *, char *, char *, char *, size_t); void check_point_change(MAILSTREAM *); diff --git a/pith/news.h b/pith/news.h index 322a16fa..d3bb69aa 100644 --- a/pith/news.h +++ b/pith/news.h @@ -28,7 +28,7 @@ #define IS_NEWS(S) ((S) ? ns_test((S)->mailbox, "news") : 0) -/* exported protoypes */ +/* exported prototypes */ int ns_test(char *, char *); int news_in_folders(struct variable *); int news_grouper(char *, char **, char **, char **, void (*)(void)); diff --git a/pith/options.h b/pith/options.h index 475a0f47..dbd0ef0a 100644 --- a/pith/options.h +++ b/pith/options.h @@ -59,7 +59,7 @@ extern void (*pith_opt_paint_index_hline)(MAILSTREAM *, long, ICE_S *); /* * optional hook in mailview.c:format_message to allow for inserting an - * [editorial commment] in message text to indicate the message contains + * [editorial comment] in message text to indicate the message contains * list-management pointers */ extern int (*pith_opt_rfc2369_editorial)(long, HANDLE_S **, int, int, gf_io_t); diff --git a/pith/osdep/pipe.c b/pith/osdep/pipe.c index 25adc22f..13c5b6c7 100644 --- a/pith/osdep/pipe.c +++ b/pith/osdep/pipe.c @@ -89,7 +89,7 @@ RETSIGTYPE pipe_alarm(int); stdout/stderr. *NOTE* Having neither of the above set means we're not setting up any pipes, just forking the child and exec'ing the command. Also, this takes precedence over any named outfile. - PIPE_STDERR means we're to tie the childs stderr to the same place + PIPE_STDERR means we're to tie the child's stderr to the same place stdout is going. *NOTE* This only makes sense then if PIPE_READ or an outfile is provided. Also, this takes precedence over any named errfile. diff --git a/pith/osdep/pipe.h b/pith/osdep/pipe.h index 35e7d215..a7992758 100644 --- a/pith/osdep/pipe.h +++ b/pith/osdep/pipe.h @@ -72,7 +72,7 @@ #define OSB_POST_CLOSE 0x0008 /* - * stucture required for the pipe commands... + * structure required for the pipe commands... */ typedef struct pipe_s { pid_t pid; /* child's process id */ diff --git a/pith/osdep/pw_stuff.c b/pith/osdep/pw_stuff.c index c5a8580d..8938f77c 100644 --- a/pith/osdep/pw_stuff.c +++ b/pith/osdep/pw_stuff.c @@ -35,7 +35,7 @@ static char *gcos_name(char *, char *); Pull the name out of the gcos field if we have that sort of /etc/passwd Args: gcos_field -- The long name or GCOS field to be parsed - logname -- Replaces occurances of & with logname string + logname -- Replaces occurences of & with logname string Result: returns pointer to buffer with name ----*/ diff --git a/pith/pattern.c b/pith/pattern.c index 730a33f5..9b47d411 100644 --- a/pith/pattern.c +++ b/pith/pattern.c @@ -6132,7 +6132,7 @@ calc_extra_hdrs(void) pat; pat = next_pattern(&pstate)){ /* - * This section wouldn't be necessary if sender was retreived + * This section wouldn't be necessary if sender was retrieved * from the envelope. But if not, we do need to add it. */ if(pat->patgrp && pat->patgrp->sender) @@ -7688,12 +7688,12 @@ process_filter_patterns(MAILSTREAM *stream, MSGNO_S *msgmap, long int recent) if(exbits & (MSG_EX_FILTONCE | MSG_EX_FILEONCE | MSG_EX_PEND_EXLD)){ if(exbits & MSG_EX_FILTONCE){ - /* convert to permament */ + /* convert to permanent */ exbits ^= MSG_EX_FILTONCE; exbits |= MSG_EX_FILTERED; } - /* convert to permament */ + /* convert to permanent */ if(exbits & MSG_EX_FILEONCE){ exbits ^= MSG_EX_FILEONCE; exbits |= MSG_EX_FILED; diff --git a/pith/pattern.h b/pith/pattern.h index c8caa84b..cc7fc8e9 100644 --- a/pith/pattern.h +++ b/pith/pattern.h @@ -344,7 +344,7 @@ typedef struct pat_state { extern PAT_HANDLE **cur_pat_h; -/* exported protoypes */ +/* exported prototypes */ void role_process_filters(void); int add_to_pattern(PAT_S *, long); char *add_pat_escapes(char *); diff --git a/pith/pine.hlp b/pith/pine.hlp index 05b4f308..bc688725 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 385 2020-01-15 12:40:59 +Alpine Commit 386 2020-01-15 21:41:23 ============= h_news ================= <HTML> <HEAD> @@ -266,7 +266,7 @@ Bugs that have been addressed include: view certificate information of other certificate authorities. <LI> Crash in the S/MIME configuration screen when a user turned off S/MIME, and - then reenabled it. Also crash when attempting to enter the S/MIME + then re-enabled it. Also crash when attempting to enter the S/MIME configuration screen if S/MIME was turned off. <LI> Deactivate some color code from Pico (as standalone editor in the @@ -1103,7 +1103,7 @@ Bugs addressed in the 2.00 release included: <LI> Make a default save folder of "inbox" always mean the real inbox, not the inbox in the primary collection <LI> Address book entries with lots of addresses would be truncated when - entered in the composer with a screen size wider than 270 or so charcters + entered in the composer with a screen size wider than 270 or so characters <LI> Some fields in the index screen were truncated when the screen width was wider than 256 characters <LI> Crash when TABing to next folder, the next folder with new mail is a POP @@ -1193,7 +1193,7 @@ Bugs addressed in the 1.10(962) release included: <LI> After calling the file browser to attach a file in the composer, a resize of the window when back in the composer would redraw the last screen that had been shown in the browser instead of the current composer screen - <LI> Possible crash in index screen when encountering unparseable addresses + <LI> Possible crash in index screen when encountering unparsable addresses or when using one of the PRIORITY tokens or the HEADER token in the <a href="h_config_index_format"><!--#echo var="VAR_index-format"--></a> <LI> Problems with Header Color editing if the configuration option @@ -1508,7 +1508,7 @@ username/password that users are accostumed to, and it needs to be set up by the user. This text will help you understand this authentication method. <P> -The most important difference between this method and other autentication +The most important difference between this method and other authentication methods is what happens if someone steals your credentials. This method is attached to three components: Your username, your password and your email program. @@ -1707,7 +1707,7 @@ a folder-collection, or a news or SMTP server). This will disable certificate validation. On the other hand, if you are attacked, you will get no warning if you do this. -<P> When you get an error indicating a self-signed certficate from the +<P> When you get an error indicating a self-signed certificate from the remote server, you can download and install the certificate for that server. Avoid using the /NoValidate-Cert modifier. Alpine cannot help you with this process because certificates are part of the system and are not @@ -15943,7 +15943,7 @@ Nickname: field. If you have registered Alpine with your service provider to use the XOAUTH2 authenticator, or someone has shared a client-id with you, use this -field to input this field. Remember that in order to use the XOAUTH2 authentication +field to input this value. Remember that in order to use the XOAUTH2 authentication method, you must have a pair of client-id and client-secret. You must have both in order for this authenticator to work. @@ -15971,7 +15971,7 @@ pieces into this field. If you have registered Alpine with your service provider to use the XOAUTH2 authenticator, or someone has shared a client-secret with you, use this -field to input this field. Remember that in order to use the XOAUTH2 authentication +field to input this value. Remember that in order to use the XOAUTH2 authentication method, you must have a pair of client-id and client-secret. You must have both in order for this authenticator to work. @@ -24024,7 +24024,7 @@ Here is a list of many of the possible character sets: <TR> <TD>ISO-8859-15</TD> <TD>8 bit European "Latin 9" character set</TD> </TR> <TR> <TD>ISO-8859-16</TD> <TD>8 bit European "Latin 10" character set</TD> </TR> <TR> <TD>KOI8-R</TD> <TD>8 bit Latin and Russian</TD> </TR> -<TR> <TD>KOI8-U</TD> <TD>8 bit Latin and Ukranian</TD> </TR> +<TR> <TD>KOI8-U</TD> <TD>8 bit Latin and Ukrainian</TD> </TR> <TR> <TD>WINDOWS-1251</TD> <TD>8 bit Latin and Russian</TD> </TR> <TR> <TD>TIS-620</TD> <TD>8 bit Latin and Thai</TD> </TR> <TR> <TD>VISCII</TD> <TD>8 bit Latin and Vietnamese</TD> </TR> @@ -24248,7 +24248,7 @@ PC Alpine only. <P> This option specifies a list of dictionaries you will use with aspell. A sample entry is "en_US" for american english, or -"en_GB" for brittish english. +"en_GB" for british english. <P> <UL> @@ -25896,7 +25896,7 @@ Sets the format of the command used to open a UNIX secure shell connection. The default is "%s %s -l %s exec /etc/r%sd". All four "%s" entries MUST exist in the provided command. The first is for the command's pathname, the second is -for the host to connnect to, the third is for the user to connect as, and +for the host to connect to, the third is for the user to connect as, and the fourth is for the connection method (typically <CODE>imap</CODE>). <P> <UL> @@ -26239,7 +26239,7 @@ Once Alpine has opened a connection to a particular folder, it will attempt to keep that connection open in case you use it again. In order to do this, Alpine will attempt to use the <!--#echo var="VAR_max-remote-connections"--> (the value of -this option) IMAP connections you have alloted for this purpose. +this option) IMAP connections you have allotted for this purpose. <P> For example, suppose the value of this option is set to "2". If your INBOX is accessed on a remote server using the IMAP protocol, that @@ -26394,7 +26394,7 @@ displayed items are scrolled down or up by a single line. <P> This option allows you to tell Alpine the number of lines from the top and -bottom screen edge that line-by-line paging should occcur. For example, +bottom screen edge that line-by-line paging should occur. For example, setting this value to one (1) will cause Alpine to scroll the display vertically when you move to select an item on the display's top or bottom edge. @@ -27939,7 +27939,7 @@ the way to configure Alpine to recognize URLs other than the built-in set. It can also be used to override Alpine's built-in handlers. For example, you could specify "news" in the <VAR>scheme-list</VAR>, and Alpine would use (provided it passed all other criteria) the associated -viewer when it encounterd a URL of the form "news:comp.mail.pine". +viewer when it encountered a URL of the form "news:comp.mail.pine". </DD> </DL> @@ -31043,14 +31043,14 @@ This feature controls an aspect of Alpine's message sending. When enabled, Alpine will send a VERB (i.e., VERBose) command early in the posting process intended to cause the SMTP server to provide a more detailed account of the transaction. This feature is typically only useful to system -administrators and other support personel as an aid in troublshooting +administrators and other support personnel as an aid in troublshooting problems. <P> Note, this feature relies on a specific capability of the system's mail transport agent or configured <A HREF="h_config_smtp_server">"<!--#echo var="VAR_smtp-server"-->"</A>. It is possible that this -feature will cause problems for some tranport agents, and may result in +feature will cause problems for some transport agents, and may result in sending failure. In addition, as the verbose output comes from the mail transport agent, it is likely to vary from one system to another. <P><UL> diff --git a/pith/pineelt.h b/pith/pineelt.h index 6a79967d..f7d4cf9e 100644 --- a/pith/pineelt.h +++ b/pith/pineelt.h @@ -55,7 +55,7 @@ typedef struct pine_elt { } PINELT_S; -/* exported protoypes */ +/* exported prototypes */ void msgno_free_exceptions(PARTEX_S **); diff --git a/pith/pipe.h b/pith/pipe.h index b928869c..474a4003 100644 --- a/pith/pipe.h +++ b/pith/pipe.h @@ -22,7 +22,7 @@ #include "../pith/osdep/pipe.h" -/* exported protoypes */ +/* exported prototypes */ int pipe_putc(int, PIPE_S *); int pipe_puts(char *, PIPE_S *); char *pipe_gets(char *, int, PIPE_S *); diff --git a/pith/remote.h b/pith/remote.h index 4816c737..9289ac91 100644 --- a/pith/remote.h +++ b/pith/remote.h @@ -60,7 +60,7 @@ extern char meta_prefix[]; -/* exported protoypes */ +/* exported prototypes */ char *read_remote_pinerc(PINERC_S *, ParsePinerc); REMDATA_S *rd_create_remote(RemType, char *, char *, unsigned *, char *, char *); REMDATA_S *rd_new_remdata(RemType, char *, char *); diff --git a/pith/remtype.h b/pith/remtype.h index de3747ae..2396d0b2 100644 --- a/pith/remtype.h +++ b/pith/remtype.h @@ -55,7 +55,7 @@ typedef struct remote_data { } REMDATA_S; -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_REMTYPE_INCLUDED */ diff --git a/pith/repltype.h b/pith/repltype.h index 9b349ee0..bd32c17e 100644 --- a/pith/repltype.h +++ b/pith/repltype.h @@ -75,7 +75,7 @@ typedef struct reply_s { #define FS_CONVERT_QUOTES 1 -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_REPLTYPE_INCLUDED */ diff --git a/pith/reply.c b/pith/reply.c index ccd45311..c94a67a2 100644 --- a/pith/reply.c +++ b/pith/reply.c @@ -2721,7 +2721,7 @@ Args: stream -- Mail stream to fetch text from ret_charset -- If we translate to another charset return that new charset here -Returns: true if OK, false if problem occured while filtering +Returns: true if OK, false if problem occurred while filtering If the text is richtext, it will be converted to plain text, since there's no rich text editing capabilities in Pine (yet). @@ -3258,7 +3258,7 @@ copy_body(struct mail_bodystruct *new_body, struct mail_bodystruct *old_body) /*---------------------------------------------------------------------- Copy the MIME parameter list - Allocates storage for new part, and returns pointer to new paramter + Allocates storage for new part, and returns pointer to new parameter list. If old_p is NULL, NULL is returned. ----*/ PARAMETER * @@ -3339,7 +3339,7 @@ reply_in_reply_to(ENVELOPE *env) Result: Alloc'd unique string is returned -Uniqueness is gaurenteed by using the host name, process id, date to the +Uniqueness is guaranteed by using the host name, process id, date to the second and a single unique character *----------------------------------------------------------------------*/ char * diff --git a/pith/reply.h b/pith/reply.h index 7ab14804..cc0e6695 100644 --- a/pith/reply.h +++ b/pith/reply.h @@ -46,7 +46,7 @@ #include "../pith/addrstring.h" -/* exported protoypes */ +/* exported prototypes */ int reply_harvest(struct pine *, long, char *, ENVELOPE *, ADDRESS **, ADDRESS **, ADDRESS **, ADDRESS **,int *); ADDRESS *reply_cp_addr(struct pine *, long, char *, char *, diff --git a/pith/rfc2231.h b/pith/rfc2231.h index a4b82263..859cb3ea 100644 --- a/pith/rfc2231.h +++ b/pith/rfc2231.h @@ -22,7 +22,7 @@ #include "../pith/store.h" -/* exported protoypes */ +/* exported prototypes */ char *rfc2231_get_param(PARAMETER *, char *, char **, char **); int rfc2231_output(STORE_S *, char *, char *, char *, char *); PARMLIST_S *rfc2231_newparmlist(PARAMETER *); diff --git a/pith/save.c b/pith/save.c index 77aa0fb7..1065fc5d 100644 --- a/pith/save.c +++ b/pith/save.c @@ -1766,7 +1766,7 @@ save_msg_stream(CONTEXT_S *context, char *folder, int *we_opened) /*---------------------------------------------------------------------- - Offer to create a non-existant folder to copy message[s] into + Offer to create a non-existent folder to copy message[s] into Args: context -- context to create folder in folder -- name of folder to create diff --git a/pith/save.h b/pith/save.h index 4664552d..4ae1d941 100644 --- a/pith/save.h +++ b/pith/save.h @@ -39,7 +39,7 @@ #define SSCP_ANSWER_IS_YES 0x4 -/* exported protoypes */ +/* exported prototypes */ char *save_get_default(struct pine *, ENVELOPE *, long, char *, CONTEXT_S **); void save_get_fldr_from_env(char *, int, ENVELOPE *, struct pine *, long, char *); long save(struct pine *, MAILSTREAM *, CONTEXT_S *, char *, MSGNO_S *, int); diff --git a/pith/savetype.h b/pith/savetype.h index 35f8db95..30880456 100644 --- a/pith/savetype.h +++ b/pith/savetype.h @@ -33,7 +33,7 @@ typedef struct append_package { } APPENDPACKAGE; -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_SAVETYPE_INCLUDED */ diff --git a/pith/search.h b/pith/search.h index 20cba1b2..783670a6 100644 --- a/pith/search.h +++ b/pith/search.h @@ -18,7 +18,7 @@ #define PITH_SEARCH_INCLUDED -/* exported protoypes */ +/* exported prototypes */ SEARCHSET *build_searchset(MAILSTREAM *); int in_searchset(SEARCHSET *, unsigned long); diff --git a/pith/send.c b/pith/send.c index 48d93444..1be50e14 100644 --- a/pith/send.c +++ b/pith/send.c @@ -238,7 +238,7 @@ postponed_stream(MAILSTREAM **streamp, char *mbox, char *type, int checknmsgs) * * The "mbox" is assumed to be local if we're given what looks * like an absolute path. This is different from Goto/Save - * where we do alot of work to interpret paths relative to the + * where we do a lot of work to interpret paths relative to the * server. This reason is to support all the pre-4.00 pinerc' * that specified a path and because there's yet to be a way * in c-client to specify otherwise in the face of a remote @@ -714,7 +714,7 @@ redraft_work(MAILSTREAM **streamp, long int cont_msg, ENVELOPE **outgoing, /* * If empty is not the normal default, make the outgoing - * reply_to be an emtpy address. If it is default, leave it + * reply_to be an empty address. If it is default, leave it * as NULL and the default will be used. */ if(hdr_is_in_list("reply-to", *custom)){ @@ -2318,7 +2318,7 @@ wrapup_fcc(char *fcc, CONTEXT_S *fcc_cntxt, METAENV *header, struct mail_bodystr Args: fcc -- the name of the fcc to create. It can't be NULL. fcc_cntxt -- Returns the context the fcc is in. - force -- supress user option prompt + force -- suppress user option prompt Returns allocated storage object on success, NULL on failure ----*/ @@ -2330,7 +2330,7 @@ open_fcc(char *fcc, CONTEXT_S **fcc_cntxt, int force, char *err_prefix, char *er ps_global->mm_log_error = 0; /* - * check for fcc's existance... + * check for fcc's existence... */ TIME_STAMP("open_fcc start", 1); if(!is_absolute_path(fcc) && context_isambig(fcc) @@ -3662,7 +3662,7 @@ post_rfc822_output(char *tmp, /* * posting_characterset- determine what transliteration is reasonable - * for posting the given non-ascii messsage data. + * for posting the given non-ascii message data. * * preferred_charset is the charset the original data was labeled in. * If we can keep that we do. @@ -5564,7 +5564,7 @@ mta_handoff(METAENV *header, struct mail_bodystruct *body, * Precedence is in that order. * Said differently, the order goes something like what's below. * - * NOTE: the fixed/command-line/user precendence handling is also + * NOTE: the fixed/command-line/user precedence handling is also * indicated by what's pointed to by ps_global->VAR_*, but since * that also includes the global defaults, it's not sufficient. */ diff --git a/pith/send.h b/pith/send.h index 6521178a..46b87713 100644 --- a/pith/send.h +++ b/pith/send.h @@ -79,7 +79,7 @@ typedef struct pine_field { unsigned writehdr:1; /* write rfc822 header for field */ unsigned localcopy:1; /* copy to fcc or postponed */ unsigned rcptto:1; /* send to this if type Address */ - unsigned posterr:1; /* posting error occured in field */ + unsigned posterr:1; /* posting error occurred in field */ /* the next three fields are used only for customized-hdrs and friends */ unsigned standard:1; /* this hdr already in pf_template */ CustomType cstmtype; /* for customized-hdrs and r->cstm */ @@ -125,7 +125,7 @@ typedef struct { #define CM_DSN_NEVER 0x02 /* request NO DSN */ #define CM_DSN_DELAY 0x04 /* DSN delay notification */ #define CM_DSN_SUCCESS 0x08 /* DSN success notification */ -#define CM_DSN_FULL 0x10 /* DSN full notificiation */ +#define CM_DSN_FULL 0x10 /* DSN full notification */ #define CM_DSN_SHOW 0x20 /* show DSN result (place holder) */ @@ -214,7 +214,7 @@ extern PRIORITY_S priorities[]; extern PINEFIELD pf_template[]; -/* exported protoypes */ +/* exported prototypes */ int postponed_stream(MAILSTREAM **, char *, char *, int); int redraft_work(MAILSTREAM **, long, ENVELOPE **, BODY **, char **, char **, REPLY_S **, REDRAFT_POS_S **, PINEFIELD **, ACTION_S **, int, STORE_S *); diff --git a/pith/sequence.c b/pith/sequence.c index c9c9e4d2..5b97d8a0 100644 --- a/pith/sequence.c +++ b/pith/sequence.c @@ -352,7 +352,7 @@ build_sequence(MAILSTREAM *stream, MSGNO_S *msgmap, long int *count) Args: map -- message number struct of to build selected messages in OK folks, here's the tradeoff: either all the functions have to - know if the user want's to deal with the "current" hilited message + know if the user wants to deal with the "current" hilited message or the list of currently "selected" messages, *or* we just wrap the call to these functions with some glue that tweeks what these functions see as the "current" message list, and let them diff --git a/pith/sequence.h b/pith/sequence.h index 34a8fb62..2ee5e182 100644 --- a/pith/sequence.h +++ b/pith/sequence.h @@ -21,7 +21,7 @@ #include "../pith/msgno.h" -/* exported protoypes */ +/* exported prototypes */ char *selected_sequence(MAILSTREAM *, MSGNO_S *, long *, int); char *currentf_sequence(MAILSTREAM *, MSGNO_S *, long, long *, int, char **, char **); char *invalid_elt_sequence(MAILSTREAM *, MSGNO_S *); diff --git a/pith/signal.h b/pith/signal.h index 32716c88..127d4135 100644 --- a/pith/signal.h +++ b/pith/signal.h @@ -18,7 +18,7 @@ #define PITH_SIGNAL_INCLUDED -/* exported protoypes */ +/* exported prototypes */ /* currently mandatory to implement stubs */ diff --git a/pith/smime.c b/pith/smime.c index ec9aa6f0..021407d3 100644 --- a/pith/smime.c +++ b/pith/smime.c @@ -302,7 +302,7 @@ setup_pwdcert(void **pwdcert) } } } - if(pc->keytext != NULL) /* we should go straigth here */ + if(pc->keytext != NULL) /* we should go straight here */ text = pc->keytext; } else if (ps_global->smime->privatetype == Keychain){ pathkey[0] = '\0'; /* no apple key chain support yet */ diff --git a/pith/smime.h b/pith/smime.h index 216d1a6a..f78f8cba 100644 --- a/pith/smime.h +++ b/pith/smime.h @@ -36,7 +36,7 @@ #define OUR_PKCS7_ENCLOSURE_SUBTYPE "x-pkcs7-enclosure" -/* exported protoypes */ +/* exported prototypes */ int smime_validate_cert(X509 *cert, long *error); int encrypt_file(char *fp, char *text, PERSONAL_CERT *pc); char *decrypt_file(char *fp, int *rv, PERSONAL_CERT *pc); diff --git a/pith/smkeys.c b/pith/smkeys.c index 9d8b1d18..a9f1e9df 100644 --- a/pith/smkeys.c +++ b/pith/smkeys.c @@ -877,7 +877,7 @@ load_key(PERSONAL_CERT *pc, char *pass, int flag) /* * This newer version is from Adrian Vogel. It looks for the email * address not only in the email address field, but also in an - * X509v3 extension field, Subject Altenative Name. + * X509v3 extension field, Subject Alternative Name. */ char ** get_x509_subject_email(X509 *x) diff --git a/pith/smkeys.h b/pith/smkeys.h index 3258105a..d3db4ce1 100644 --- a/pith/smkeys.h +++ b/pith/smkeys.h @@ -69,7 +69,7 @@ typedef struct personal_cert { #define SM_NORMALCERT 0x1 /* look in normal user defined directory */ #define SM_BACKUPCERT 0x2 /* look in backup directory */ -/* exported protoypes */ +/* exported prototypes */ int add_certs_in_dir(X509_LOOKUP *lookup, char *path, char *ext, CertList **cdata); X509_STORE *get_ca_store(void); void free_x509_store(X509_STORE **); diff --git a/pith/sort.h b/pith/sort.h index af658259..fdf8c07e 100644 --- a/pith/sort.h +++ b/pith/sort.h @@ -40,7 +40,7 @@ struct global_sort_data { extern struct global_sort_data g_sort; -/* exported protoypes */ +/* exported prototypes */ char *sort_name(SortOrder); void sort_folder(MAILSTREAM *, MSGNO_S *, SortOrder, int, unsigned); int decode_sort(char *, SortOrder *, int *); diff --git a/pith/sorttype.h b/pith/sorttype.h index 3fde564d..2e3653aa 100644 --- a/pith/sorttype.h +++ b/pith/sorttype.h @@ -27,7 +27,7 @@ typedef enum {SortSubject = 0, SortArrival, SortFrom, SortTo, SortSubject2, SortScore, SortThread, EndofList} SortOrder; -/* exported protoypes */ +/* exported prototypes */ #endif /* PITH_SORTTYPE_INCLUDED */ diff --git a/pith/state.h b/pith/state.h index cae43d4c..c5f58407 100644 --- a/pith/state.h +++ b/pith/state.h @@ -249,8 +249,8 @@ struct pine { bitmap_t feature_list; /* a bitmap of all the features */ char **feat_list_back_compat; - SPEC_COLOR_S *hdr_colors; /* list of configed colors for view */ - SPEC_COLOR_S *index_token_colors; /* list of configed colors for index */ + SPEC_COLOR_S *hdr_colors; /* list of configured colors for view */ + SPEC_COLOR_S *index_token_colors; /* list of configured colors for index */ short init_context; @@ -389,7 +389,7 @@ extern struct pine *ps_global; extern char tmp_20k_buf[]; -/* exported protoypes */ +/* exported prototypes */ struct pine *new_pine_struct(void); void free_pine_struct(struct pine **); void free_pinerc_strings(struct pine **); diff --git a/pith/status.h b/pith/status.h index 6999cd6b..72e25a8a 100644 --- a/pith/status.h +++ b/pith/status.h @@ -31,7 +31,7 @@ #define SM_INFO 0x10 /* Handy, but discardable */ -/* exported protoypes */ +/* exported prototypes */ void q_status_message1(int, int, int, char *, void *); void q_status_message2(int, int, int, char *, void *, void *); void q_status_message3(int, int, int, char *, void *, void *, void *); diff --git a/pith/store.c b/pith/store.c index 1ff57967..ee0fe5e5 100644 --- a/pith/store.c +++ b/pith/store.c @@ -353,7 +353,7 @@ so_file_open(STORE_S *so) /* * put a character into the specified storage object, - * expanding if neccessary + * expanding if necessary * * return 1 on success and 0 on failure */ @@ -659,7 +659,7 @@ so_file_puts_locale(STORE_S *so, char *s) #ifdef SMIME /* * put a character into the specified storage object, - * expanding if neccessary + * expanding if necessary * * return 1 on success and 0 on failure */ diff --git a/pith/store.h b/pith/store.h index c9e1af3a..9b721d87 100644 --- a/pith/store.h +++ b/pith/store.h @@ -56,7 +56,7 @@ typedef struct store_object { #define so_puts(so, s) ((*(so)->puts)((so), (s))) -/* exported protoypes */ +/* exported prototypes */ STORE_S *so_get(SourceType, char *, int); int so_give(STORE_S **); int so_nputs(STORE_S *, char *, long); diff --git a/pith/stream.h b/pith/stream.h index f8e86544..bb1b76e1 100644 --- a/pith/stream.h +++ b/pith/stream.h @@ -407,7 +407,7 @@ extern MAILSTATUS *pine_cached_status; #define pine_fetchheader_lines_not(S,N,M,F) pine_fetch_header(S,N,M,F,FT_NOT) -/* exported protoypes */ +/* exported prototypes */ MAILSTREAM *pine_mail_open(MAILSTREAM *, char *, long, long *); long pine_mail_create(MAILSTREAM *, char *); long pine_mail_delete(MAILSTREAM *, char *); diff --git a/pith/string.c b/pith/string.c index 8707485a..92a9a65c 100644 --- a/pith/string.c +++ b/pith/string.c @@ -520,7 +520,7 @@ srchstr(char *haystack, char *needle) ss -- The string to search for, the smaller string Search for last occurrence of ss in the is, and return a pointer - into the string is when it is found. The search is case indepedent. + into the string is when it is found. The search is case independent. ----*/ char * @@ -1223,7 +1223,7 @@ parse_date(char *given_date, struct date *d) while(*p && (*p == '-' || *p == ',' || isspace((unsigned char)*p))) p++; } else { - /* Something wierd, skip it and try to resynch */ + /* Something weird, skip it and try to resynch */ while(*p && !isspace((unsigned char)*p) && *p != ',' && *p != '-') p++; while(*p && (isspace((unsigned char)*p) || *p == ',' || *p == '-')) @@ -2819,7 +2819,7 @@ copy_quoted_string_asis(char *src) /* * isxpair -- return true if the first two chars in string are - * hexidecimal characters + * hexadecimal characters */ int isxpair(char *s) diff --git a/pith/string.h b/pith/string.h index 4263249e..65306085 100644 --- a/pith/string.h +++ b/pith/string.h @@ -85,7 +85,7 @@ struct date { #define BUILDER_FOOTER_MANGLED 0x4 -/* exported protoypes */ +/* exported prototypes */ char *rplstr(char *, size_t, int, char *); void sqzspaces(char *); void sqznewlines(char *); diff --git a/pith/strlst.h b/pith/strlst.h index c4c1ff57..f4046b3e 100644 --- a/pith/strlst.h +++ b/pith/strlst.h @@ -18,7 +18,7 @@ #define PITH_STRLST_INCLUDED -/* exported protoypes */ +/* exported prototypes */ STRINGLIST *new_strlst(char **); void free_strlst(STRINGLIST **); diff --git a/pith/tempfile.h b/pith/tempfile.h index f29dbf40..ad2c7856 100644 --- a/pith/tempfile.h +++ b/pith/tempfile.h @@ -18,7 +18,7 @@ #define PITH_TEMPFILE_INCLUDED -/* exported protoypes */ +/* exported prototypes */ char *tempfile_in_same_dir(char *, char *, char **); int in_dir(char *, char *); diff --git a/pith/text.h b/pith/text.h index b6470690..4450fd7d 100644 --- a/pith/text.h +++ b/pith/text.h @@ -49,7 +49,7 @@ typedef struct del_q_s { } DELQ_S; -/* exported protoypes */ +/* exported prototypes */ int decode_text(ATTACH_S *, long, gf_io_t, HANDLE_S **, DetachErrStyle, int); int translate_utf8_to_2022_jp(long, char *, LT_INS_S **, void *); int delete_quotes(long, char *, LT_INS_S **, void *); diff --git a/pith/thread.h b/pith/thread.h index 63573bcd..4258b286 100644 --- a/pith/thread.h +++ b/pith/thread.h @@ -85,7 +85,7 @@ typedef struct pine_thrd { && ps_global->thread_disp_style != THREAD_NONE) -/* exported protoypes */ +/* exported prototypes */ PINETHRD_S *fetch_thread(MAILSTREAM *, unsigned long); PINETHRD_S *fetch_head_thread(MAILSTREAM *); void set_flags_for_thread(MAILSTREAM *, MSGNO_S *, int, PINETHRD_S *, int); @@ -79,7 +79,7 @@ rfc1738_scan(char *line, int *len) break; /* - * Make sure everyhing up to the colon is a known scheme... + * Make sure everything up to the colon is a known scheme... */ if(start && (n = colon - start) && !isdigit((unsigned char) *start) && (((n == 2 @@ -173,7 +173,7 @@ rfc1738_scan(char *line, int *len) * * NOTE: we have a problem matching closing parens when users * bracket the url in parens. So, lets try terminating our - * match on any closing paren that doesn't have a coresponding + * match on any closing paren that doesn't have a corresponding * open-paren. */ char * @@ -496,7 +496,7 @@ web_host_scan(char *line, int *len) /* * mail_addr_scan -- Scan the given line for possible RFC822 addr-spec's * - * NOTE: Well, OK, not strictly addr-specs since there's alot of junk + * NOTE: Well, OK, not strictly addr-specs since there's a lot of junk * we're tying to sift thru and we'd like to minimize false-pos * matches. */ @@ -538,7 +538,7 @@ mail_addr_scan(char *line, int *len) break; /* - * Make sure everyhing up to the colon is a known scheme... + * Make sure everything up to the colon is a known scheme... */ if(start && (amp - start) > 0){ /* @@ -18,7 +18,7 @@ #define PITH_URL_INCLUDED -/* exported protoypes */ +/* exported prototypes */ char *rfc1738_scan(char *, int *); char *rfc1738_str(char *); unsigned long rfc1738_num(char **); diff --git a/pith/util.h b/pith/util.h index 7a9a7f79..1fa346ad 100644 --- a/pith/util.h +++ b/pith/util.h @@ -51,7 +51,7 @@ typedef struct screen_position { #define SCREEN_FUN_NULL ((void (*)(struct pine *)) NULL) -/* exported protoypes */ +/* exported prototypes */ int *cpyint(int); /* currently mandatory to implement stubs */ |