X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0f695324ed4963065d9a5c4308d281a02fd237f1..ea1fadd88568e97c6891da8ebe09d02515282e66:/h/prototypes.h diff --git a/h/prototypes.h b/h/prototypes.h index 92ed8ef5..ec11915a 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -18,6 +18,7 @@ struct msgs_array; void add_profile_entry (const char *, const char *); void inform(char *fmt, ...) CHECK_PRINTF(1, 2); void adios (const char *, const char *, ...) CHECK_PRINTF(2, 3) NORETURN; +void die(const char *, ...) CHECK_PRINTF(1, 2) NORETURN; void admonish (char *, char *, ...) CHECK_PRINTF(2, 3); void advertise (const char *, char *, const char *, va_list) CHECK_PRINTF(3, 0); void advise (const char *, const char *, ...) CHECK_PRINTF(2, 3); @@ -26,7 +27,7 @@ void argsplit_msgarg (struct msgs_array *, char *, char **) NONNULL(1, 2, 3); void argsplit_insert (struct msgs_array *, char *, char **) NONNULL(1, 2, 3); void arglist_free (char *, char **); void ambigsw (const char *, const struct swit *) NONNULL(1, 2); -int atooi(char *) NONNULL(1); +int atooi(char *) NONNULL(1) PURE; char **brkstring (char *, char *, char *) NONNULL(1); /* @@ -43,11 +44,11 @@ char **brkstring (char *, char *, char *) NONNULL(1); int check_charset (char *, int); int client(char *, char *, char *, int, int); void closefds(int); -char *concat (const char *, ...); +char *concat (const char *, ...) ENDNULL; int context_del (char *); -char *context_find (const char *); +char *context_find (const char *) PURE; char *context_find_by_type (const char *, const char *, const char *); -int context_find_prefix(const char *); +int context_find_prefix(const char *) PURE; int context_foil (char *); void context_read (void); void context_replace (char *, char *); @@ -117,13 +118,6 @@ struct msgs *folder_read (char *name, int lockflag); struct msgs *folder_realloc (struct msgs *, int, int); -/* - * Flush standard output, read a line from standard input into a static buffer, - * zero out the newline, and return a pointer to the buffer. - * On error, return NULL. - */ -const char *read_line(void); - /* * Print null-terminated PROMPT to and flush standard output. Read answers from * standard input until one matches an entry in SWITCHES. When one matches, @@ -168,60 +162,9 @@ char *get_charset(void); char *getcpy(const char *str); char *get_default_editor(void); -char *getfolder(int); - -/* - * Get a string from the terminfo database for the current terminal. - * - * Retrieve the specified terminfo capability and return a string that - * can be output to the terminal. The string returned has already been - * processed by tputs(), so it is safe to output directly. The return - * value of this function is valid until the next call. - * - * Arguments: - * - * capability - The name of the terminfo capability (see terminfo(5)). - * - * Returns a tputs-processed string, or NULL if terminal initialization failed - * or the capability wasn't found. - */ -char *get_term_stringcap(char *capability); +char *getfolder(int) PURE; -/* - * Get a parameterized string from the terminfo database for the current - * terminal. - * - * We don't yet have a standardized tparm() that will take a stdarg - * argument. Right now we don't want many parameters, so we only - * take two. Everything gets passed to tparm() as-is. If we need - * a capability with more arguments, we'll just add more later. - * - * Arguments: - * - * capability - The name of the terminfo capability (see terminfo(5)). - * arg1..argN - Arguments 1-N. - * - * Returns a tparm and tputs-processed string, or NULL if there was a problem - * initialising the terminal or retrieving the capability. - */ -char *get_term_stringparm(char *capability, long arg1, long arg2); - -/* - * Get a number from the terminfo database for the current terminal. - * - * Retrieve the specified terminfo capability and return the numeric - * value of that capability from the terminfo database. - * - * Arguments: - * - * capability - The name of the terminfo capability (see terminfo(5)). - * - * Returns the output of tigetnum() for that capability, or -1 if it was - * unable to initialize the terminfo database. - */ -int get_term_numcap(char *capability); - -int m_atoi (char *); +int m_atoi (char *) PURE; char *m_backup (const char *); int m_convert (struct msgs *, char *); char *m_draft (char *, char *, int, int *); @@ -233,16 +176,12 @@ void m_getfld_track_filepos (m_getfld_state_t *, FILE *); void m_getfld_track_filepos2(m_getfld_state_t *); int m_getfld (m_getfld_state_t *, char[NAMESZ], char *, int *, FILE *); int m_getfld2(m_getfld_state_t *, char[NAMESZ], char *, int *); -int m_gmprot (void); +int m_gmprot (void) PURE; char *m_name (int); void m_unknown(m_getfld_state_t *, FILE *); void m_unknown2(m_getfld_state_t *); -/* - * Clear the screen, using the appropriate entry from the terminfo database - */ -void nmh_clear_screen(void); char *nmh_getpass(const char *); char *new_fs (char *, char *, char *); char *path(char *, int); @@ -250,11 +189,11 @@ int pidwait (pid_t, int); int pidstatus (int, FILE *, char *); char *pluspath(char *); void print_help (char *, struct swit *, int); -void print_intro (FILE *, int); +void print_intro (FILE *, bool); void print_sw (const char *, const struct swit *, char *, FILE *); void print_version (char *); void push (void); -char *r1bindex(char *, int); +char *r1bindex(char *, int) PURE; void readconfig (struct node **, FILE *, const char *, int); int refile (char **, char *); @@ -311,7 +250,7 @@ void seq_setcur (struct msgs *, int); void seq_setprev (struct msgs *); void seq_setunseen (struct msgs *, int); int showfile (char **, char *); -int smatch(const char *, const struct swit *); +int smatch(const char *, const struct swit *) PURE; /* * Convert a set of bit flags to printable format. @@ -346,11 +285,11 @@ int smatch(const char *, const struct swit *); * from least significant bit to most significant. */ char *snprintb (char *buffer, size_t size, unsigned flags, char *bitfield); -int ssequal (const char *, const char *); -int stringdex (char *, char *); +int ssequal (const char *, const char *) PURE; +int stringdex (char *, char *) PURE; char *trimcpy (char *); -int uprf (const char *, const char *); +int uprf (const char *, const char *) PURE; int vfgets (FILE *, char **); /* @@ -374,55 +313,18 @@ int annotate (char *, char *, char *, bool, bool, int, bool); void annolist(char *, char *, char *, int); void annopreserve(int); void m_pclose(void); -int make_intermediates(char *); int mhl(int, char **); int mhlsbr(int, char **, FILE *(*)(char *)); int distout (char *, char *, char *); void replout (FILE *, char *, char *, struct msgs *, int, int, char *, char *, char *, int); -int sc_length(void); -int sc_width(void); int build_form (char *, char *, int *, char *, char *, char *, char *, char *, char *); int sendsbr (char **, int, char *, char *, struct stat *, int, const char *); -int SOprintf (char *, ...) CHECK_PRINTF(1, 2); int what_now (char *, int, int, char *, char *, int, struct msgs *, char *, int, char *, int); int WhatNow(int, char **) NORETURN; -/* Includes trailing NUL */ - -#define BASE64SIZE(x) ((((x + 2) / 3) * 4) + 1) - -/* - * Copy data from one file to another, converting to base64-encoding. - * - * Arguments include: - * - * in - Input filehandle (unencoded data) - * out - Output filename (base64-encoded data) - * crlf - If set, output encoded CRLF for every LF on input. - * - * Returns OK on success, NOTOK otherwise. - */ -int writeBase64aux(FILE *in, FILE *out, int crlf); - -int writeBase64 (const unsigned char *, size_t, unsigned char *); -int writeBase64raw (const unsigned char *, size_t, unsigned char *); - -/* - * encoded - the string to be decoded - * decoded - the decoded bytes - * len - number of decoded bytes - * skip-crs - non-zero for text content, and for which CR's should be - * skipped - * digest - for an MD5 digest, it can be null - */ -int decodeBase64 (const char *encoded, unsigned char **decoded, size_t *len, - int skip_crs, unsigned char *digest); - -void hexify (const unsigned char *, size_t, char **); - /* * credentials management */