Licensing: Delete FSF street address

[adns.git] / client / fanftest.c

diff --git a/client/fanftest.c b/client/fanftest.c
index 4ca0cf072e6d6fa7c454253069b89bfebe0ce16f..7a659bac0985999de302026a02c38e01a3b04c20 100644 (file)
--- a/client/fanftest.c
+++ b/client/fanftest.c
@@ -1,3 +1,37 @@
+/*
+ * fanftest.c
+ * - a small test program from Tony Finch
+ */
+/*
+ *  This file is
+ *   Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *   Copyright (C) 1999-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3, or (at your option)
+ *  any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software Foundation.
+ *
+ * This version was originally supplied by Tony Finch, but has been
+ * modified by Ian Jackson as it was incorporated into adns.
+ */
+
+static const char * const cvsid =
+       "$Id$";
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -7,16 +41,14 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include "config.h"
 #include "adns.h"
 
 static const char *progname;
 
-#define msg(fmt, args...) fprintf(stderr, "%s: " fmt "\n", progname, ##args)
-
-static void aargh(const char *cause) {
-  const char *why = strerror(errno);
-  if (!why) why = "Unknown error";
-  msg("%s: %s (%d)", cause, why, errno);
+static void aargh(const char *msg) {
+  fprintf(stderr, "%s: %s: %s (%d)\n", progname, msg,
+         strerror(errno) ? strerror(errno) : "Unknown error", errno);
   exit(1);
 }