Make memory management uniform: _everything_ now goes through the

[u/mdw/putty] / putty.h

diff --git a/putty.h b/putty.h
index ae936b0..a2bdeb1 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -140,6 +140,7 @@ typedef struct {
     /* SSH options */
     char remote_cmd[512];
     int nopty;
+    int compression;
     int agentfwd;
     enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
     char keyfile[FILENAME_MAX];
@@ -156,6 +157,8 @@ typedef struct {
     int bksp_is_delete;
     int rxvt_homeend;
     int funky_type;
+    int no_applic_c;                   /* totally disable app cursor keys */
+    int no_applic_k;                   /* totally disable app keypad */
     int app_cursor;
     int app_keypad;
     int nethack_keypad;
@@ -163,6 +166,7 @@ typedef struct {
     int alt_space;                    /* is it special? */
     int alt_only;                     /* is it special? */
     int ldisc_term;
+    int alwaysontop;
     int scroll_on_key;
     int scroll_on_disp;
     int compose_key;
@@ -260,8 +264,9 @@ void sys_cursor(int x, int y);
 /*
  * Exports from noise.c.
  */
-void noise_get_heavy(void (*func) (void *, int));
-void noise_get_light(void (*func) (void *, int));
+void noise_get_heavy(void (*func)(void *, int));
+void noise_get_light(void (*func)(void *, int));
+void noise_regular(void);
 void noise_ultralight(DWORD data);
 void random_save_seed(void);
 void random_destroy_seed(void);
@@ -309,6 +314,7 @@ void term_blink(int set_cursor);
 void term_paste(void);
 void term_nopaste(void);
 void from_backend(int is_stderr, char *data, int len);
+void term_copyall(void);
 
 /*
  * Exports from raw.c.
@@ -348,21 +354,7 @@ void random_get_savedata(void **data, int *len);
  * Exports from misc.c.
  */
 
-/* #define MALLOC_LOG  do this if you suspect putty of leaking memory */
-#ifdef MALLOC_LOG
-#define smalloc(z) (mlog(__FILE__,__LINE__), safemalloc(z))
-#define srealloc(y,z) (mlog(__FILE__,__LINE__), saferealloc(y,z))
-#define sfree(z) (mlog(__FILE__,__LINE__), safefree(z))
-void mlog(char *, int);
-#else
-#define smalloc safemalloc
-#define srealloc saferealloc
-#define sfree safefree
-#endif
-
-void *safemalloc(size_t);
-void *saferealloc(void *, size_t);
-void safefree(void *);
+#include "puttymem.h"
 
 /*
  * Exports from version.c.
@@ -396,28 +388,9 @@ void crypto_wrapup();
 void agent_query(void *in, int inlen, void **out, int *outlen);
 int agent_exists(void);
 
-/*
- * A debug system.
- */
 #ifdef DEBUG
-#include <stdarg.h>
+void dprintf(char *fmt, ...);
 #define debug(x) (dprintf x)
-static void dprintf(char *fmt, ...) {
-    char buf[2048];
-    DWORD dw;
-    va_list ap;
-    static int gotconsole = 0;
-
-    if (!gotconsole) {
-       AllocConsole();
-       gotconsole = 1;
-    }
-
-    va_start(ap, fmt);
-    vsprintf(buf, fmt, ap);
-    WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), buf, strlen(buf), &dw, NULL);
-    va_end(ap);
-}
 #else
 #define debug(x)
 #endif