From b808b3ba8bb93f16004c206841c97bc824f7fb62 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 24 Jan 2012 09:11:11 +0100 Subject: xauth now compiles --- apps/common/inet.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ apps/common/makefile | 3 ++ apps/xauth/config.h | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ apps/xauth/makefile | 34 +++++++++++++++++++ apps/xhost/inet.c | 88 ------------------------------------------------ apps/xhost/makefile | 3 +- 6 files changed, 221 insertions(+), 89 deletions(-) create mode 100644 apps/common/inet.c create mode 100644 apps/common/makefile create mode 100644 apps/xauth/config.h create mode 100644 apps/xauth/makefile delete mode 100644 apps/xhost/inet.c (limited to 'apps') diff --git a/apps/common/inet.c b/apps/common/inet.c new file mode 100644 index 000000000..e6c0a1554 --- /dev/null +++ b/apps/common/inet.c @@ -0,0 +1,88 @@ +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + +#ifdef WIN32 +#include +#endif + +#include +#include + +#if NTDDI_VERSION < NTDDI_VISTA +const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) +{ + if (af == AF_INET) + { + struct sockaddr_in in; + memset(&in, 0, sizeof(in)); + in.sin_family = AF_INET; + memcpy(&in.sin_addr, src, sizeof(struct in_addr)); + if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST) != 0) + { + errno = WSAGetLastError(); + return NULL; + } + else return dst; + } + else if (af == AF_INET6) + { + struct sockaddr_in6 in; + memset(&in, 0, sizeof(in)); + in.sin6_family = AF_INET6; + memcpy(&in.sin6_addr, src, sizeof(struct in_addr6)); + if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST) != 0) + { + errno = WSAGetLastError(); + return NULL; + } + else return dst; + } + errno = WSAEAFNOSUPPORT; + return NULL; +} + +int inet_pton(int af, const char *src, void *dst) +{ + struct sockaddr_storage ss; + int sslen = sizeof(ss); + if (af == AF_INET) + { + struct in_addr out; + char buffer[INET_ADDRSTRLEN + 1]; + strncpy (buffer, src, INET_ADDRSTRLEN); + buffer [INET_ADDRSTRLEN] = '\0'; + if (WSAStringToAddressA(buffer, AF_INET, NULL, (struct sockaddr*)&ss, &sslen) == SOCKET_ERROR) + { + errno = WSAGetLastError(); + return 0; + } + else + { + out = ((struct sockaddr_in *)&ss)->sin_addr; + memcpy (dst, &out, sizeof(struct in_addr)); + return 1; + } + } + else if (af == AF_INET6) + { + struct in6_addr out6; + char buffer6[INET6_ADDRSTRLEN + 1]; + strncpy (buffer6, src, INET6_ADDRSTRLEN); + buffer6 [INET6_ADDRSTRLEN] = '\0'; + if (WSAStringToAddressA(buffer6, AF_INET6, NULL, (struct sockaddr*)&ss, &sslen) == SOCKET_ERROR) + { + errno = WSAGetLastError(); + return 0; + } + else + { + out6 = ((struct sockaddr_in6 *)&ss)->sin6_addr; + memcpy (dst, &out6, sizeof(struct in6_addr)); + return 1; + } + } + errno = WSAEAFNOSUPPORT; + return -1; +} +#endif diff --git a/apps/common/makefile b/apps/common/makefile new file mode 100644 index 000000000..e261f52c9 --- /dev/null +++ b/apps/common/makefile @@ -0,0 +1,3 @@ +LIBRARY = common + +CSRCS = inet.c diff --git a/apps/xauth/config.h b/apps/xauth/config.h new file mode 100644 index 000000000..8152de05a --- /dev/null +++ b/apps/xauth/config.h @@ -0,0 +1,94 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ +#undef BSD44SOCKETS + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ +#undef HAVE_LIBWS2_32 + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_ERRNO_H + +/* Define to 1 if the system has the type `socklen_t'. */ +#undef HAVE_SOCKLEN_T + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Support IPv6 for TCP connections */ +#define IPv6 1 + +/* Support os-specific local connections */ +#undef LOCALCONN + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Support TCP socket connections */ +#define TCPCONN 1 + +/* Support UNIX socket connections */ +#undef UNIXCONN + +/* Version number of package */ +#undef VERSION diff --git a/apps/xauth/makefile b/apps/xauth/makefile new file mode 100644 index 000000000..235a5d46e --- /dev/null +++ b/apps/xauth/makefile @@ -0,0 +1,34 @@ +TTYAPP = xauth + +INCLUDELIBFILES = \ + ..\common\$(OBJDIR)\common.lib \ + $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ + $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ + $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ + $(MHMAKECONF)\libX11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \ + $(MHMAKECONF)\libX11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \ + $(MHMAKECONF)\libX11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \ + $(MHMAKECONF)\libX11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \ + $(MHMAKECONF)\libX11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \ + $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ + $(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib \ + $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ + $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ + $(MHMAKECONF)\libX11\src\$(OBJDIR)\libx11.lib \ + +LIBDIRS=$(dir $(INCLUDELIBFILES)) + +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) + +ifeq ($(DEBUG),1) +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib +else +LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib +endif + +CSRCS = \ + gethost.c \ + parsedpy.c \ + process.c \ + xauth.c + diff --git a/apps/xhost/inet.c b/apps/xhost/inet.c deleted file mode 100644 index e6c0a1554..000000000 --- a/apps/xhost/inet.c +++ /dev/null @@ -1,88 +0,0 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifdef WIN32 -#include -#endif - -#include -#include - -#if NTDDI_VERSION < NTDDI_VISTA -const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) -{ - if (af == AF_INET) - { - struct sockaddr_in in; - memset(&in, 0, sizeof(in)); - in.sin_family = AF_INET; - memcpy(&in.sin_addr, src, sizeof(struct in_addr)); - if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST) != 0) - { - errno = WSAGetLastError(); - return NULL; - } - else return dst; - } - else if (af == AF_INET6) - { - struct sockaddr_in6 in; - memset(&in, 0, sizeof(in)); - in.sin6_family = AF_INET6; - memcpy(&in.sin6_addr, src, sizeof(struct in_addr6)); - if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST) != 0) - { - errno = WSAGetLastError(); - return NULL; - } - else return dst; - } - errno = WSAEAFNOSUPPORT; - return NULL; -} - -int inet_pton(int af, const char *src, void *dst) -{ - struct sockaddr_storage ss; - int sslen = sizeof(ss); - if (af == AF_INET) - { - struct in_addr out; - char buffer[INET_ADDRSTRLEN + 1]; - strncpy (buffer, src, INET_ADDRSTRLEN); - buffer [INET_ADDRSTRLEN] = '\0'; - if (WSAStringToAddressA(buffer, AF_INET, NULL, (struct sockaddr*)&ss, &sslen) == SOCKET_ERROR) - { - errno = WSAGetLastError(); - return 0; - } - else - { - out = ((struct sockaddr_in *)&ss)->sin_addr; - memcpy (dst, &out, sizeof(struct in_addr)); - return 1; - } - } - else if (af == AF_INET6) - { - struct in6_addr out6; - char buffer6[INET6_ADDRSTRLEN + 1]; - strncpy (buffer6, src, INET6_ADDRSTRLEN); - buffer6 [INET6_ADDRSTRLEN] = '\0'; - if (WSAStringToAddressA(buffer6, AF_INET6, NULL, (struct sockaddr*)&ss, &sslen) == SOCKET_ERROR) - { - errno = WSAGetLastError(); - return 0; - } - else - { - out6 = ((struct sockaddr_in6 *)&ss)->sin6_addr; - memcpy (dst, &out6, sizeof(struct in6_addr)); - return 1; - } - } - errno = WSAEAFNOSUPPORT; - return -1; -} -#endif diff --git a/apps/xhost/makefile b/apps/xhost/makefile index 357b93fb3..5425bcde2 100644 --- a/apps/xhost/makefile +++ b/apps/xhost/makefile @@ -3,6 +3,7 @@ DEFINES += BAD_ARPAINET TCPCONN IPv6 TTYAPP = xhost INCLUDELIBFILES = \ + ..\common\$(OBJDIR)\common.lib \ $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \ $(MHMAKECONF)\libX11\src\xlibi18n\$(OBJDIR)\libi18n.lib \ $(MHMAKECONF)\libX11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \ @@ -26,4 +27,4 @@ else LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib endif -CSRCS = xhost.c inet.c +CSRCS = xhost.c -- cgit v1.2.3