summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2010-07-03 03:33:12 +0000
committernicm <nicm@openbsd.org>2010-07-03 03:33:12 +0000
commit27fbe447cfd7d54c47e13de41701eeb6b90d3082 (patch)
treef8654c90bfe360573a27f3b585c4eebe4f96c6e8
parentexplicitly specify flags to malloc and pool_get instead of relying on 0. (diff)
downloadwireguard-openbsd-27fbe447cfd7d54c47e13de41701eeb6b90d3082.tar.xz
wireguard-openbsd-27fbe447cfd7d54c47e13de41701eeb6b90d3082.zip
Changed vinit to clear the values but forgot to move it before they are set by
command line parsing.
-rw-r--r--usr.bin/tip/cu.c4
-rw-r--r--usr.bin/tip/tip.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index 978d4862dc1..01d88caafbe 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cu.c,v 1.36 2010/07/02 07:40:03 nicm Exp $ */
+/* $OpenBSD: cu.c,v 1.37 2010/07/03 03:33:12 nicm Exp $ */
/* $NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $ */
/*
@@ -148,8 +148,6 @@ getopt:
signal(SIGTERM, cleanup);
signal(SIGCHLD, SIG_DFL);
- vinit();
-
/*
* The "cu" host name is used to define the
* attributes of the generic dialer.
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index de70e2a2ea3..11de8595670 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.c,v 1.52 2010/07/02 07:40:03 nicm Exp $ */
+/* $OpenBSD: tip.c,v 1.53 2010/07/03 03:33:12 nicm Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
/*
@@ -54,6 +54,8 @@ main(int argc, char *argv[])
char *sys = NULL;
int i, pair[2];
+ vinit();
+
/* XXX preserve previous braindamaged behavior */
vsetnum(DC, 1);
@@ -103,8 +105,6 @@ main(int argc, char *argv[])
(void)signal(SIGTERM, cleanup);
(void)signal(SIGCHLD, SIG_DFL);
- vinit();
-
FD = hunt(sys);
setbuf(stdout, NULL);