From 317412502b900ddecdafdfa171da99271846478b Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 19 May 2003 00:13:38 +1000
Subject:  - (djm) Big KNF on openbsd-compat/

---
 openbsd-compat/bsd-misc.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'openbsd-compat/bsd-misc.c')

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index b8e9996d5..cdc63c24d 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2000 Damien Miller.  All rights reserved.
+ * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.12 2003/03/18 18:21:41 tim Exp $");
+RCSID("$Id: bsd-misc.c,v 1.13 2003/05/18 14:13:39 djm Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
@@ -41,21 +41,21 @@ char *get_progname(char *argv0)
 	char *p;
 
 	if (argv0 == NULL)
-		return "unknown";	/* XXX */
+		return ("unknown");	/* XXX */
 	p = strrchr(argv0, '/');
 	if (p == NULL)
 		p = argv0;
 	else
 		p++;
 
-	return xstrdup(p);
+	return (xstrdup(p));
 #endif
 }
 
 #ifndef HAVE_SETLOGIN
 int setlogin(const char *name)
 {
-	return(0);
+	return (0);
 }
 #endif /* !HAVE_SETLOGIN */
 
@@ -63,21 +63,21 @@ int setlogin(const char *name)
 int innetgr(const char *netgroup, const char *host, 
             const char *user, const char *domain)
 {
-	return(0);
+	return (0);
 }
 #endif /* HAVE_INNETGR */
 
 #if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
 int seteuid(uid_t euid)
 {
-	return(setreuid(-1,euid));
+	return (setreuid(-1, euid));
 }
 #endif /* !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) */
 
 #if !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID)
 int setegid(uid_t egid)
 {
-	return(setresgid(-1,egid,-1));
+	return(setresgid(-1, egid, -1));
 }
 #endif /* !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID) */
 
@@ -88,9 +88,9 @@ const char *strerror(int e)
 	extern char *sys_errlist[];
 	
 	if ((e >= 0) && (e < sys_nerr))
-		return(sys_errlist[e]);
-	else
-		return("unlisted error");
+		return (sys_errlist[e]);
+
+	return ("unlisted error");
 }
 #endif
 
@@ -102,24 +102,25 @@ int utimes(char *filename, struct timeval *tvp)
 	ub.actime = tvp[0].tv_sec;
 	ub.modtime = tvp[1].tv_sec;
 	
-	return(utime(filename, &ub));
+	return (utime(filename, &ub));
 }
 #endif 
 
 #ifndef HAVE_TRUNCATE
-int truncate (const char *path, off_t length)
+int truncate(const char *path, off_t length)
 {
 	int fd, ret, saverrno;
 
 	fd = open(path, O_WRONLY);
 	if (fd < 0)
-		return -1;
+		return (-1);
 
 	ret = ftruncate(fd, length);
 	saverrno = errno;
-	(void) close (fd);
+	close(fd);
 	if (ret == -1)
 		errno = saverrno;
+
 	return(ret);
 }
 #endif /* HAVE_TRUNCATE */
@@ -131,7 +132,7 @@ int truncate (const char *path, off_t length)
 int
 setgroups(size_t size, const gid_t *list)
 {
-	return 0;
+	return (0);
 }
 #endif 
 
-- 
cgit v1.2.3


From 2e9c9cf702d8e90809d901ec51358406be6f810a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 2 Aug 2003 23:31:42 +1000
Subject: - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]  
 Add a tcgetpgrp function.

---
 ChangeLog                 |  4 +++-
 openbsd-compat/bsd-misc.c | 15 ++++++++++++++-
 openbsd-compat/bsd-misc.h |  6 +++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'openbsd-compat/bsd-misc.c')

diff --git a/ChangeLog b/ChangeLog
index 5e60f6c87..884d1a636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
      replace 4 clause BSD licensed progressmeter code with a replacement
      from Nils Nordman and myself; ok deraadt@
      (copied from OpenBSD an re-applied portable changes)
+ - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
+   Add a tcgetpgrp function.
 
 20030730
  - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal
