frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'alanc/master'

This commit is contained in:
Keith Packard 2011-12-07 12:27:23 -08:00
parent 3824f558cc e89b0324da
commit 22a666f995
23 changed files with 141 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
configure.ac
View File

@ -25,7 +25,7 @@ dnl an unwitting cast of miscellaneous others
dnl dnl
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57) AC_PREREQ(2.60)
AC_INIT([xorg-server], 1.11.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_INIT([xorg-server], 1.11.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
RELEASE_DATE="2011-11-20" RELEASE_DATE="2011-11-20"
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
@ -76,7 +76,6 @@ AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AC_DISABLE_STATIC AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AC_PROG_LEX AC_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
@ -213,34 +212,14 @@ AC_CHECK_FUNC([dlopen], [],
AC_SUBST(DLOPEN_LIBS) AC_SUBST(DLOPEN_LIBS)
dnl Checks for library functions. dnl Checks for library functions.
AC_FUNC_VPRINTF AC_CHECK_FUNCS([backtrace ffs \
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \ getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
strtol getopt getopt_long vsnprintf walkcontext backtrace \ mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
getisax getzoneid shmctl64 strcasestr ffs vasprintf]) AC_REPLACE_FUNCS([strcasecmp strcasestr strlcat strlcpy strndup])
AC_FUNC_ALLOCA
AC_CHECK_FUNCS([strndup], [HAVE_STRNDUP=yes], [HAVE_STRNDUP=no])
AM_CONDITIONAL(NEED_STRNDUP, [test x$HAVE_STRNDUP = xno])
dnl Old HAS_* names used in os/*.c.
AC_CHECK_FUNC([getdtablesize],
AC_DEFINE(HAS_GETDTABLESIZE, 1, [Have the 'getdtablesize' function.]))
AC_CHECK_FUNC([getifaddrs],
AC_DEFINE(HAS_GETIFADDRS, 1, [Have the 'getifaddrs' function.]))
AC_CHECK_FUNC([getpeereid],
AC_DEFINE(HAS_GETPEEREID, 1, [Have the 'getpeereid' function.]))
AC_CHECK_FUNC([getpeerucred],
AC_DEFINE(HAS_GETPEERUCRED, 1, [Have the 'getpeerucred' function.]))
AC_CHECK_FUNC([strlcat], HAVE_STRLCAT=yes, HAVE_STRLCAT=no)
AM_CONDITIONAL(NEED_STRLCAT, [test x$HAVE_STRLCAT = xno])
AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_STRLCPY, 1, [Have the 'strlcpy' function]))
AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno]) dnl Find the math libary, then check for cbrt function in it.
dnl Check for mmap support for Xvfb
AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP, 1, [Have the 'mmap' function.]))
dnl Find the math libary
AC_CHECK_LIB(m, sqrt) AC_CHECK_LIB(m, sqrt)
AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function])) AC_CHECK_FUNCS([cbrt])
AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h]) AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
@ -1241,13 +1220,6 @@ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
[Do not have 'strcasecmp'.]))
AC_CHECK_FUNC(strncasecmp, [], AC_DEFINE([NEED_STRNCASECMP], 1,
[Do not have 'strncasecmp'.]))
AC_CHECK_FUNC(strcasestr, [], AC_DEFINE([NEED_STRCASESTR], 1,
[Do not have 'strcasestr'.]))
PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"]) PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
if test "x$have_libxdmcp" = xyes; then if test "x$have_libxdmcp" = xyes; then
AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS]) AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])

3
hw/dmx/config/Makefile.am
View File

@ -21,10 +21,7 @@ BUILT_SOURCES = parser.c parser.h scanner.c
MAINTAINERCLEANFILES = $(BUILT_SOURCES) MAINTAINERCLEANFILES = $(BUILT_SOURCES)
libdmxconfig_a_SOURCES = $(LIBSRCS) libdmxconfig_a_SOURCES = $(LIBSRCS)
if NEED_STRLCAT
libdmxconfig_a_SOURCES += $(top_srcdir)/os/strlcpy.c libdmxconfig_a_SOURCES += $(top_srcdir)/os/strlcpy.c
endif
if GLX if GLX
GLX_DEFS = @GL_CFLAGS@ GLX_DEFS = @GL_CFLAGS@

5
hw/kdrive/ephyr/hostx.c
View File

@ -332,6 +332,11 @@ hostx_set_title (char *title)
ephyrTitle = title; ephyrTitle = title;
} }
#ifdef __SUNPRO_C
/* prevent "Function has no return statement" error for x_io_error_handler */
#pragma does_not_return(exit)
#endif
static int _X_NORETURN static int _X_NORETURN
x_io_error_handler (Display *dpy) { x_io_error_handler (Display *dpy) {
ErrorF("Lost connection to X server: %s\n", strerror(errno)); ErrorF("Lost connection to X server: %s\n", strerror(errno));

30
hw/vfb/InitOutput.c
View File

@ -48,12 +48,12 @@ from The Open Group.
#include "mipointer.h" #include "mipointer.h"
#include "micmap.h" #include "micmap.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef HAS_MMAP #ifdef HAVE_MMAP
#include <sys/mman.h> #include <sys/mman.h>
#ifndef MAP_FILE #ifndef MAP_FILE
#define MAP_FILE 0 #define MAP_FILE 0
#endif #endif
#endif /* HAS_MMAP */ #endif /* HAVE_MMAP */
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#ifndef WIN32 #ifndef WIN32
@ -93,7 +93,7 @@ typedef struct
unsigned int lineBias; unsigned int lineBias;
CloseScreenProcPtr closeScreen; CloseScreenProcPtr closeScreen;
#ifdef HAS_MMAP #ifdef HAVE_MMAP
int mmap_fd; int mmap_fd;
char mmap_file[MAXPATHLEN]; char mmap_file[MAXPATHLEN];
#endif #endif
@ -114,7 +114,7 @@ static vfbScreenInfo defaultScreenInfo = {
.lineBias = VFB_DEFAULT_LINEBIAS, .lineBias = VFB_DEFAULT_LINEBIAS,
}; };
static Bool vfbPixmapDepths[33]; static Bool vfbPixmapDepths[33];
#ifdef HAS_MMAP #ifdef HAVE_MMAP
static char *pfbdir = NULL; static char *pfbdir = NULL;
#endif #endif
typedef enum { NORMAL_MEMORY_FB, SHARED_MEMORY_FB, MMAPPED_FILE_FB } fbMemType; typedef enum { NORMAL_MEMORY_FB, SHARED_MEMORY_FB, MMAPPED_FILE_FB } fbMemType;
@ -158,7 +158,7 @@ ddxGiveUp(enum ExitCode error)
switch (fbmemtype) switch (fbmemtype)
{ {
#ifdef HAS_MMAP #ifdef HAVE_MMAP
case MMAPPED_FILE_FB: case MMAPPED_FILE_FB:
for (i = 0; i < vfbNumScreens; i++) for (i = 0; i < vfbNumScreens; i++)
{ {
@ -170,10 +170,10 @@ ddxGiveUp(enum ExitCode error)
} }
} }
break; break;
#else /* HAS_MMAP */ #else /* HAVE_MMAP */
case MMAPPED_FILE_FB: case MMAPPED_FILE_FB:
break; break;
#endif /* HAS_MMAP */ #endif /* HAVE_MMAP */
#ifdef HAS_SHM #ifdef HAS_SHM
case SHARED_MEMORY_FB: case SHARED_MEMORY_FB:
@ -241,7 +241,7 @@ ddxUseMsg(void)
ErrorF("-blackpixel n pixel value for black\n"); ErrorF("-blackpixel n pixel value for black\n");
ErrorF("-whitepixel n pixel value for white\n"); ErrorF("-whitepixel n pixel value for white\n");
#ifdef HAS_MMAP #ifdef HAVE_MMAP
ErrorF("-fbdir directory put framebuffers in mmap'ed files in directory\n"); ErrorF("-fbdir directory put framebuffers in mmap'ed files in directory\n");
#endif #endif
@ -280,7 +280,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
int screenNum; int screenNum;
CHECK_FOR_REQUIRED_ARGUMENTS(2); CHECK_FOR_REQUIRED_ARGUMENTS(2);
screenNum = atoi(argv[i+1]); screenNum = atoi(argv[i+1]);
if (screenNum < 0) /* The protocol only has a CARD8 for number of screens in the
connection setup block, so don't allow more than that. */
if ((screenNum < 0) || (screenNum >= 255))
{ {
ErrorF("Invalid screen number %d\n", screenNum); ErrorF("Invalid screen number %d\n", screenNum);
UseMsg(); UseMsg();
@ -368,7 +370,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
return 2; return 2;
} }
#ifdef HAS_MMAP #ifdef HAVE_MMAP
if (strcmp (argv[i], "-fbdir") == 0) /* -fbdir directory */ if (strcmp (argv[i], "-fbdir") == 0) /* -fbdir directory */
{ {
CHECK_FOR_REQUIRED_ARGUMENTS(1); CHECK_FOR_REQUIRED_ARGUMENTS(1);
@ -376,7 +378,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
fbmemtype = MMAPPED_FILE_FB; fbmemtype = MMAPPED_FILE_FB;
return 2; return 2;
} }
#endif /* HAS_MMAP */ #endif /* HAVE_MMAP */
#ifdef HAS_SHM #ifdef HAS_SHM
if (strcmp (argv[i], "-shmem") == 0) /* -shmem */ if (strcmp (argv[i], "-shmem") == 0) /* -shmem */
@ -521,7 +523,7 @@ vfbSaveScreen(ScreenPtr pScreen, int on)
return TRUE; return TRUE;
} }
#ifdef HAS_MMAP #ifdef HAVE_MMAP
/* this flushes any changes to the screens out to the mmapped file */ /* this flushes any changes to the screens out to the mmapped file */
static void static void
@ -606,7 +608,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
pvfb->pXWDHeader = NULL; pvfb->pXWDHeader = NULL;
} }
} }
#endif /* HAS_MMAP */ #endif /* HAVE_MMAP */
#ifdef HAS_SHM #ifdef HAS_SHM
@ -670,7 +672,7 @@ vfbAllocateFramebufferMemory(vfbScreenInfoPtr pvfb)
pvfb->pXWDHeader = NULL; pvfb->pXWDHeader = NULL;
switch (fbmemtype) switch (fbmemtype)
{ {
#ifdef HAS_MMAP #ifdef HAVE_MMAP
case MMAPPED_FILE_FB: vfbAllocateMmappedFramebuffer(pvfb); break; case MMAPPED_FILE_FB: vfbAllocateMmappedFramebuffer(pvfb); break;
#else #else
case MMAPPED_FILE_FB: break; case MMAPPED_FILE_FB: break;

2
hw/xfree86/loader/loadmod.c
View File

@ -911,7 +911,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
goto LoadModule_fail; goto LoadModule_fail;
} }
ret->handle = LoaderOpen(found, errmaj, errmin); ret->handle = LoaderOpen(found, errmaj, errmin);
if (ret->handle < 0) if (ret->handle == NULL)
goto LoadModule_fail; goto LoadModule_fail;
ret->path = strdup(found); ret->path = strdup(found);

