X-Git-Url: https://git.distorted.org.uk/~mdw/sw-tools/blobdiff_plain/1efab4fe37e9a69e5c34c7d9be478b63928692e2..0d451ca5574df7dba18505ef3404bd62daf24c6b:/src/sw_build.c

diff --git a/src/sw_build.c b/src/sw_build.c
index 4933363..7b30193 100644
--- a/src/sw_build.c
+++ b/src/sw_build.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: sw_build.c,v 1.3 1999/09/10 15:27:33 mdw Exp $
+ * $Id$
  *
  * Management of build processes
  *
@@ -26,20 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: sw_build.c,v $
- * Revision 1.3  1999/09/10 15:27:33  mdw
- * Include `%'-escape substitution.
- *
- * Revision 1.2  1999/07/16 12:50:24  mdw
- * Improve exit status display.  New interface from `doto' project.
- *
- * Revision 1.1.1.1  1999/06/02 16:53:34  mdw
- * Initial import.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -51,6 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -237,7 +224,7 @@ int sw_run(int argc, char *argv[])
 
       /* --- Fill in the hostname --- */
 
-      if (uname(&u))
+      if (uname(&u) < 0)
 	strcpy(u.nodename, "<unknown>");
 
       /* --- If necessary, set up the output @argv@ array --- */
@@ -418,8 +405,10 @@ int sw_run(int argc, char *argv[])
 	  } 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;
 	}
       }
@@ -457,7 +446,7 @@ int sw_run(int argc, char *argv[])
   {
     archcons *aa;
     for (aa = a; aa; aa = aa->cdr)
-      free(a->car->r);
+      free(aa->car->r);
   }
 
   /* --- Tidy away the architecture list --- */
@@ -500,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);
-  dstr_vputf(&d, fmt, ap);
+  dstr_vputf(&d, fmt, &ap);
   va_end(ap);
   if (r)
     pksend(r, PKTYPE_DATA, d.buf, d.len);
@@ -552,7 +541,7 @@ void swrsh_build(sw_remote *r, char *argv[], char *env[])
     char **p;
     struct utsname u;
 
-    if (uname(&u))
+    if (uname(&u) < 0)
       swdie(r, 1, "couldn't get hostname: %s", strerror(errno));
     if (logfd < 0)
       swdie(r, 1, "couldn't open `.build-log' file: %s", strerror(errno));