openssh unix dev - Feb 2003 - Build errors on AIX 4.2.1: nanosleep

Hi All.
	There are still build errors for scp on AIX 4.2.1 due to lack of
nanosleep (which you can see them live and in colour at [1]).  The
attached patch fixes this by using the equivalent nsleep function on AIX
if it exists and nanosleep doesn't.

	The patch is mostly the same as the AIX portion of the previous patch
for the nanosleep issue, the major difference being that the #define is
in port-aix.h.  If this proves necessary for other platforms, it can be
moved later (I'm not aware of any other platforms requiring it, though).

		-Daz.

[1] http://dodgynet.dyndns.org/tinderbox/OpenSSH_Portable/status.html

-- 
Darren Tucker (dtucker at zip.com.au)
GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4  37C9 C982 80C7 8FF4 FA69
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.
-------------- next part --------------
Index: configure.ac
==================================================================RCS file:
/usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
retrieving revision 1.104
diff -u -r1.104 configure.ac
--- configure.ac	28 Jan 2003 00:33:44 -0000	1.104
+++ configure.ac	1 Feb 2003 01:49:04 -0000
@@ -388,7 +388,7 @@
 	rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
 	strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
 	sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
-	sys/stropts.h sys/sysmacros.h sys/time.h \
+	sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
 	sys/un.h time.h tmpdir.h ttyent.h usersec.h \
 	util.h utime.h utmp.h utmpx.h)
 
@@ -604,8 +604,8 @@
 	clock fchmod fchown freeaddrinfo futimes gai_strerror \
 	getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\
 	getrlimit getrusage getttyent glob inet_aton inet_ntoa \
-	inet_ntop innetgr login_getcapbool md5_crypt memmove \
-	mkdtemp mmap ngetaddrinfo openpty ogetaddrinfo pstat readpassphrase \
+	inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp \
+	mmap ngetaddrinfo nsleep openpty ogetaddrinfo pstat readpassphrase \
 	realpath recvmsg rresvport_af sendmsg setdtablesize setegid \
 	setenv seteuid setgroups setlogin setproctitle setresgid setreuid \
 	setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \
Index: openbsd-compat/port-aix.h
==================================================================RCS file:
/usr/local/src/security/openssh/cvs/openssh_cvs/openbsd-compat/port-aix.h,v
retrieving revision 1.6
diff -u -r1.6 port-aix.h
--- openbsd-compat/port-aix.h	7 Jul 2002 02:17:36 -0000	1.6
+++ openbsd-compat/port-aix.h	1 Feb 2003 01:49:56 -0000
@@ -25,5 +25,16 @@
  */
 
 #ifdef _AIX
+
+/* AIX 4.2.x doesn't have nanosleep but does have nsleep which is
equivalent */
+#if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP)
+# define nanosleep nsleep
+#endif
+
+/* For struct timespec on AIX 4.2.x */
+#ifdef HAVE_SYS_TIMERS_H
+# include <sys/timers.h>
+#endif
+
 void aix_usrinfo(struct passwd *pw);
 #endif /* _AIX */

On Sat, 1 Feb 2003, Darren Tucker wrote:
> Hi All.
> 	There are still build errors for scp on AIX 4.2.1 due to lack of
> nanosleep (which you can see them live and in colour at [1]).  The
> attached patch fixes this by using the equivalent nsleep function on AIX
> if it exists and nanosleep doesn't.
>
[..]

diff -u -r1.6 port-aix.h
--- openbsd-compat/port-aix.h	7 Jul 2002 02:17:36 -0000	1.6
+++ openbsd-compat/port-aix.h	1 Feb 2003 01:49:56 -0000
@@ -25,5 +25,16 @@
  */

 #ifdef _AIX
+
+/* AIX 4.2.x doesn't have nanosleep but does have nsleep which is
equivalent */
+#if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP)
+# define nanosleep nsleep
+#endif
+
[..]

Ok if I change it to:

#define nanosleep(req, rem) nsleep(req, rem)


I like to see function renaming at a glance.  Plus it saves us from wierd
bugs down the road (not that I see 'nanosleep' ever being used as a
function call or structure =).

- Ben