3
hw/xfree86/xaa/xaaTables.c
View File

@ -1,3 +1,6 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "xaalocal.h" #include "xaalocal.h"
/* /*
* This is a table of 24-bit values, indexed with an 8-bit byte value, then * This is a table of 24-bit values, indexed with an 8-bit byte value, then

5
hw/xnest/Display.c
View File

@ -55,6 +55,11 @@ Pixmap xnestScreenSaverPixmap;
XlibGC xnestBitmapGC; XlibGC xnestBitmapGC;
unsigned long xnestEventMask; unsigned long xnestEventMask;
#ifdef __SUNPRO_C
/* prevent "Function has no return statement" error for x_io_error_handler */
#pragma does_not_return(exit)
#endif
static int _X_NORETURN static int _X_NORETURN
x_io_error_handler (Display *dpy) { x_io_error_handler (Display *dpy) {
ErrorF("Lost connection to X server: %s\n", strerror(errno)); ErrorF("Lost connection to X server: %s\n", strerror(errno));

4
hw/xwin/win.h
View File

@ -143,12 +143,12 @@
#undef HANDLE #undef HANDLE
#endif #endif
#ifdef HAS_MMAP #ifdef HAVE_MMAP
#include <sys/mman.h> #include <sys/mman.h>
#ifndef MAP_FILE #ifndef MAP_FILE
#define MAP_FILE 0 #define MAP_FILE 0
#endif /* MAP_FILE */ #endif /* MAP_FILE */
#endif /* HAS_MMAP */ #endif /* HAVE_MMAP */
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>

85
include/dix-config.h.in
View File

@ -51,27 +51,9 @@
/* Support XDM-AUTH*-1 */ /* Support XDM-AUTH*-1 */
#undef HASXDMAUTH #undef HASXDMAUTH
/* Define to 1 if you have the `getdtablesize' function. */
#undef HAS_GETDTABLESIZE
/* Define to 1 if you have the `getifaddrs' function. */
#undef HAS_GETIFADDRS
/* Define to 1 if you have the `getpeereid' function. */
#undef HAS_GETPEEREID
/* Define to 1 if you have the `getpeerucred' function. */
#undef HAS_GETPEERUCRED
/* Define to 1 if you have the `mmap' function. */
#undef HAS_MMAP
/* Support SHM */ /* Support SHM */
#undef HAS_SHM #undef HAS_SHM
/* Have the 'strlcpy' function */
#undef HAS_STRLCPY
/* Define to 1 if you have the <asm/mtrr.h> header file. */ /* Define to 1 if you have the <asm/mtrr.h> header file. */
#undef HAVE_ASM_MTRR_H #undef HAVE_ASM_MTRR_H
@ -81,7 +63,7 @@
/* Define to 1 if you have the <byteswap.h> header file. */ /* Define to 1 if you have the <byteswap.h> header file. */
#undef HAVE_BYTESWAP_H #undef HAVE_BYTESWAP_H
/* Define to 1 if you have cbrt */ /* Define to 1 if you have the `cbrt' function. */
#undef HAVE_CBRT #undef HAVE_CBRT
/* Define to 1 if you have the <dbm.h> header file. */ /* Define to 1 if you have the <dbm.h> header file. */
@ -94,23 +76,26 @@
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
/* Have execinfo.h */ /* Have execinfo.h */
#undef HAVE_EXECINFO_H #undef HAVE_EXECINFO_H
/* Define to 1 if you have the <fcntl.h> header file. */ /* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define to 1 if you have the `geteuid' function. */ /* Define to 1 if you have the `ffs' function. */
#undef HAVE_GETEUID #undef HAVE_FFS
/* Define to 1 if you have the `getisax' function. */ /* Define to 1 if you have the `getdtablesize' function. */
#undef HAVE_GETISAX #undef HAVE_GETDTABLESIZE
/* Define to 1 if you have the `getuid' function. */ /* Define to 1 if you have the `getifaddrs' function. */
#undef HAVE_GETUID #undef HAVE_GETIFADDRS
/* Define to 1 if you have the `getpeereid' function. */
#undef HAVE_GETPEEREID
/* Define to 1 if you have the `getpeerucred' function. */
#undef HAVE_GETPEERUCRED
/* Define to 1 if you have the `getzoneid' function. */ /* Define to 1 if you have the `getzoneid' function. */
#undef HAVE_GETZONEID #undef HAVE_GETZONEID
@ -136,9 +121,6 @@
/* Define to 1 if you have the libdispatch (GCD) available */ /* Define to 1 if you have the libdispatch (GCD) available */
#undef HAVE_LIBDISPATCH #undef HAVE_LIBDISPATCH
/* Define to 1 if you have the `link' function. */
#undef HAVE_LINK
/* Define to 1 if you have the <linux/agpgart.h> header file. */ /* Define to 1 if you have the <linux/agpgart.h> header file. */
#undef HAVE_LINUX_AGPGART_H #undef HAVE_LINUX_AGPGART_H
@ -148,8 +130,8 @@
/* Define to 1 if you have the <linux/fb.h> header file. */ /* Define to 1 if you have the <linux/fb.h> header file. */
#undef HAVE_LINUX_FB_H #undef HAVE_LINUX_FB_H
/* Define to 1 if you have the `mkstemp' function. */ /* Define to 1 if you have the `mmap' function. */
#undef HAVE_MKSTEMP #undef HAVE_MMAP
/* Define to 1 if you have the <ndbm.h> header file. */ /* Define to 1 if you have the <ndbm.h> header file. */
#undef HAVE_NDBM_H #undef HAVE_NDBM_H
@ -181,8 +163,20 @@
/* Define to 1 if you have the <stdlib.h> header file. */ /* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* Define to 1 if you have the `strchr' function. */ /* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCHR #undef HAVE_STRCASECMP
/* Define to 1 if you have the `strcasestr' function. */
#undef HAVE_STRCASESTR
/* Define to 1 if you have the `strncasecmp' function. */
#undef HAVE_STRNCASECMP
/* Define to 1 if you have the `strlcat' function. */
#undef HAVE_STRLCAT
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
/* Define to 1 if you have the <strings.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
@ -193,12 +187,6 @@
/* Define to 1 if you have the `strndup' function. */ /* Define to 1 if you have the `strndup' function. */
#undef HAVE_STRNDUP #undef HAVE_STRNDUP
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
/* Define to 1 if SYSV IPC is available */ /* Define to 1 if SYSV IPC is available */
#undef HAVE_SYSV_IPC #undef HAVE_SYSV_IPC
@ -234,9 +222,6 @@
/* Have /dev/urandom */ /* Have /dev/urandom */
#undef HAVE_URANDOM #undef HAVE_URANDOM
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
/* Define to 1 if you have the `vasprintf' function. */ /* Define to 1 if you have the `vasprintf' function. */
#undef HAVE_VASPRINTF #undef HAVE_VASPRINTF
@ -432,18 +417,6 @@
/* Define to 64-bit byteswap macro */ /* Define to 64-bit byteswap macro */
#undef bswap_64 #undef bswap_64
/* Need the strcasecmp function. */
#undef NEED_STRCASECMP
/* Need the strncasecmp function. */
#undef NEED_STRNCASECMP
/* Need the strcasestr function. */
#undef NEED_STRCASESTR
/* Define to 1 if you have the `ffs' function. */
#undef HAVE_FFS
/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */ /* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
#undef TLS #undef TLS

2
include/dix.h
View File

@ -529,7 +529,9 @@ extern _X_EXPORT void
ScreenRestructured (ScreenPtr pScreen); ScreenRestructured (ScreenPtr pScreen);
#endif #endif
#ifndef HAVE_FFS
extern _X_EXPORT int ffs(int i); extern _X_EXPORT int ffs(int i);
#endif
/* /*

8
include/os.h
View File

@ -472,22 +472,22 @@ extern _X_EXPORT void ddxGiveUp(enum ExitCode error);
extern _X_EXPORT int TimeSinceLastInputEvent(void); extern _X_EXPORT int TimeSinceLastInputEvent(void);
/* strcasecmp.c */ /* strcasecmp.c */
#if NEED_STRCASECMP #ifndef HAVE_STRCASECMP
#define strcasecmp xstrcasecmp #define strcasecmp xstrcasecmp
extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2); extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2);
#endif #endif
#if NEED_STRNCASECMP #ifndef HAVE_STRNCASECMP
#define strncasecmp xstrncasecmp #define strncasecmp xstrncasecmp
extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n); extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n);
#endif #endif
#if NEED_STRCASESTR #ifndef HAVE_STRCASESTR
#define strcasestr xstrcasestr #define strcasestr xstrcasestr
extern _X_EXPORT char *xstrcasestr(const char *s, const char *find); extern _X_EXPORT char *xstrcasestr(const char *s, const char *find);
#endif #endif
#ifndef HAS_STRLCPY #ifndef HAVE_STRLCPY
extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz); extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz);
extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz); extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz);
#endif #endif