@@ -761,4 +763,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2872 2003/08/02 13:28:38 dtucker Exp $
+$Id: ChangeLog,v 1.2873 2003/08/02 13:31:42 dtucker Exp $
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index cdc63c24d..64de6945c 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.13 2003/05/18 14:13:39 djm Exp $");
+RCSID("$Id: bsd-misc.c,v 1.14 2003/08/02 13:31:42 dtucker Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
@@ -167,3 +167,16 @@ int nanosleep(const struct timespec *req, struct timespec *rem)
 
 #endif
 
+#ifndef HAVE_TCGETPGRP
+pid_t
+tcgetpgrp(int fd)
+{
+	int result, ctty_pgrp;
+
+	if (ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) == -1)
+		return(-1);
+	else
+		return(ctty_pgrp);
+}
+#endif /* HAVE_TCGETPGRP */
+
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index 00e508cfc..03a1f3af0 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: bsd-misc.h,v 1.8 2003/05/18 14:13:39 djm Exp $ */
+/* $Id: bsd-misc.h,v 1.9 2003/08/02 13:31:42 dtucker Exp $ */
 
 #ifndef _BSD_MISC_H
 #define _BSD_MISC_H
@@ -89,4 +89,8 @@ struct timespec {
 int nanosleep(const struct timespec *, struct timespec *);
 #endif
 
+#ifndef HAVE_TCGETPGRP
+pid_t tcgetpgrp(int);
+#endif /* HAVE_TCGETPGRP */
+
 #endif /* _BSD_MISC_H */
-- 
cgit v1.2.3


From 048737c9bcf25a02932d17b74398082930ee817e Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 2 Aug 2003 23:33:48 +1000
Subject: Remove unused variable.

---
 openbsd-compat/bsd-misc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'openbsd-compat/bsd-misc.c')

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 64de6945c..474aae1a6 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.14 2003/08/02 13:31:42 dtucker Exp $");
+RCSID("$Id: bsd-misc.c,v 1.15 2003/08/02 13:33:48 dtucker Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
@@ -171,7 +171,7 @@ int nanosleep(const struct timespec *req, struct timespec *rem)
 pid_t
 tcgetpgrp(int fd)
 {
-	int result, ctty_pgrp;
+	int ctty_pgrp;
 
 	if (ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) == -1)
 		return(-1);
-- 
cgit v1.2.3


From bdf571b0dc29efdec02c8a56f102077bf49aeb7c Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 3 Aug 2003 00:36:16 +1000
Subject:  - (dtucker) [openbsd-compat/bsd-misc.c] Fix cut-and-paste bug in
 tcgetpgrp.

---
 ChangeLog                 | 3 ++-
 openbsd-compat/bsd-misc.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'openbsd-compat/bsd-misc.c')

diff --git a/ChangeLog b/ChangeLog
index b34780d25..f25c14761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
  - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
    Add a tcgetpgrp function.
  - (dtucker) [Makefile.in moduli.c moduli.h] Add new files and to Makefile.
+ - (dtucker) [openbsd-compat/bsd-misc.c] Fix cut-and-paste bug in tcgetpgrp.
 
 20030730
  - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal
