X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ecd50cc5f6c2a427e821483993678b78c94ffdfd..94187a80bd60baab4b9c4b949ad820d730578123:/h/prototypes.h diff --git a/h/prototypes.h b/h/prototypes.h index ab9e83d7..ec11915a 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -44,7 +44,7 @@ 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 *) PURE; char *context_find_by_type (const char *, const char *, const char *); @@ -118,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, @@ -196,7 +189,7 @@ 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); @@ -332,39 +325,6 @@ 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 */