From ccfdfceacb7e23d1479ed4cc91976c5ac6e23c56 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 10 May 2013 16:28:55 +1000 Subject: - (dtucker) [openbsd-compat/Makefile.in openbsd-compat/getopt.c openbsd-compat/getopt_long.c regress/modpipe.c] Remove getopt.c, add portability code to getopt_long.c and switch over Makefile and the ugly hack in modpipe.c. Fixes bz#1448. --- regress/modpipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'regress/modpipe.c') diff --git a/regress/modpipe.c b/regress/modpipe.c index 9629aa80b..3322d1a70 100755 --- a/regress/modpipe.c +++ b/regress/modpipe.c @@ -25,7 +25,7 @@ #include #include #include -#include "openbsd-compat/getopt.c" +#include "openbsd-compat/getopt_long.c" static void err(int, const char *, ...) __attribute__((format(printf, 2, 3))); static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3))); -- cgit v1.2.3 From 5e95173715d516e6014485e2b6def1fb3db84036 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 17 May 2013 09:41:33 +1000 Subject: - djm@cvs.openbsd.org 2013/05/10 03:46:14 [modpipe.c] sync some portability changes from portable OpenSSH (id sync only) --- ChangeLog | 3 +++ regress/modpipe.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'regress/modpipe.c') diff --git a/ChangeLog b/ChangeLog index 46f2d5e8b..5df073c92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,9 @@ - dtucker@cvs.openbsd.org 2013/04/22 07:23:08 [regress/multiplex.sh] Write mux master logs to regress.log instead of ssh.log to keep separate + - djm@cvs.openbsd.org 2013/05/10 03:46:14 + [modpipe.c] + sync some portability changes from portable OpenSSH (id sync only) 20130516 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be diff --git a/regress/modpipe.c b/regress/modpipe.c index 3322d1a70..85747cf7d 100755 --- a/regress/modpipe.c +++ b/regress/modpipe.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: modpipe.c,v 1.4 2013/02/20 08:29:27 djm Exp $ */ +/* $OpenBSD: modpipe.c,v 1.5 2013/05/10 03:46:14 djm Exp $ */ #include "includes.h" -- cgit v1.2.3