3
include/xkb-config.h.in
View File

@ -29,7 +29,4 @@
/* XKB output dir for compiled keymaps. */ /* XKB output dir for compiled keymaps. */
#undef XKM_OUTPUT_DIR #undef XKM_OUTPUT_DIR
/* Do not have `strcasecmp'. */
#undef NEED_STRCASECMP
#endif /* _XKB_CONFIG_H_ */ #endif /* _XKB_CONFIG_H_ */

21
include/xorg-server.h.in
View File

@ -37,6 +37,27 @@
/* Support SHM */ /* Support SHM */
#undef HAS_SHM #undef HAS_SHM
/* Define to 1 if you have the `ffs' function. */
#undef HAVE_FFS
/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
/* Define to 1 if you have the `strcasestr' function. */
#undef HAVE_STRCASESTR
/* Define to 1 if you have the `strlcat' function. */
#undef HAVE_STRLCAT
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
/* Define to 1 if you have the `strncasecmp' function. */
#undef HAVE_STRNCASECMP
/* Define to 1 if you have the `strndup' function. */
#undef HAVE_STRNDUP
/* Support IPv6 for TCP connections */ /* Support IPv6 for TCP connections */
#undef IPv6 #undef IPv6

3
include/xwin-config.h.in
View File

@ -20,9 +20,6 @@
/* Define to 1 if unsigned long is 64 bits. */ /* Define to 1 if unsigned long is 64 bits. */
#undef _XSERVER64 #undef _XSERVER64
/* Do we require our own snprintf? */
#undef NEED_SNPRINTF
/* Short vendor name */ /* Short vendor name */
#undef XVENDORNAMESHORT #undef XVENDORNAMESHORT

