X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=misc.h;h=32e7bc32de7ffd8d9cf00fb428fb6b048872fb7b;hb=b14c3443d30a768c718a950ae1e4725ecd7a5cfd;hp=8c8377f9e823007a4118af6848571baf4675678d;hpb=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d;p=PuTTY.git diff --git a/misc.h b/misc.h index 8c8377f9..32e7bc32 100644 --- a/misc.h +++ b/misc.h @@ -38,6 +38,13 @@ char *dupprintf(const char *fmt, ...) ; char *dupvprintf(const char *fmt, va_list ap); void burnstr(char *string); +typedef struct strbuf strbuf; +strbuf *strbuf_new(void); +void strbuf_free(strbuf *buf); +char *strbuf_str(strbuf *buf); /* does not free buf */ +char *strbuf_to_str(strbuf *buf); /* does free buf, but you must free result */ +void strbuf_catf(strbuf *buf, const char *fmt, ...); +void strbuf_catfv(strbuf *buf, const char *fmt, va_list ap); /* String-to-Unicode converters that auto-allocate the destination and * work around the rather deficient interface of mb_to_wc. @@ -52,15 +59,21 @@ int toint(unsigned); char *fgetline(FILE *fp); char *chomp(char *str); +int strstartswith(const char *s, const char *t); +int strendswith(const char *s, const char *t); void base64_encode_atom(const unsigned char *data, int n, char *out); int base64_decode_atom(const char *atom, unsigned char *out); struct bufchain_granule; -typedef struct bufchain_tag { +struct bufchain_tag { struct bufchain_granule *head, *tail; int buffersize; /* current amount of buffered data */ -} bufchain; +}; +#ifndef BUFCHAIN_TYPEDEF +typedef struct bufchain_tag bufchain; /* rest of declaration in misc.c */ +#define BUFCHAIN_TYPEDEF +#endif void bufchain_init(bufchain *ch); void bufchain_clear(bufchain *ch); @@ -105,6 +118,8 @@ int get_ssh_uint32(int *datalen, const void **data, unsigned *ret); * form, check if it equals an ordinary C zero-terminated string. */ int match_ssh_id(int stringlen, const void *string, const char *id); +char *buildinfo(const char *newline); + /* * Debugging functions. * @@ -185,4 +200,9 @@ void debug_memdump(const void *buf, int len, int L); (cp)[0] = (unsigned char)((value) >> 8), \ (cp)[1] = (unsigned char)(value) ) +/* Replace NULL with the empty string, permitting an idiom in which we + * get a string (pointer,length) pair that might be NULL,0 and can + * then safely say things like printf("%.*s", length, NULLTOEMPTY(ptr)) */ +#define NULLTOEMPTY(s) ((s)?(s):"") + #endif