Post-release destabilisation! Completely remove the struct type

[u/mdw/putty] / misc.c

diff --git a/misc.c b/misc.c
index 09506de..cf97c04 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -102,7 +102,7 @@ prompts_t *new_prompts(void *frontend)
 void add_prompt(prompts_t *p, char *promptstr, int echo, size_t len)
 {
     prompt_t *pr = snew(prompt_t);
-    unsigned char *result = snewn(len, unsigned char);
+    char *result = snewn(len, char);
     pr->prompt = promptstr;
     pr->echo = echo;
     pr->result = result;
@@ -180,20 +180,11 @@ char *dupcat(const char *s1, ...)
  * Do an sprintf(), but into a custom-allocated buffer.
  * 
  * Currently I'm doing this via vsnprintf. This has worked so far,
- * but it's not good, because:
- * 
- *  - vsnprintf is not available on all platforms. There's an ifdef
- *    to use `_vsnprintf', which seems to be the local name for it
- *    on Windows. Other platforms may lack it completely, in which
- *    case it'll be time to rewrite this function in a totally
- *    different way.
- * 
- *  - technically you can't reuse a va_list like this: it is left
- *    unspecified whether advancing a va_list pointer modifies its
- *    value or something it points to, so on some platforms calling
- *    vsnprintf twice on the same va_list might fail hideously. It
- *    would be better to use the `va_copy' macro mandated by C99,
- *    but that too is not yet ubiquitous.
+ * but it's not good, because vsnprintf is not available on all
+ * platforms. There's an ifdef to use `_vsnprintf', which seems
+ * to be the local name for it on Windows. Other platforms may
+ * lack it completely, in which case it'll be time to rewrite
+ * this function in a totally different way.
  * 
  * The only `properly' portable solution I can think of is to
  * implement my own format string scanner, which figures out an
@@ -241,7 +232,24 @@ char *dupvprintf(const char *fmt, va_list ap)
 #ifdef _WINDOWS
 #define vsnprintf _vsnprintf
 #endif
+#ifdef va_copy
+       /* Use the `va_copy' macro mandated by C99, if present.
+        * XXX some environments may have this as __va_copy() */
+       va_list aq;
+       va_copy(aq, ap);
+       len = vsnprintf(buf, size, fmt, aq);
+       va_end(aq);
+#else
+       /* Ugh. No va_copy macro, so do something nasty.
+        * Technically, you can't reuse a va_list like this: it is left
+        * unspecified whether advancing a va_list pointer modifies its
+        * value or something it points to, so on some platforms calling
+        * vsnprintf twice on the same va_list might fail hideously
+        * (indeed, it has been observed to).
+        * XXX the autoconf manual suggests that using memcpy() will give
+        *     "maximum portability". */
        len = vsnprintf(buf, size, fmt, ap);
+#endif
        if (len >= 0 && len < size) {
            /* This is the C99-specified criterion for snprintf to have
             * been completely successful. */
@@ -597,7 +605,7 @@ void debug_memdump(void *buf, int len, int L)
     if (L) {
        int delta;
        debug_printf("\t%d (0x%x) bytes:\n", len, len);
-       delta = 15 & (int) p;
+       delta = 15 & (unsigned long int) p;
        p -= delta;
        len += delta;
     }
@@ -627,21 +635,21 @@ void debug_memdump(void *buf, int len, int L)
 #endif                         /* def DEBUG */
 
 /*
- * Determine whether or not a Config structure represents a session
- * which can sensibly be launched right now.
+ * Determine whether or not a Conf represents a session which can
+ * sensibly be launched right now.
  */
-int cfg_launchable(const Config *cfg)
+int conf_launchable(Conf *conf)
 {
-    if (cfg->protocol == PROT_SERIAL)
-       return cfg->serline[0] != 0;
+    if (conf_get_int(conf, CONF_protocol) == PROT_SERIAL)
+       return conf_get_str(conf, CONF_serline)[0] != 0;
     else
-       return cfg->host[0] != 0;
+       return conf_get_str(conf, CONF_host)[0] != 0;
 }
 
-char const *cfg_dest(const Config *cfg)
+char const *conf_dest(Conf *conf)
 {
-    if (cfg->protocol == PROT_SERIAL)
-       return cfg->serline;
+    if (conf_get_int(conf, CONF_protocol) == PROT_SERIAL)
+       return conf_get_str(conf, CONF_serline);
     else
-       return cfg->host;
+       return conf_get_str(conf, CONF_host);
 }