Merge branch 'pre-0.64'

[PuTTY.git] / misc.h

diff --git a/misc.h b/misc.h
index 2ca2d8e30468b661cec19c327ed6f9585de06d7a..a361d706b45d40fd8c7908a97fb17520c67f7dc3 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -24,15 +24,27 @@ typedef struct FontSpec FontSpec;
 unsigned long parse_blocksize(const char *bs);
 char ctrlparse(char *s, char **next);
 
+size_t host_strcspn(const char *s, const char *set);
+char *host_strchr(const char *s, int c);
+char *host_strrchr(const char *s, int c);
+char *host_strduptrim(const char *s);
+
 char *dupstr(const char *s);
 char *dupcat(const char *s1, ...);
-char *dupprintf(const char *fmt, ...);
+char *dupprintf(const char *fmt, ...)
+#ifdef __GNUC__
+    __attribute__ ((format (printf, 1, 2)))
+#endif
+    ;
 char *dupvprintf(const char *fmt, va_list ap);
 void burnstr(char *string);
 
+int toint(unsigned);
+
 char *fgetline(FILE *fp);
 
 void base64_encode_atom(unsigned char *data, int n, char *out);
+int base64_decode_atom(char *atom, unsigned char *out);
 
 struct bufchain_granule;
 typedef struct bufchain_tag {
@@ -48,6 +60,8 @@ void bufchain_prefix(bufchain *ch, void **data, int *len);
 void bufchain_consume(bufchain *ch, int len);
 void bufchain_fetch(bufchain *ch, void *data, int len);
 
+int validate_manual_hostkey(char *key);
+
 struct tm ltime(void);
 
 void smemclr(void *b, size_t len);