sw_build: Bug squashing.

[sw-tools] / src / sw_build.c

diff --git a/src/sw_build.c b/src/sw_build.c
index 717ca066c8e8937b973170a7bc700f70ef2ca2e0..7b301935819a640c63d60eaf96197e79f7197387 100644 (file)
--- a/src/sw_build.c
+++ b/src/sw_build.c
@@ -405,8 +405,10 @@ int sw_run(int argc, char *argv[])
          } break;
 
          default: {
          } break;
 
          default: {

-           const static char msg[] = "\n[Unexpected packet, type %i]\n";
-           p->output(e, msg, sizeof(msg) - 1);
+           dstr d = DSTR_INIT;
+           dstr_putf(&d, "\n[Unexpected packet, type %i]\n", t);
+           p->output(e, d.buf, d.len);
+           dstr_destroy(&d);

          } break;
        }
       }
          } break;
        }
       }


@@ -444,7 +446,7 @@ int sw_run(int argc, char *argv[])
   {
     archcons *aa;
     for (aa = a; aa; aa = aa->cdr)
   {
     archcons *aa;
     for (aa = a; aa; aa = aa->cdr)

-      free(a->car->r);
+      free(aa->car->r);

   }
 
   /* --- Tidy away the architecture list --- */
   }
 
   /* --- Tidy away the architecture list --- */


@@ -487,7 +489,7 @@ static void putf(sw_remote *r, FILE *fp, const char *fmt, ...)
   va_list ap;
   dstr d = DSTR_INIT;
   va_start(ap, fmt);
   va_list ap;
   dstr d = DSTR_INIT;
   va_start(ap, fmt);

-  dstr_vputf(&d, fmt, ap);
+  dstr_vputf(&d, fmt, &ap);

   va_end(ap);
   if (r)
     pksend(r, PKTYPE_DATA, d.buf, d.len);
   va_end(ap);
   if (r)
     pksend(r, PKTYPE_DATA, d.buf, d.len);