@@ -784,4 +785,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2878 2003/08/02 14:07:35 dtucker Exp $
+$Id: ChangeLog,v 1.2879 2003/08/02 14:36:16 dtucker Exp $
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 474aae1a6..da8f77046 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.15 2003/08/02 13:33:48 dtucker Exp $");
+RCSID("$Id: bsd-misc.c,v 1.16 2003/08/02 14:36:16 dtucker Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
@@ -173,7 +173,7 @@ tcgetpgrp(int fd)
 {
 	int ctty_pgrp;
 
-	if (ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) == -1)
+	if (ioctl(fd, TIOCGPGRP, &ctty_pgrp) == -1)
 		return(-1);
 	else
 		return(ctty_pgrp);
-- 
cgit v1.2.3


From f38ea77c03a5473ec43fe07ec24cfb1ca7f27034 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 13 Aug 2003 20:48:07 +1000
Subject:  - (dtucker) [configure.ac openbsd-compat/bsd-misc.c
 openbsd-compat/bsd-misc.h]    Add a tcsendbreak function for platforms that
 don't have one, based on the    one from OpenBSD.

Any more of these and I'll split them out into bsd-termio.[ch].
---
 ChangeLog                 |  5 ++++-
 configure.ac              |  6 +++---
 openbsd-compat/bsd-misc.c | 22 +++++++++++++++++++++-
 openbsd-compat/bsd-misc.h |  8 ++++++--
 4 files changed, 34 insertions(+), 7 deletions(-)

(limited to 'openbsd-compat/bsd-misc.c')

diff --git a/ChangeLog b/ChangeLog
index 2140b20c8..47e97438b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
    - markus@cvs.openbsd.org 2003/08/13 09:07:10
      [readconf.c ssh.c]
      socks4->socks, since with support both 4 and 5; dtucker@zip.com.au
+ - (dtucker) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
+   Add a tcsendbreak function for platforms that don't have one, based on the
+   one from OpenBSD.
 
 20030811
  - (dtucker) OpenBSD CVS Sync
@@ -831,4 +834,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2892 2003/08/13 10:38:36 dtucker Exp $
+$Id: ChangeLog,v 1.2893 2003/08/13 10:48:07 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 68fa5c1f2..9644dcaf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.138 2003/08/02 12:24:49 dtucker Exp $
+# $Id: configure.ac,v 1.139 2003/08/13 10:48:07 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -695,8 +695,8 @@ AC_CHECK_FUNCS(\
 	setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
 	setproctitle setregid setresgid setresuid setreuid setrlimit \
 	setsid setvbuf sigaction sigvec snprintf socketpair strerror \
-	strlcat strlcpy strmode strnvis sysconf tcgetpgrp truncate utimes \
-	vhangup vsnprintf waitpid \
+	strlcat strlcpy strmode strnvis sysconf tcgetpgrp tcsendbreak \
+	truncate utimes vhangup vsnprintf waitpid \
 )
 
 AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index da8f77046..d4c793724 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.16 2003/08/02 14:36:16 dtucker Exp $");
+RCSID("$Id: bsd-misc.c,v 1.17 2003/08/13 10:48:07 dtucker Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
@@ -180,3 +180,23 @@ tcgetpgrp(int fd)
 }
 #endif /* HAVE_TCGETPGRP */
 
+#ifndef HAVE_TCSENDBREAK
+int
+tcsendbreak(int fd, int duration)
+{
+# if defined(TIOCSBRK) && defined(TIOCCBRK)
+	struct timeval sleepytime;
+
+	sleepytime.tv_sec = 0;
+	sleepytime.tv_usec = 400000;
+	if (ioctl(fd, TIOCSBRK, 0) == -1)
+		return (-1);
+	(void)select(0, 0, 0, 0, &sleepytime);
+	if (ioctl(fd, TIOCCBRK, 0) == -1)
+		return (-1);
+	return (0);
+# else
+	return -1;
+# endif
+}
+#endif /* HAVE_TCSENDBREAK */
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index 03a1f3af0..f2fbdc2e3 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: bsd-misc.h,v 1.9 2003/08/02 13:31:42 dtucker Exp $ */
+/* $Id: bsd-misc.h,v 1.10 2003/08/13 10:48:07 dtucker Exp $ */
 
 #ifndef _BSD_MISC_H
 #define _BSD_MISC_H
@@ -91,6 +91,10 @@ int nanosleep(const struct timespec *, struct timespec *);
 
 #ifndef HAVE_TCGETPGRP
 pid_t tcgetpgrp(int);
-#endif /* HAVE_TCGETPGRP */
+#endif
+
+#ifndef HAVE_TCSENDBREAK
+int tcsendbreak(int, int);
+#endif
 
 #endif /* _BSD_MISC_H */
-- 
cgit v1.2.3


From 59d3d5b8b4813bdd1d4518d6839bd392ff6d21f7 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 22 Aug 2003 09:34:41 +1000
Subject:  - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with
 Heimdal    -lbroken; ok dtucker

---
 ChangeLog                 | 6 +++++-
 logintest.c               | 4 ++--
 openbsd-compat/bsd-misc.c | 4 ++--
 openbsd-compat/bsd-misc.h | 4 ++--
 scp.c                     | 2 +-
 sftp-server.c             | 2 +-
 sftp.c                    | 2 +-
 ssh-add.c                 | 2 +-
 ssh-agent.c               | 2 +-
 ssh-keygen.c              | 2 +-
 ssh-keyscan.c             | 2 +-
 ssh-rand-helper.c         | 4 ++--
 ssh.c                     | 2 +-
 sshd.c                    | 2 +-
 14 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'openbsd-compat/bsd-misc.c')

