Attachment 2276 Details for Bug 2085 – add real configure tests for NFDBITS, howmany and fd_mask

[patch] add real configure tests for NFDBITS, howmany and fd_mask

openssh-select-bits.patch (text/plain), 2.86 KB, created by Darren Tucker on 2013-05-30 09:34:03 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2013-05-30 09:34:03 AEST

Size: 2.86 KB

patch

obsolete

>? build
>Index: configure.ac
>===================================================================
>RCS file: /cvs/openssh/configure.ac,v
>retrieving revision 1.525
>diff -u -p -r1.525 configure.ac
>--- configure.ac	29 May 2013 22:29:09 -0000	1.525
>+++ configure.ac	29 May 2013 23:33:14 -0000
>@@ -979,9 +979,6 @@ mips-sony-bsd|mips-sony-newsos4)
> *-*-nto-qnx*)
> 	AC_DEFINE([USE_PIPES])
> 	AC_DEFINE([NO_X11_UNIX_SOCKETS])
>-	AC_DEFINE([MISSING_NFDBITS], [1], [Define on *nto-qnx systems])
>-	AC_DEFINE([MISSING_HOWMANY], [1], [Define on *nto-qnx systems])
>-	AC_DEFINE([MISSING_FD_MASK], [1], [Define on *nto-qnx systems])
> 	AC_DEFINE([DISABLE_LASTLOG])
> 	AC_DEFINE([SSHD_ACQUIRES_CTTY])
> 	AC_DEFINE([BROKEN_SHADOW_EXPIRE], [1], [QNX shadow support is broken])
>@@ -1002,7 +999,6 @@ mips-sony-bsd|mips-sony-newsos4)
> 
> *-*-lynxos)
>         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
>-	AC_DEFINE([MISSING_HOWMANY])
>         AC_DEFINE([BROKEN_SETVBUF], [1], [LynxOS has broken setvbuf() implementation])
>         ;;
> esac
>@@ -1701,6 +1697,21 @@ AC_CHECK_DECLS([MAXSYMLINKS], , , [
> 
> AC_CHECK_DECLS([offsetof], , , [
> #include <stddef.h>
>+	])
>+
>+# extra bits for select(2)
>+AC_CHECK_DECLS([howmany, fd_mask, NFDBITS], , , [
>+#include <sys/param.h>
>+#include <sys/types.h>
>+#ifdef HAVE_SYS_SELECT_H
>+#include <sys/select.h>
>+#endif
>+#ifdef HAVE_SYS_TIME_H
>+#include <sys/time.h>
>+#endif
>+#ifdef HAVE_UNISTD_H
>+#include <unistd.h>
>+#endif
> 	])
> 
> AC_CHECK_FUNCS([setresuid], [
>Index: defines.h
>===================================================================
>RCS file: /cvs/openssh/defines.h,v
>retrieving revision 1.171
>diff -u -p -r1.171 defines.h
>--- defines.h	7 Mar 2013 09:06:13 -0000	1.171
>+++ defines.h	29 May 2013 23:33:14 -0000
>@@ -171,11 +171,6 @@ enum
> # define MAP_FAILED ((void *)-1)
> #endif
> 
>-/* *-*-nto-qnx doesn't define this constant in the system headers */
>-#ifdef MISSING_NFDBITS
>-# define	NFDBITS (8 * sizeof(unsigned long))
>-#endif
>-
> /*
> SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but
> including rpc/rpc.h breaks Solaris 6
>@@ -355,11 +350,19 @@ struct winsize {
> };
> #endif
> 
>-/* *-*-nto-qnx does not define this type in the system headers */
>-#ifdef MISSING_FD_MASK
>+/* bits needed for select that may not be in the system headers */
>+#if defined(HAVE_FD_MASK) && HAVE_FD_MASK == 0
>  typedef unsigned long int	fd_mask;
> #endif
> 
>+#if defined(HAVE_DECL_NFDBITS) && HAVE_DECL_NFDBITS == 0
>+# define	NFDBITS (8 * sizeof(unsigned long))
>+#endif
>+
>+#if defined(HAVE_DECL_HOWMANY) && HAVE_DECL_HOWMANY == 0
>+# define howmany(x,y)	(((x)+((y)-1))/(y))
>+#endif
>+
> /* Paths */
> 
> #ifndef _PATH_BSHELL
>@@ -482,11 +485,6 @@ struct winsize {
> 
> #if !defined(HAVE_ATTRIBUTE__NONNULL__) && !defined(__nonnull__)
> # define __nonnull__(x)
>-#endif
>-
>-/* *-*-nto-qnx doesn't define this macro in the system headers */
>-#ifdef MISSING_HOWMANY
>-# define howmany(x,y)	(((x)+((y)-1))/(y))
> #endif
> 
> #ifndef OSSH_ALIGNBYTES

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 2085: 2230 | 2231 | 2235 | 2236 | 2276 | 2278 | 2279 | 2282