2
mi/mibitblt.c
View File

@ -63,7 +63,7 @@ SOFTWARE.
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include "servermd.h" #include "servermd.h"
#ifndef HAS_FFS #ifndef HAVE_FFS
extern int ffs(int); extern int ffs(int);
#endif #endif

16
os/Makefile.am
View File

@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS)
SECURERPC_SRCS = rpcauth.c SECURERPC_SRCS = rpcauth.c
XDMCP_SRCS = xdmcp.c XDMCP_SRCS = xdmcp.c
STRLCAT_SRCS = strlcat.c strlcpy.c
XORG_SRCS = log.c XORG_SRCS = log.c
libos_la_SOURCES = \ libos_la_SOURCES = \
@ -20,14 +19,12 @@ libos_la_SOURCES = \
osdep.h \ osdep.h \
osinit.c \ osinit.c \
utils.c \ utils.c \
strcasecmp.c \
strcasestr.c \
xdmauth.c \ xdmauth.c \
xsha1.c \ xsha1.c \
xstrans.c \ xstrans.c \
xprintf.c \ xprintf.c \
$(XORG_SRCS) $(XORG_SRCS)
libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) $(LTLIBOBJS)
if SECURE_RPC if SECURE_RPC
libos_la_SOURCES += $(SECURERPC_SRCS) libos_la_SOURCES += $(SECURERPC_SRCS)
@ -37,16 +34,7 @@ if XDMCP
libos_la_SOURCES += $(XDMCP_SRCS) libos_la_SOURCES += $(XDMCP_SRCS)
endif endif
if NEED_STRLCAT EXTRA_DIST = $(SECURERPC_SRCS) $(XDMCP_SRCS)
libos_la_SOURCES += $(STRLCAT_SRCS)
endif
if NEED_STRNDUP
libos_la_SOURCES += $(STRNDUP_SRCS)
endif
EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
$(XDMCP_SRCS) $(STRLCAT_SRCS)
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libos & libdix # Generate dtrace object code for probes in libos & libdix