diff --git a/ChangeLog b/ChangeLog
index 081b07907..ded30f05a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030822
+ - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal 
+   -lbroken; ok dtucker 
+
 20030821
  - (dtucker) OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2003/08/14 16:08:58
@@ -845,4 +849,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2896 2003/08/21 07:58:29 dtucker Exp $
+$Id: ChangeLog,v 1.2897 2003/08/21 23:34:41 djm Exp $
diff --git a/logintest.c b/logintest.c
index a0c08118b..3f3997d10 100644
--- a/logintest.c
+++ b/logintest.c
@@ -43,7 +43,7 @@
 
 #include "loginrec.h"
 
-RCSID("$Id: logintest.c,v 1.9 2003/06/02 00:42:17 djm Exp $");
+RCSID("$Id: logintest.c,v 1.10 2003/08/21 23:34:41 djm Exp $");
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
 {
 	printf("Platform-independent login recording test driver\n");
 
-	__progname = get_progname(argv[0]);
+	__progname = ssh_get_progname(argv[0]);
 	if (argc == 2) {
 		if (strncmp(argv[1], "-i", 3) == 0)
 			compile_opts_only = 1;
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index d4c793724..56cb45ade 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,13 +25,13 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.17 2003/08/13 10:48:07 dtucker Exp $");
+RCSID("$Id: bsd-misc.c,v 1.18 2003/08/21 23:34:42 djm Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
  * Otherwise it may get clobbered by setproctitle()
  */
-char *get_progname(char *argv0)
+char *ssh_get_progname(char *argv0)
 {
 #ifdef HAVE___PROGNAME
 	extern char *__progname;
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index f2fbdc2e3..2857de59b 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -22,14 +22,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: bsd-misc.h,v 1.10 2003/08/13 10:48:07 dtucker Exp $ */
+/* $Id: bsd-misc.h,v 1.11 2003/08/21 23:34:42 djm Exp $ */
 
 #ifndef _BSD_MISC_H
 #define _BSD_MISC_H
 
 #include "config.h"
 
-char *get_progname(char *);
+char *ssh_get_progname(char *);
 
 #ifndef HAVE_SETSID
 #define setsid() setpgrp(0, getpid())
diff --git a/scp.c b/scp.c
index cf979f250..4f9247c2d 100644
--- a/scp.c
+++ b/scp.c
@@ -222,7 +222,7 @@ main(int argc, char **argv)
 	extern char *optarg;
 	extern int optind;
 
-	__progname = get_progname(argv[0]);
+	__progname = ssh_get_progname(argv[0]);
 
 	args.list = NULL;
 	addargs(&args, "ssh");		/* overwritten with ssh_program */
diff --git a/sftp-server.c b/sftp-server.c
index 250814d72..9166853ed 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1030,7 +1030,7 @@ main(int ac, char **av)
 
 	/* XXX should use getopt */
 
-	__progname = get_progname(av[0]);
+	__progname = ssh_get_progname(av[0]);
 	handle_init();
 
 #ifdef DEBUG_SFTP_SERVER
diff --git a/sftp.c b/sftp.c
index 4354bfd44..c2a6593b8 100644
--- a/sftp.c
+++ b/sftp.c
@@ -132,7 +132,7 @@ main(int argc, char **argv)
 	extern int optind;
 	extern char *optarg;
 
-	__progname = get_progname(argv[0]);
+	__progname = ssh_get_progname(argv[0]);
 	args.list = NULL;
 	addargs(&args, "ssh");		/* overwritten with ssh_program */
 	addargs(&args, "-oForwardX11 no");
diff --git a/ssh-add.c b/ssh-add.c
index 5b0fbbce6..2e394e5c1 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -319,7 +319,7 @@ main(int argc, char **argv)
 	char *sc_reader_id = NULL;
 	int i, ch, deleting = 0, ret = 0;
 
-	__progname = get_progname(argv[0]);
+	__progname = ssh_get_progname(argv[0]);
 	init_rng();
 	seed_rng();
 
diff --git a/ssh-agent.c b/ssh-agent.c
index 6c8ff30dd..c05c61468 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1024,7 +1024,7 @@ main(int ac, char **av)
 
 	SSLeay_add_all_algorithms();
 
-	__progname = get_progname(av[0]);
+	__progname = ssh_get_progname(av[0]);
 	init_rng();
 	seed_rng();
 
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 2ce5553f6..dbc514737 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -809,7 +809,7 @@ main(int ac, char **av)
 	extern int optind;
 	extern char *optarg;
 
-	__progname = get_progname(av[0]);
+	__progname = ssh_get_progname(av[0]);
 
 	SSLeay_add_all_algorithms();
 	log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 358a1e353..9fa8aaebc 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -697,7 +697,7 @@ main(int argc, char **argv)
 	extern int optind;
 	extern char *optarg;
 
-	__progname = get_progname(argv[0]);
+	__progname = ssh_get_progname(argv[0]);
 	init_rng();
 	seed_rng();
 	TAILQ_INIT(&tq);
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 88e6e7c05..7e65e4569 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -39,7 +39,7 @@
 #include "pathnames.h"
 #include "log.h"
 
-RCSID("$Id: ssh-rand-helper.c,v 1.12 2003/07/06 05:20:46 dtucker Exp $");
+RCSID("$Id: ssh-rand-helper.c,v 1.13 2003/08/21 23:34:41 djm Exp $");
 
 /* Number of bytes we write out */
 #define OUTPUT_SEED_SIZE	48
@@ -769,7 +769,7 @@ main(int argc, char **argv)
 	extern char *optarg;
 	LogLevel ll;
 
-	__progname = get_progname(argv[0]);
+	__progname = ssh_get_progname(argv[0]);
 	log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
 
 	ll = SYSLOG_LEVEL_INFO;
diff --git a/ssh.c b/ssh.c
index 694bb5acc..46640a857 100644
--- a/ssh.c
+++ b/ssh.c
@@ -212,7 +212,7 @@ main(int ac, char **av)
 	extern int optind, optreset;
 	extern char *optarg;
 
-	__progname = get_progname(av[0]);
+	__progname = ssh_get_progname(av[0]);
 	init_rng();
 
 	/*
diff --git a/sshd.c b/sshd.c
index dc275b0cb..0e1bde3a3 100644
--- a/sshd.c
+++ b/sshd.c
@@ -819,7 +819,7 @@ main(int ac, char **av)
 #ifdef HAVE_SECUREWARE
 	(void)set_auth_parameters(ac, av);
 #endif
-	__progname = get_progname(av[0]);
+	__progname = ssh_get_progname(av[0]);
 	init_rng();
 
 	/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
-- 
cgit v1.2.3


From 5ade9abc37df3dacacbe20104877ca6dab61082a Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Mon, 25 Aug 2003 01:16:21 +0000
Subject:  - (bal) redo how we handle 'mysignal()'.  Move it to   
 openbsd-compat/bsd-misc.c, s/mysignal/signal/ and #define signal to    be our
 'mysignal' by default.  OK djm@

---
 ChangeLog                 |  7 +++++--
 entropy.c                 |  6 +++---
 misc.c                    | 26 --------------------------
 misc.h                    |  4 ----
 openbsd-compat/bsd-misc.c | 28 +++++++++++++++++++++++++++-
 openbsd-compat/bsd-misc.h |  8 +++++++-
 progressmeter.c           |  4 ++--
 sshd.c                    |  4 ++--
 sshpty.c                  | 12 ++++++------
 9 files changed, 52 insertions(+), 47 deletions(-)

(limited to 'openbsd-compat/bsd-misc.c')

diff --git a/ChangeLog b/ChangeLog
index 956a5e3a8..6ea448a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,10 @@
  - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from 
    larsch@trustcenter.de
  - (bal) openbsd-compat/ OpenBSD updates.  Mostly licensing, ansifications
-   and minor fixes.
+   and minor fixes. OK djm@
+ - (bal) redo how we handle 'mysignal()'.  Move it to 
+   openbsd-compat/bsd-misc.c, s/mysignal/signal/ and #define signal to
+   be our 'mysignal' by default.  OK djm@
 
 20030822
  - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal 
@@ -857,4 +860,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2900 2003/08/25 01:10:51 mouring Exp $
+$Id: ChangeLog,v 1.2901 2003/08/25 01:16:21 mouring Exp $
diff --git a/entropy.c b/entropy.c
index a16ea10b3..216879786 100644
--- a/entropy.c
+++ b/entropy.c
@@ -45,7 +45,7 @@
  * XXX: we should tell the child how many bytes we need.
  */
 
-RCSID("$Id: entropy.c,v 1.45 2003/05/16 05:51:45 djm Exp $");
+RCSID("$Id: entropy.c,v 1.46 2003/08/25 01:16:21 mouring Exp $");
 
 #ifndef OPENSSL_PRNG_ONLY
 #define RANDOM_SEED_SIZE 48
@@ -75,7 +75,7 @@ seed_rng(void)
 	if (pipe(p) == -1)
 		fatal("pipe: %s", strerror(errno));
 
-	old_sigchld = mysignal(SIGCHLD, SIG_DFL);
+	old_sigchld = signal(SIGCHLD, SIG_DFL);
 	if ((pid = fork()) == -1)
 		fatal("Couldn't fork: %s", strerror(errno));
 	if (pid == 0) {
@@ -116,7 +116,7 @@ seed_rng(void)
 	if (waitpid(pid, &ret, 0) == -1)
 	       fatal("Couldn't wait for ssh-rand-helper completion: %s", 
 		   strerror(errno));
-	mysignal(SIGCHLD, old_sigchld);
+	signal(SIGCHLD, old_sigchld);
 
 	/* We don't mind if the child exits upon a SIGPIPE */
 	if (!WIFEXITED(ret) && 
diff --git a/misc.c b/misc.c
index ff1966192..c457a952c 100644
--- a/misc.c
+++ b/misc.c
@@ -323,29 +323,3 @@ addargs(arglist *args, char *fmt, ...)
 	args->list[args->num++] = xstrdup(buf);
 	args->list[args->num] = NULL;
 }
-
-mysig_t
-mysignal(int sig, mysig_t act)
-{
-#ifdef HAVE_SIGACTION
-	struct sigaction sa, osa;
-
-	if (sigaction(sig, NULL, &osa) == -1)
-		return (mysig_t) -1;
-	if (osa.sa_handler != act) {
-		memset(&sa, 0, sizeof(sa));
-		sigemptyset(&sa.sa_mask);
-		sa.sa_flags = 0;
-#if defined(SA_INTERRUPT)
-		if (sig == SIGALRM)
-			sa.sa_flags |= SA_INTERRUPT;
-#endif
-		sa.sa_handler = act;
-		if (sigaction(sig, &sa, NULL) == -1)
-			return (mysig_t) -1;
-	}
-	return (osa.sa_handler);
-#else
-	return (signal(sig, act));
-#endif
-}
diff --git a/misc.h b/misc.h
index 3b4b87967..6d2869b36 100644
--- a/misc.h
+++ b/misc.h
@@ -31,7 +31,3 @@ struct arglist {
 	int     nalloc;
 };
 void	 addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
-
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 56cb45ade..08b089bdc 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.18 2003/08/21 23:34:42 djm Exp $");
+RCSID("$Id: bsd-misc.c,v 1.19 2003/08/25 01:16:21 mouring Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
@@ -200,3 +200,29 @@ tcsendbreak(int fd, int duration)
 # endif
 }
 #endif /* HAVE_TCSENDBREAK */
+
+mysig_t
+mysignal(int sig, mysig_t act)
+{
+#ifdef HAVE_SIGACTION
+	struct sigaction sa, osa;
+
+	if (sigaction(sig, NULL, &osa) == -1)
+		return (mysig_t) -1;
+	if (osa.sa_handler != act) {
+		memset(&sa, 0, sizeof(sa));
+		sigemptyset(&sa.sa_mask);
+		sa.sa_flags = 0;
+#ifdef SA_INTERRUPT
+		if (sig == SIGALRM)
+			sa.sa_flags |= SA_INTERRUPT;
+#endif
+		sa.sa_handler = act;
+		if (sigaction(sig, &sa, NULL) == -1)
+			return (mysig_t) -1;
+	}
+	return (osa.sa_handler);
+#else
+	return (signal(sig, act));
+#endif
+}
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index 2857de59b..0d6076ab0 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: bsd-misc.h,v 1.11 2003/08/21 23:34:42 djm Exp $ */
+/* $Id: bsd-misc.h,v 1.12 2003/08/25 01:16:22 mouring Exp $ */
 
 #ifndef _BSD_MISC_H
 #define _BSD_MISC_H
@@ -97,4 +97,10 @@ pid_t tcgetpgrp(int);
 int tcsendbreak(int, int);
 #endif
 
+/* wrapper for signal interface */
+typedef void (*mysig_t)(int);
+mysig_t mysignal(int sig, mysig_t act);
+
+#define signal(a,b) mysignal(a,b)
+
 #endif /* _BSD_MISC_H */
diff --git a/progressmeter.c b/progressmeter.c
index 170d869f4..9fe8cfa41 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -212,7 +212,7 @@ update_progress_meter(int ignore)
 	if (can_output())
 		refresh_progress_meter();
 
-	mysignal(SIGALRM, update_progress_meter);
+	signal(SIGALRM, update_progress_meter);
 	alarm(UPDATE_INTERVAL);
 	errno = save_errno;
 }
@@ -243,7 +243,7 @@ start_progress_meter(char *f, off_t filesize, off_t *stat)
 	if (can_output())
 		refresh_progress_meter();
 
-	mysignal(SIGALRM, update_progress_meter);
+	signal(SIGALRM, update_progress_meter);
 	alarm(UPDATE_INTERVAL);
 }
 
diff --git a/sshd.c b/sshd.c
index 0e1bde3a3..8d04f6a74 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1368,7 +1368,7 @@ main(int ac, char **av)
 				if ((options.protocol & SSH_PROTO_1) &&
 				    key_used == 0) {
 					/* Schedule server key regeneration alarm. */
-					mysignal(SIGALRM, key_regeneration_alarm);
+					signal(SIGALRM, key_regeneration_alarm);
 					alarm(options.key_regeneration_time);
 					key_used = 1;
 				}
@@ -1457,7 +1457,7 @@ main(int ac, char **av)
 	 * mode; it is just annoying to have the server exit just when you
 	 * are about to discover the bug.
 	 */
-	mysignal(SIGALRM, grace_alarm_handler);
+	signal(SIGALRM, grace_alarm_handler);
 	if (!debug_flag)
 		alarm(options.login_grace_time);
 
diff --git a/sshpty.c b/sshpty.c
index 109fc96ac..4747ceaf4 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -101,12 +101,12 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 		error("/dev/ptmx: %.100s", strerror(errno));
 		return 0;
 	}
-	old_signal = mysignal(SIGCHLD, SIG_DFL);
+	old_signal = signal(SIGCHLD, SIG_DFL);
 	if (grantpt(ptm) < 0) {
 		error("grantpt: %.100s", strerror(errno));
 		return 0;
 	}
-	mysignal(SIGCHLD, old_signal);
+	signal(SIGCHLD, old_signal);
 	if (unlockpt(ptm) < 0) {
 		error("unlockpt: %.100s", strerror(errno));
 		return 0;
@@ -274,9 +274,9 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
 
 	fd = open(ttyname, O_RDWR|O_NOCTTY);
 	if (fd != -1) {
-		mysignal(SIGHUP, SIG_IGN);
+		signal(SIGHUP, SIG_IGN);
 		ioctl(fd, TCVHUP, (char *)NULL);
-		mysignal(SIGHUP, SIG_DFL);
+		signal(SIGHUP, SIG_DFL);
 		setpgid(0, 0);
 		close(fd);
 	} else {
@@ -323,9 +323,9 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
 		error("SETPGRP %s",strerror(errno));
 #endif /* HAVE_NEWS4 */
 #ifdef USE_VHANGUP
-	old = mysignal(SIGHUP, SIG_IGN);
+	old = signal(SIGHUP, SIG_IGN);
 	vhangup();
-	mysignal(SIGHUP, old);
+	signal(SIGHUP, old);
 #endif /* USE_VHANGUP */
 	fd = open(ttyname, O_RDWR);
 	if (fd < 0) {
-- 
cgit v1.2.3