Fix conflicts.

1 files changed, 13 insertions, 5 deletions

diff --git a/contrib/amd/wire-test/wire-test.c b/contrib/amd/wire-test/wire-test.c
index 7fc87af..be1dffa 100644
--- a/contrib/amd/wire-test/wire-test.c
+++ b/contrib/amd/wire-test/wire-test.c
@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
+ *    must display the following acknowledgment:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: wire-test.c,v 1.2 1998/08/23 22:52:09 obrien Exp $
+ * $Id: wire-test.c,v 1.3 1998/11/14 03:13:33 obrien Exp $
  *
  */
 
@@ -50,10 +50,16 @@
 #define STRMAX	100
 
 /* dummy variables */
-char *progname, hostname[MAXHOSTNAMELEN + 1];
-int orig_umask, foreground, debug_flags;
+#if 0
+char *progname;
 pid_t mypid;
 serv_state amd_state;
+int foreground, orig_umask;
+int debug_flags;
+#endif
+
+char hostname[MAXHOSTNAMELEN + 1];
+
 
 int
 main(int argc, char **argv)
@@ -65,9 +71,11 @@ main(int argc, char **argv)
   struct sockaddr_in *ip;
   struct hostent *hp = 0;
 
-  progname = argv[0];
+  am_set_progname(argv[0]);
+#if 0
   mypid = getpid();
   orig_umask = umask(0);
+#endif
 
   if (gethostname(hostname, sizeof(hostname)) < 0) {
     perror(argv[0]);