Sebastian Kuschel reports that pfd_closing can be called for a socket

[u/mdw/putty] / misc.h

diff --git a/misc.h b/misc.h
index fe5056c..eff4a5e 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,3 +1,7 @@
+/*
+ * Header for misc.c.
+ */
+
 #ifndef PUTTY_MISC_H
 #define PUTTY_MISC_H
 
@@ -5,7 +9,7 @@
 
 #include <stdio.h>                    /* for FILE * */
 #include <stdarg.h>                   /* for va_list */
-#include <time.h>                      /* for struct_tm */
+#include <time.h>                      /* for struct tm */
 
 #ifndef FALSE
 #define FALSE 0
@@ -18,11 +22,15 @@ typedef struct Filename Filename;
 typedef struct FontSpec FontSpec;
 
 unsigned long parse_blocksize(const char *bs);
+char ctrlparse(char *s, char **next);
 
 char *dupstr(const char *s);
 char *dupcat(const char *s1, ...);
 char *dupprintf(const char *fmt, ...);
 char *dupvprintf(const char *fmt, va_list ap);
+void burnstr(char *string);
+
+int toint(unsigned);
 
 char *fgetline(FILE *fp);
 
@@ -44,6 +52,8 @@ void bufchain_fetch(bufchain *ch, void *data, int len);
 
 struct tm ltime(void);
 
+void smemclr(void *b, size_t len);
+
 /*
  * Debugging functions.
  *
@@ -52,7 +62,7 @@ struct tm ltime(void);
  * debug(()) (note the double brackets) is like printf().
  *
  * dmemdump() and dmemdumpl() both do memory dumps.  The difference
- * is that dmemdumpl() is more suited for when where the memory is is
+ * is that dmemdumpl() is more suited for when the memory address is
  * important (say because you'll be recording pointer values later
  * on).  dmemdump() is more concise.
  */
@@ -80,4 +90,48 @@ void debug_memdump(void *buf, int len, int L);
 #define max(x,y) ( (x) > (y) ? (x) : (y) )
 #endif
 
+#define GET_32BIT_LSB_FIRST(cp) \
+  (((unsigned long)(unsigned char)(cp)[0]) | \
+  ((unsigned long)(unsigned char)(cp)[1] << 8) | \
+  ((unsigned long)(unsigned char)(cp)[2] << 16) | \
+  ((unsigned long)(unsigned char)(cp)[3] << 24))
+
+#define PUT_32BIT_LSB_FIRST(cp, value) ( \
+  (cp)[0] = (unsigned char)(value), \
+  (cp)[1] = (unsigned char)((value) >> 8), \
+  (cp)[2] = (unsigned char)((value) >> 16), \
+  (cp)[3] = (unsigned char)((value) >> 24) )
+
+#define GET_16BIT_LSB_FIRST(cp) \
+  (((unsigned long)(unsigned char)(cp)[0]) | \
+  ((unsigned long)(unsigned char)(cp)[1] << 8))
+
+#define PUT_16BIT_LSB_FIRST(cp, value) ( \
+  (cp)[0] = (unsigned char)(value), \
+  (cp)[1] = (unsigned char)((value) >> 8) )
+
+#define GET_32BIT_MSB_FIRST(cp) \
+  (((unsigned long)(unsigned char)(cp)[0] << 24) | \
+  ((unsigned long)(unsigned char)(cp)[1] << 16) | \
+  ((unsigned long)(unsigned char)(cp)[2] << 8) | \
+  ((unsigned long)(unsigned char)(cp)[3]))
+
+#define GET_32BIT(cp) GET_32BIT_MSB_FIRST(cp)
+
+#define PUT_32BIT_MSB_FIRST(cp, value) ( \
+  (cp)[0] = (unsigned char)((value) >> 24), \
+  (cp)[1] = (unsigned char)((value) >> 16), \
+  (cp)[2] = (unsigned char)((value) >> 8), \
+  (cp)[3] = (unsigned char)(value) )
+
+#define PUT_32BIT(cp, value) PUT_32BIT_MSB_FIRST(cp, value)
+
+#define GET_16BIT_MSB_FIRST(cp) \
+  (((unsigned long)(unsigned char)(cp)[0] << 8) | \
+  ((unsigned long)(unsigned char)(cp)[1]))
+
+#define PUT_16BIT_MSB_FIRST(cp, value) ( \
+  (cp)[0] = (unsigned char)((value) >> 8), \
+  (cp)[1] = (unsigned char)(value) )
+
 #endif