28
os/access.c
View File

@ -106,7 +106,7 @@ SOFTWARE.
#include <netinet/in.h> #include <netinet/in.h>
#endif /* TCPCONN || STREAMSCONN */ #endif /* TCPCONN || STREAMSCONN */
#ifdef HAS_GETPEERUCRED #ifdef HAVE_GETPEERUCRED
# include <ucred.h> # include <ucred.h>
# ifdef sun # ifdef sun
# include <zone.h> # include <zone.h>
@ -146,7 +146,7 @@ SOFTWARE.
#endif #endif
#endif #endif
#ifdef HAS_GETIFADDRS #ifdef HAVE_GETIFADDRS
#include <ifaddrs.h> #include <ifaddrs.h>
#endif #endif
@ -495,7 +495,7 @@ in6_fillscopeid(struct sockaddr_in6 *sin6)
void void
DefineSelf (int fd) DefineSelf (int fd)
{ {
#ifndef HAS_GETIFADDRS #ifndef HAVE_GETIFADDRS
char *cp, *cplim; char *cp, *cplim;
# ifdef USE_SIOCGLIFCONF # ifdef USE_SIOCGLIFCONF
struct sockaddr_storage buf[16]; struct sockaddr_storage buf[16];
@ -510,7 +510,7 @@ DefineSelf (int fd)
register struct ifreq *ifr; register struct ifreq *ifr;
# endif # endif
void * bufptr = buf; void * bufptr = buf;
#else /* HAS_GETIFADDRS */ #else /* HAVE_GETIFADDRS */
struct ifaddrs * ifap, *ifr; struct ifaddrs * ifap, *ifr;
#endif #endif
int len; int len;
@ -518,7 +518,7 @@ DefineSelf (int fd)
int family; int family;
register HOST *host; register HOST *host;
#ifndef HAS_GETIFADDRS #ifndef HAVE_GETIFADDRS
len = sizeof(buf); len = sizeof(buf);
@ -689,7 +689,7 @@ DefineSelf (int fd)
} }
if (bufptr != buf) if (bufptr != buf)
free(bufptr); free(bufptr);
#else /* HAS_GETIFADDRS */ #else /* HAVE_GETIFADDRS */
if (getifaddrs(&ifap) < 0) { if (getifaddrs(&ifap) < 0) {
ErrorF("Warning: getifaddrs returns %s\n", strerror(errno)); ErrorF("Warning: getifaddrs returns %s\n", strerror(errno));
return; return;
@ -777,7 +777,7 @@ DefineSelf (int fd)
} /* for */ } /* for */
freeifaddrs(ifap); freeifaddrs(ifap);
#endif /* HAS_GETIFADDRS */ #endif /* HAVE_GETIFADDRS */
/* /*
* add something of FamilyLocalHost * add something of FamilyLocalHost
@ -798,7 +798,7 @@ DefineSelf (int fd)
} }
} }
} }
#endif /* hpux && !HAS_IFREQ */ #endif /* hpux && !HAVE_IFREQ */
#ifdef XDMCP #ifdef XDMCP
void void
@ -1091,14 +1091,14 @@ LocalClientCred(ClientPtr client, int *pUid, int *pGid)
int int
GetLocalClientCreds(ClientPtr client, LocalClientCredRec **lccp) GetLocalClientCreds(ClientPtr client, LocalClientCredRec **lccp)
{ {
#if defined(HAS_GETPEEREID) || defined(HAS_GETPEERUCRED) || defined(SO_PEERCRED) #if defined(HAVE_GETPEEREID) || defined(HAVE_GETPEERUCRED) || defined(SO_PEERCRED)
int fd; int fd;
XtransConnInfo ci; XtransConnInfo ci;
LocalClientCredRec *lcc; LocalClientCredRec *lcc;
#ifdef HAS_GETPEEREID #ifdef HAVE_GETPEEREID
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
#elif defined(HAS_GETPEERUCRED) #elif defined(HAVE_GETPEERUCRED)
ucred_t *peercred = NULL; ucred_t *peercred = NULL;
const gid_t *gids; const gid_t *gids;
#elif defined(SO_PEERCRED) #elif defined(SO_PEERCRED)
@ -1109,7 +1109,7 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec **lccp)
if (client == NULL) if (client == NULL)
return -1; return -1;
ci = ((OsCommPtr)client->osPrivate)->trans_conn; ci = ((OsCommPtr)client->osPrivate)->trans_conn;
#if !(defined(sun) && defined(HAS_GETPEERUCRED)) #if !(defined(sun) && defined(HAVE_GETPEERUCRED))
/* Most implementations can only determine peer credentials for Unix /* Most implementations can only determine peer credentials for Unix
* domain sockets - Solaris getpeerucred can work with a bit more, so * domain sockets - Solaris getpeerucred can work with a bit more, so
* we just let it tell us if the connection type is supported or not * we just let it tell us if the connection type is supported or not
@ -1125,7 +1125,7 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec **lccp)
lcc = *lccp; lcc = *lccp;
fd = _XSERVTransGetConnectionNumber(ci); fd = _XSERVTransGetConnectionNumber(ci);
#ifdef HAS_GETPEEREID #ifdef HAVE_GETPEEREID
if (getpeereid(fd, &uid, &gid) == -1) { if (getpeereid(fd, &uid, &gid) == -1) {
FreeLocalClientCreds(lcc); FreeLocalClientCreds(lcc);
return -1; return -1;
@ -1134,7 +1134,7 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec **lccp)
lcc->egid = gid; lcc->egid = gid;
lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET; lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET;
return 0; return 0;
#elif defined(HAS_GETPEERUCRED) #elif defined(HAVE_GETPEERUCRED)
if (getpeerucred(fd, &peercred) < 0) { if (getpeerucred(fd, &peercred) < 0) {
FreeLocalClientCreds(lcc); FreeLocalClientCreds(lcc);
return -1; return -1;

6
os/connection.c
View File

@ -114,7 +114,7 @@ SOFTWARE.
#define Pid_t pid_t #define Pid_t pid_t
#ifdef HAS_GETPEERUCRED #ifdef HAVE_GETPEERUCRED
# include <ucred.h> # include <ucred.h>
# include <zone.h> # include <zone.h>
#endif #endif
@ -122,7 +122,7 @@ SOFTWARE.
#ifdef XSERVER_DTRACE #ifdef XSERVER_DTRACE
# include <sys/types.h> # include <sys/types.h>
typedef const char *string; typedef const char *string;
# ifndef HAS_GETPEERUCRED # ifndef HAVE_GETPEERUCRED
# define zoneid_t int # define zoneid_t int
# endif # endif
# include "../dix/Xserver-dtrace.h" # include "../dix/Xserver-dtrace.h"
@ -282,7 +282,7 @@ InitConnectionLimits(void)
lastfdesc = sysconf(_SC_OPEN_MAX) - 1; lastfdesc = sysconf(_SC_OPEN_MAX) - 1;
#endif #endif
#ifdef HAS_GETDTABLESIZE #ifdef HAVE_GETDTABLESIZE
if (lastfdesc < 0) if (lastfdesc < 0)
lastfdesc = getdtablesize() - 1; lastfdesc = getdtablesize() - 1;
#endif #endif

6
os/osdep.h
View File

@ -103,12 +103,6 @@ SOFTWARE.
/* MAXSELECT is the number of fds that select() can handle */ /* MAXSELECT is the number of fds that select() can handle */
#define MAXSELECT (sizeof(fd_set) * NBBY) #define MAXSELECT (sizeof(fd_set) * NBBY)
#ifndef HAS_GETDTABLESIZE
#if !defined(SVR4) && !defined(SYSV)
#define HAS_GETDTABLESIZE
#endif
#endif
#include <stddef.h> #include <stddef.h>
#if defined(XDMCP) || defined(HASXDMAUTH) #if defined(XDMCP) || defined(HASXDMAUTH)

4
os/strcasecmp.c
View File

@ -34,7 +34,7 @@
#include <ctype.h> #include <ctype.h>
#include "dix.h" #include "dix.h"
#ifdef NEED_STRCASECMP #ifndef HAVE_STRCASECMP
int int
xstrcasecmp(const char *str1, const char *str2) xstrcasecmp(const char *str1, const char *str2)
{ {
@ -50,7 +50,7 @@ xstrcasecmp(const char *str1, const char *str2)
} }
#endif #endif
#ifdef NEED_STRNCASECMP #ifndef HAVE_STRNCASECMP
int int
xstrncasecmp(const char *s1, const char *s2, size_t n) xstrncasecmp(const char *s1, const char *s2, size_t n)
{ {

2
os/strcasestr.c
View File

@ -41,7 +41,7 @@
/* /*
* Find the first occurrence of find in s, ignore case. * Find the first occurrence of find in s, ignore case.
*/ */
#ifdef NEED_STRCASESTR #ifndef HAVE_STRCASESTR
char * char *
xstrcasestr(const char *s, const char *find) xstrcasestr(const char *s, const char *find)
{ {

2
os/strlcpy.c
View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include "os.h" #include "os.h"
#ifndef HAVE_STRLCPY
/* /*
* Copy src to string dst of size siz. At most siz-1 characters * Copy src to string dst of size siz. At most siz-1 characters
* will be copied. Always NUL terminates (unless siz == 0). * will be copied. Always NUL terminates (unless siz == 0).
@ -52,3 +53,4 @@ strlcpy(char *dst, const char *src, size_t siz)
return s - src - 1; /* count does not include NUL */ return s - src - 1; /* count does not include NUL */
} }
#endif

28
test/Makefile.am
View File

@ -1,21 +1,32 @@
if ENABLE_UNIT_TESTS if ENABLE_UNIT_TESTS
SUBDIRS= . xi2 SUBDIRS= .
noinst_PROGRAMS = xkb input xtest list misc fixes xfree86 string noinst_PROGRAMS = list string
if XORG
# Tests that require at least some DDX functions in order to fully link
# For now, requires xf86 ddx, could be adjusted to use another
SUBDIRS += xi2
noinst_PROGRAMS += xkb input xtest misc fixes xfree86
endif
check_LTLIBRARIES = libxservertest.la check_LTLIBRARIES = libxservertest.la
TESTS=$(noinst_PROGRAMS) TESTS=$(noinst_PROGRAMS)
TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \ if XORG
INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
-I$(top_srcdir)/hw/xfree86/ddc \
-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \ -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
-I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/ramdac
endif
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
if XORG
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS
TEST_LDADD += $(OS_LIB) $(DIX_LIB) TEST_LDADD += $(OS_LIB) $(DIX_LIB)
endif endif
endif
xkb_LDADD=$(TEST_LDADD) xkb_LDADD=$(TEST_LDADD)
input_LDADD=$(TEST_LDADD) input_LDADD=$(TEST_LDADD)
@ -25,9 +36,10 @@ misc_LDADD=$(TEST_LDADD)
fixes_LDADD=$(TEST_LDADD) fixes_LDADD=$(TEST_LDADD)
xfree86_LDADD=$(TEST_LDADD) xfree86_LDADD=$(TEST_LDADD)
libxservertest_la_LIBADD = $(XSERVER_LIBS)
if XORG
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
libxservertest_la_LIBADD = \ libxservertest_la_LIBADD += \
$(XSERVER_LIBS) \
$(top_builddir)/hw/xfree86/loader/libloader.la \ $(top_builddir)/hw/xfree86/loader/libloader.la \
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \ $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
$(top_builddir)/hw/xfree86/common/libcommon.la \ $(top_builddir)/hw/xfree86/common/libcommon.la \
@ -37,7 +49,9 @@ libxservertest_la_LIBADD = \
$(top_builddir)/hw/xfree86/ramdac/libramdac.la \ $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
$(top_builddir)/hw/xfree86/ddc/libddc.la \ $(top_builddir)/hw/xfree86/ddc/libddc.la \
$(top_builddir)/hw/xfree86/i2c/libi2c.la \ $(top_builddir)/hw/xfree86/i2c/libi2c.la \
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
endif
libxservertest_la_LIBADD += \
$(top_builddir)/mi/libmi.la \ $(top_builddir)/mi/libmi.la \
$(top_builddir)/os/libos.la \ $(top_builddir)/os/libos.la \
@XORG_LIBS@ @XORG_LIBS@