update to libFS 1.0.2
This commit is contained in:
matthieu
parent
06111d4dcb
commit
3e1072ee96
@ -1,3 +1,95 @@
|
||||
commit 364af12a2426358461f5ed5b142c97411cad80c5
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Jul 7 15:47:36 2009 -0700
|
||||
|
||||
Version 1.0.2
|
||||
|
||||
commit 040bfd8f055f7e49f15e457842b8bca4f8d2020a
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Jul 7 15:45:50 2009 -0700
|
||||
|
||||
Move CWARNFLAGS to Makefile.am for easier build-time overriding
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 233b72428a47272b599a6be0708b06f7ed674f7c
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Jul 7 08:57:53 2009 -0700
|
||||
|
||||
Strip out-of-date RCS/CVS & SCCS version tags
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit f85f04b1287717d00cc29aaea2dc44bd59a2d2b3
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Jul 7 08:45:41 2009 -0700
|
||||
|
||||
Constify FSErrorList
|
||||
|
||||
Matches the code in libX11/src/ErrDes.c this is based on.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit b6c63181aded7f8e8879914b0f92767a47aa47cf
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Jun 17 16:05:03 2009 -0700
|
||||
|
||||
Drop #ifdef USG checks for some truly ancient (pre-SVR4) SysV's
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit b566d33d344876392254941d8ef73c848194c432
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Jun 17 15:36:54 2009 -0700
|
||||
|
||||
Fix server name handling in IOError messages during connection setup
|
||||
|
||||
- Don't try to sprintf a NULL string for the server name
|
||||
- Initialize the server name pointer in the srv struct sooner,
|
||||
so errors during connection initialization can print it instead
|
||||
of a null string in the error message
|
||||
|
||||
Had to update the error paths that freed the partially constructed
|
||||
structure, so combined them into a common implmentation via "goto fail".
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit eab796dabe05b4db2e193ab225deae613ac46a7b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue May 19 01:58:38 2009 -0700
|
||||
|
||||
Make FSlib.txt prototypes match those in headers.
|
||||
|
||||
Both conversion to ANSI C89 format and fixing some long standing mistakes.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 39be8ae0ac4d5281a006de67ae11f7877f443bc8
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue May 19 01:44:26 2009 -0700
|
||||
|
||||
Move API doc from xorg-doc/doc/FSlib.doc
|
||||
|
||||
commit 84d71a733b6ab93318260a5641d7609dbc38a198
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Mon Feb 2 20:34:29 2009 -0800
|
||||
|
||||
Add README with pointers to mailing list, bugzilla & git repos
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 3779550c57db5fe845f955bec141ca24800f2fdb
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Wed Jan 28 16:41:28 2009 -0200
|
||||
|
||||
Janitor: Correct make distcheck and compiler warnings.
|
||||
|
||||
commit 84cd6e7402382862abb473e7686a375db29f4d99
|
||||
Author: Peter Korsgaard <jacmet@sunsite.dk>
|
||||
Date: Wed Oct 22 10:34:59 2008 -0400
|
||||
|
||||
bcopy -> memmove
|
||||
|
||||
commit 9cbdb6ab49d8f9e6174a00d6b509bf6f1e3c1e78
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed May 21 18:40:05 2008 -0700
|
||||
|
||||
@ -26,7 +26,7 @@ SUBDIRS = src
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libfs.pc
|
||||
|
||||
EXTRA_DIST = libfs.pc.in autogen.sh
|
||||
EXTRA_DIST = libfs.pc.in doc/FSlib.txt
|
||||
|
||||
EXTRA_DIST += ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
@ -34,7 +34,7 @@ MAINTAINERCLEANFILES = ChangeLog
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/26 12:07:34 matthieu Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2009/08/23 14:00:11 matthieu Exp $
|
||||
|
||||
SHARED_LIBS= FS 8.0
|
||||
SHARED_LIBS= FS 9.0
|
||||
|
||||
.include <bsd.xorg.mk>
|
||||
|
||||
@ -104,7 +104,6 @@ am__remove_distdir = \
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
@ -117,8 +116,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -137,6 +138,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FS_CFLAGS = @FS_CFLAGS@
|
||||
FS_LIBS = @FS_LIBS@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -179,15 +181,9 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||
XTRANS_CFLAGS = @XTRANS_CFLAGS@
|
||||
XTRANS_LIBS = @XTRANS_LIBS@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -204,23 +200,31 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -228,7 +232,7 @@ target_alias = @target_alias@
|
||||
SUBDIRS = src
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libfs.pc
|
||||
EXTRA_DIST = libfs.pc.in autogen.sh ChangeLog
|
||||
EXTRA_DIST = libfs.pc.in doc/FSlib.txt ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
@ -449,7 +453,7 @@ distclean-tags:
|
||||
distdir: $(DISTFILES)
|
||||
$(am__remove_distdir)
|
||||
mkdir $(distdir)
|
||||
$(mkdir_p) $(distdir)/.
|
||||
$(mkdir_p) $(distdir)/. $(distdir)/doc
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
@ -697,7 +701,7 @@ uninstall-info: uninstall-info-recursive
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
|
||||
@ -1 +1,28 @@
|
||||
FS
|
||||
libFS - X Font Service client library
|
||||
|
||||
This library is used by clients of X Font Servers (xfs), such as
|
||||
xfsinfo, xfslsfonts, and the X servers themselves.
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
Please submit bug reports to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/lib/libFS
|
||||
|
||||
http://cgit.freedesktop.org/xorg/lib/libFS
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
||||
|
||||
78
lib/libFS/aclocal.m4
vendored
78
lib/libFS/aclocal.m4
vendored
@ -7631,6 +7631,7 @@ AC_SUBST([am__tar])
|
||||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in:xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl
|
||||
@ -7678,7 +7679,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||
[XORG_MACROS_version=1.1.6
|
||||
[XORG_MACROS_version=1.2.1
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
@ -7712,6 +7713,10 @@ else
|
||||
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS=-undef
|
||||
AC_MSG_RESULT([yes])
|
||||
# under Cygwin unix is still defined even with -undef
|
||||
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS="-undef -ansi"
|
||||
AC_MSG_RESULT([yes, with -ansi])
|
||||
else
|
||||
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
||||
fi
|
||||
@ -7824,7 +7829,9 @@ AC_SUBST([ADMIN_MAN_DIR])
|
||||
# Whether or not the necessary tools and files are found can be checked
|
||||
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
||||
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
@ -7880,7 +7887,9 @@ AC_SUBST(MAKE_HTML)
|
||||
# indicates whether the necessary tools and files are found and, if set,
|
||||
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
||||
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
BUILDTXTDOC=no
|
||||
BUILDPDFDOC=no
|
||||
@ -8057,6 +8066,31 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||
|
||||
]) # XORG_LINT_LIBRARY
|
||||
|
||||
# XORG_CWARNFLAGS
|
||||
# ---------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines CWARNFLAGS to enable C compiler warnings.
|
||||
#
|
||||
AC_DEFUN([XORG_CWARNFLAGS], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast"
|
||||
case `gcc -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
if test "x$SUNCC" = "xyes"; then
|
||||
CWARNFLAGS="-v"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(CWARNFLAGS)
|
||||
]) # XORG_CWARNFLAGS
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -8119,6 +8153,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
[Patch version of this package])
|
||||
])
|
||||
|
||||
# XORG_CHANGELOG()
|
||||
# ----------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines the variable CHANGELOG_CMD as the command to generate
|
||||
# ChangeLog from git.
|
||||
#
|
||||
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
|
||||
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
|
||||
dnl
|
||||
dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
@ -8153,10 +8204,11 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
|
||||
# SVR4 hides these in libraries other than libc
|
||||
AC_SEARCH_LIBS(socket, [socket])
|
||||
AC_SEARCH_LIBS(gethostbyname, [nsl])
|
||||
AC_HAVE_LIBRARY([ws2_32])
|
||||
|
||||
# Needs to come after above checks for libsocket & libnsl for SVR4 systems
|
||||
AC_ARG_ENABLE(ipv6,
|
||||
AC_HELP_STRING([--enable-IPv6],[Enable IPv6 support]),
|
||||
AC_HELP_STRING([--enable-ipv6],[Enable IPv6 support]),
|
||||
[IPV6CONN=$enableval],
|
||||
[AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])])
|
||||
AC_MSG_CHECKING([if IPv6 support should be built])
|
||||
@ -8173,6 +8225,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
])
|
||||
|
||||
# POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
|
||||
AC_CHECK_TYPES([socklen_t], [], [], [
|
||||
AC_INCLUDES_DEFAULT
|
||||
#include <sys/socket.h>])
|
||||
|
||||
]) # XTRANS_TCP_FLAGS
|
||||
|
||||
# XTRANS_CONNECTION_FLAGS()
|
||||
@ -8182,17 +8240,21 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
|
||||
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_TYPE_SIGNAL])
|
||||
[case $host_os in
|
||||
mingw*) unixdef="no" ;;
|
||||
*) unixdef="yes" ;;
|
||||
esac]
|
||||
AC_ARG_ENABLE(unix-transport,
|
||||
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
|
||||
[UNIXCONN=$enableval], [UNIXCONN=yes])
|
||||
AC_ARG_ENABLE(tcp-transport,
|
||||
AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
|
||||
[TCPCONN=$enableval], [TCPCONN=yes])
|
||||
[UNIXCONN=$enableval], [UNIXCONN=$unixdef])
|
||||
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
|
||||
if test "$UNIXCONN" = "yes"; then
|
||||
AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
|
||||
fi
|
||||
AC_MSG_RESULT($UNIXCONN)
|
||||
AC_ARG_ENABLE(tcp-transport,
|
||||
AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
|
||||
[TCPCONN=$enableval], [TCPCONN=yes])
|
||||
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
|
||||
AC_MSG_RESULT($TCPCONN)
|
||||
if test "$TCPCONN" = "yes"; then
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
srcdir=`dirname $0`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
|
||||
ORIGDIR=`pwd`
|
||||
cd $srcdir
|
||||
|
||||
autoreconf -v --install || exit 1
|
||||
cd $ORIGDIR || exit $?
|
||||
|
||||
$srcdir/configure --enable-maintainer-mode "$@"
|
||||
@ -9,9 +9,15 @@
|
||||
/* Define to 1 if you have the <inttypes.h> 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 <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if the system has the type `socklen_t'. */
|
||||
#undef HAVE_SOCKLEN_T
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
|
||||
9138
lib/libFS/configure
vendored
9138
lib/libFS/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -23,19 +23,19 @@ dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
|
||||
AC_INIT(libFS, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
|
||||
AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.2)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.1)
|
||||
|
||||
# Check for progs
|
||||
AC_PROG_CC
|
||||
AC_PROG_LIBTOOL
|
||||
XORG_CWARNFLAGS
|
||||
|
||||
# Check for dependencies
|
||||
PKG_CHECK_MODULES(FS, xproto fontsproto)
|
||||
@ -57,6 +57,7 @@ XORG_WITH_LINT
|
||||
XORG_LINT_LIBRARY([FS])
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
src/Makefile
|
||||
|
||||
230
lib/libFS/doc/FSlib.txt
Normal file
230
lib/libFS/doc/FSlib.txt
Normal file
@ -0,0 +1,230 @@
|
||||
Protocol requests
|
||||
|
||||
These functions make protocol requests corresponding to their names.
|
||||
|
||||
Connection Setup
|
||||
|
||||
FSServer *
|
||||
FSOpenServer(
|
||||
char *server);
|
||||
|
||||
Creates a connection to the font server specified in the 'server' string.
|
||||
|
||||
int
|
||||
FSCloseServer(
|
||||
FSServer *svr);
|
||||
|
||||
Closes the connection to the font server.
|
||||
|
||||
Font Manipulation
|
||||
|
||||
Font
|
||||
FSOpenBitmapFont(
|
||||
FSServer *svr,
|
||||
fsBitmapFormat hint,
|
||||
fsBitmapFormatMask fmask,
|
||||
char *name,
|
||||
Font *originalid);
|
||||
|
||||
Opens the font that matches the given name (which may have '*' and '?'
|
||||
as wildcards). The hint contains format information that will probably
|
||||
be used in subsequent QueryXBitmaps() requests. The fmask tells which
|
||||
bits in the mask are valid. If originalid is non-zero, then the server
|
||||
already has the font opened under that ID.
|
||||
|
||||
int
|
||||
FSCloseFont(
|
||||
FSServer *svr,
|
||||
Font fid);
|
||||
|
||||
Closes the font.
|
||||
|
||||
char **
|
||||
FSListFonts(
|
||||
FSServer *svr,
|
||||
char *pattern,
|
||||
int maxNames,
|
||||
int *actualCount);
|
||||
|
||||
Returns the full names of the fonts matching pattern. Up to maxNames
|
||||
names will be returned. The actual value number be placed in
|
||||
actualCount. The return value should be freed with FSFreeFontNames.
|
||||
|
||||
int
|
||||
FSFreeFontNames(
|
||||
char **list);
|
||||
|
||||
Frees the list of font names returned by FSListFonts.
|
||||
|
||||
char **
|
||||
FSListFontsWithXInfo(
|
||||
FSServer *svr,
|
||||
char *pattern,
|
||||
int maxNames,
|
||||
int *actualCount,
|
||||
fsFontHeader ***info,
|
||||
fsPropInfo ***pprops,
|
||||
fsPropOffset ***offsets,
|
||||
unsigned char ***prop_data);
|
||||
|
||||
Returns the full names of the fonts matching pattern. Up to maxNames
|
||||
names will be returned. The actual value number be placed in
|
||||
actualCount, and each font's header and property information will also
|
||||
be returned.
|
||||
|
||||
int
|
||||
FSQueryXInfo(
|
||||
FSServer *svr,
|
||||
Font fid,
|
||||
fsFontHeader *info,
|
||||
fsPropInfo *props,
|
||||
fsPropOffset **offsets,
|
||||
unsigned char **prop_data);
|
||||
|
||||
Returns the font's header information.
|
||||
|
||||
int
|
||||
FSQueryXExtents8(
|
||||
FSServer *svr,
|
||||
Font fid,
|
||||
Bool range_type,
|
||||
unsigned char *str,
|
||||
unsigned long str_len,
|
||||
fsCharInfo **extents);
|
||||
|
||||
int
|
||||
FSQueryXExtents16(
|
||||
FSServer *svr,
|
||||
Font fid,
|
||||
Bool range_type,
|
||||
fsChar2b *str,
|
||||
unsigned long str_len,
|
||||
fsCharInfo **extents);
|
||||
|
||||
Returns the extents of the given characters. If 'range_type' is set,
|
||||
the 'str' is considered a range, otherwise its considered a list of
|
||||
characters. A NULL str when range_type is set means that all the
|
||||
character extents will be returned.
|
||||
|
||||
int
|
||||
FSQueryXBitmaps8(
|
||||
FSServer *svr,
|
||||
Font fid,
|
||||
fsBitmapFormat format,
|
||||
Bool range_type,
|
||||
unsigned char *str,
|
||||
unsined long str_len,
|
||||
unsigned long **offsets,
|
||||
unsigned char **glyph_data);
|
||||
|
||||
int
|
||||
FSQueryXBitmaps16(
|
||||
FSServer *svr,
|
||||
Font fid,
|
||||
fsBitmapFormat format,
|
||||
Bool range_type,
|
||||
fsChar2b *str,
|
||||
unsined long str_len,
|
||||
unsigned long **offsets,
|
||||
unsigned char **glyph_data);
|
||||
|
||||
Returns the font's bitmaps in the requested format. The other arguments
|
||||
are used as in QueryExtents above.
|
||||
|
||||
Extensions
|
||||
|
||||
char **
|
||||
FSListExtensions(
|
||||
FSServer *svr,
|
||||
int *next);
|
||||
|
||||
Lists any extension built into the font server.
|
||||
|
||||
Bool
|
||||
FSQueryExtension(
|
||||
FSServer *svr,
|
||||
char *name,
|
||||
int *major_opcode,
|
||||
int *first_event,
|
||||
int *first_error);
|
||||
|
||||
Returns information on the specified extension.
|
||||
|
||||
int
|
||||
FSFreeExtensionList(
|
||||
char **list);
|
||||
|
||||
Frees the list returned by FSListExtensions().
|
||||
|
||||
|
||||
Helper functions -- these don't map to protocol requests, but
|
||||
can make writing a FS client simpler.
|
||||
|
||||
Synchronization
|
||||
|
||||
FSSync(
|
||||
FSServer *svr,
|
||||
Bool discard);
|
||||
|
||||
Flushes the output queue and waits for a reply from the server,
|
||||
which will flush the server's output queue.
|
||||
|
||||
typedef int (*FSSyncHandler)(FSServer *);
|
||||
|
||||
FSSyncHandler
|
||||
FSSynchronize(
|
||||
FSServer *svr,
|
||||
int onoff)
|
||||
|
||||
Controls whether the server does every request in synchronous form.
|
||||
|
||||
FSSyncHandler
|
||||
FSSetAfterFunction(
|
||||
FSServer *svr,
|
||||
FSSyncHandler func);
|
||||
|
||||
Sets the function that will be called after every request. This
|
||||
is usually NULL or FSSync().
|
||||
|
||||
int
|
||||
FSFlush(
|
||||
FSServer *svr);
|
||||
|
||||
Flushes any queued requests to the font server.
|
||||
|
||||
Error Handling
|
||||
|
||||
typedef int (* FSErrorHandler)(FSServer *, FSErrorEvent *);
|
||||
|
||||
FSErrorHandler
|
||||
FSSetErrorHandler(
|
||||
FSErrorHandler handler);
|
||||
|
||||
Changes the error handler to 'handler'. A NULL value will reset
|
||||
it to use the default.
|
||||
|
||||
typedef int (* FSIOErrorHandler)(FSServer *);
|
||||
|
||||
FSIOErrorHandler
|
||||
FSSetIOErrorHandler(
|
||||
FSIOErrorHandler handler);
|
||||
|
||||
Changes the I/O error handler to 'handler'. A NULL value will reset
|
||||
it to use the default.
|
||||
|
||||
Miscellaneous
|
||||
|
||||
long
|
||||
FSMaxRequestSize(
|
||||
FSServer *svr);
|
||||
|
||||
Returns the largest request size (in 4 byte quantities) that the
|
||||
server can handle.
|
||||
|
||||
char *
|
||||
FSServerName(
|
||||
char *server);
|
||||
|
||||
Returns the name that FSlib would use to connect to the server.
|
||||
Translates a NULL in the value of $FONT_SERVER.
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSlib.h,v 1.5 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSlib.h,v 1.6 2001/12/14 19:53:33 dawes Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
@ -277,8 +274,9 @@ extern int FSSync ( FSServer *svr, Bool discard );
|
||||
|
||||
extern int FSCloseServer ( FSServer *svr );
|
||||
extern int FSCloseFont ( FSServer *svr, Font fid );
|
||||
extern int FSGetErrorDatabaseText ( FSServer *svr, char *name, char *type,
|
||||
char *defaultp, char *buffer, int nbytes );
|
||||
extern int FSGetErrorDatabaseText ( FSServer *svr, const char *name,
|
||||
const char *type, const char *defaultp,
|
||||
char *buffer, int nbytes );
|
||||
extern int FSGetErrorText ( FSServer *svr, int code, char *buffer,
|
||||
|
||||
int nbytes );
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSClServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSClServ.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSClServ.c,v 1.4 2001/01/17 19:41:27 dawes Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
@ -58,8 +55,6 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include "FSlib.h"
|
||||
#include "FSlibint.h"
|
||||
|
||||
extern FSServer *_FSHeadOfServerList;
|
||||
|
||||
int
|
||||
FSCloseServer(FSServer *svr)
|
||||
{
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSCloseFt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSCloseFt.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSConnServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -50,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.10 2001/10/28 03:32:27 tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSErrDis.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSErrDis.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include "FSlibint.h"
|
||||
#include <X11/Xos.h>
|
||||
|
||||
char *FSErrorList[] = {
|
||||
static const char *FSErrorList[] = {
|
||||
/* FSBadRequest */ "BadRequest, invalid request code or no such operation",
|
||||
/* FSBadFormat */ "BadFormat, bad font format mask",
|
||||
/* FSBadFont */ "BadFont, invalid Font parameter",
|
||||
@ -72,21 +70,21 @@ char *FSErrorList[] = {
|
||||
/* FSBadLength */ "BadLength, request too large or internal FSlib length error",
|
||||
/* FSBadImplementation */ "BadImplementation, request unsupported",
|
||||
};
|
||||
int FSErrorListSize = sizeof(FSErrorList);
|
||||
static int FSErrorListSize = sizeof(FSErrorList);
|
||||
|
||||
|
||||
/* ARGSUSED */
|
||||
int FSGetErrorDatabaseText(
|
||||
FSServer *svr,
|
||||
register char *name,
|
||||
register char *type,
|
||||
char *defaultp,
|
||||
const char *name,
|
||||
const char *type,
|
||||
const char *defaultp,
|
||||
char *buffer,
|
||||
int nbytes)
|
||||
{
|
||||
if (nbytes == 0)
|
||||
return 0;
|
||||
(void) strncpy(buffer, (char *) defaultp, nbytes);
|
||||
(void) strncpy(buffer, defaultp, nbytes);
|
||||
if ((strlen(defaultp) + 1) > nbytes)
|
||||
buffer[nbytes - 1] = '\0';
|
||||
return 1;
|
||||
@ -99,7 +97,7 @@ int FSGetErrorText(
|
||||
int nbytes)
|
||||
{
|
||||
|
||||
char *defaultp = NULL;
|
||||
const char *defaultp = NULL;
|
||||
char buf[32];
|
||||
register _FSExtension *ext;
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSErrHndlr.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSErrHndlr.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
/* $Xorg: FSFlush.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSFlush.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $Xorg: FSFontInfo.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -23,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSFontInfo.c,v 1.5tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $Xorg: FSFtNames.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -23,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSFtNames.c,v 1.6tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $Xorg: FSGetCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -23,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSGetCats.c,v 1.6tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $Xorg: FSListCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -23,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSListCats.c,v 1.6tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSListExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSListExt.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSListExt.c,v 1.6tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSMisc.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSMisc.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSNextEv.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSNextEv.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -56,8 +54,6 @@ in this Software without prior written authorization from The Open Group.
|
||||
#endif
|
||||
#include "FSlibint.h"
|
||||
|
||||
extern _FSQEvent *_FSqfree;
|
||||
|
||||
int FSNextEvent(
|
||||
FSServer *svr,
|
||||
FSEvent *event)
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSOpenFont.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.6tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSOpenServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSOpenServ.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.8tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
@ -63,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include "FSlibint.h"
|
||||
#include <X11/Xtrans/Xtrans.h>
|
||||
|
||||
int _FSdebug = 0;
|
||||
static int _FSdebug = 0;
|
||||
|
||||
static fsReq _dummy_request = {
|
||||
0, 0, 0
|
||||
@ -91,8 +88,8 @@ void OutOfMemory(
|
||||
FSServer *svr,
|
||||
char *setup)
|
||||
{
|
||||
|
||||
_FSDisconnectServer(svr->trans_conn);
|
||||
if (svr->trans_conn)
|
||||
_FSDisconnectServer(svr->trans_conn);
|
||||
_FSFreeServerStructure(svr);
|
||||
FSfree(setup);
|
||||
errno = ENOMEM;
|
||||
@ -111,12 +108,12 @@ FSOpenServer(char *server)
|
||||
int endian;
|
||||
fsConnClientPrefix client;
|
||||
fsConnSetup prefix;
|
||||
char *setup;
|
||||
char *setup = NULL;
|
||||
fsConnSetupAccept conn;
|
||||
char *auth_data;
|
||||
char *alt_data,
|
||||
char *auth_data = NULL;
|
||||
char *alt_data = NULL,
|
||||
*ad;
|
||||
AlternateServer *alts;
|
||||
AlternateServer *alts = NULL;
|
||||
int altlen;
|
||||
char *vendor_string;
|
||||
unsigned long setuplength;
|
||||
@ -131,9 +128,15 @@ FSOpenServer(char *server)
|
||||
errno = ENOMEM;
|
||||
return (FSServer *) NULL;
|
||||
}
|
||||
|
||||
if ((svr->server_name = FSmalloc((unsigned) (strlen(server) + 1)))
|
||||
== NULL) {
|
||||
goto fail;
|
||||
}
|
||||
(void) strcpy(svr->server_name, server);
|
||||
|
||||
if ((svr->trans_conn = _FSConnectServer(server)) == NULL) {
|
||||
FSfree((char *) svr);
|
||||
return (FSServer *) NULL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
svr->fd = _FSTransGetConnectionNumber (svr->trans_conn);
|
||||
@ -157,29 +160,21 @@ FSOpenServer(char *server)
|
||||
if (setuplength > (SIZE_MAX>>2)
|
||||
|| (alt_data = (char *)
|
||||
(setup = FSmalloc((unsigned) setuplength))) == NULL) {
|
||||
errno = ENOMEM;
|
||||
FSfree((char *) svr);
|
||||
return (FSServer *) NULL;
|
||||
goto fail;
|
||||
}
|
||||
_FSRead(svr, (char *) alt_data, setuplength);
|
||||
ad = alt_data;
|
||||
|
||||
#if SIZE_MAX <= UINT_MAX
|
||||
if (prefix.num_alternates > SIZE_MAX / sizeof(AlternateServer)) {
|
||||
errno = ENOMEM;
|
||||
FSfree((char *) alt_data);
|
||||
FSfree((char *) svr);
|
||||
return (FSServer *) 0;
|
||||
goto fail;
|
||||
}
|
||||
#endif
|
||||
|
||||
alts = (AlternateServer *)
|
||||
FSmalloc(sizeof(AlternateServer) * prefix.num_alternates);
|
||||
if (!alts) {
|
||||
errno = ENOMEM;
|
||||
FSfree((char *) alt_data);
|
||||
FSfree((char *) svr);
|
||||
return (FSServer *) 0;
|
||||
goto fail;
|
||||
}
|
||||
for (i = 0; i < prefix.num_alternates; i++) {
|
||||
alts[i].subset = (Bool) *ad++;
|
||||
@ -189,17 +184,14 @@ FSOpenServer(char *server)
|
||||
while (--i) {
|
||||
FSfree((char *) alts[i].name);
|
||||
}
|
||||
FSfree((char *) alts);
|
||||
FSfree((char *) alt_data);
|
||||
FSfree((char *) svr);
|
||||
errno = ENOMEM;
|
||||
return (FSServer *) 0;
|
||||
goto fail;
|
||||
}
|
||||
bcopy(ad, alts[i].name, altlen);
|
||||
memmove(alts[i].name, ad, altlen);
|
||||
alts[i].name[altlen] = '\0';
|
||||
ad += altlen + ((4 - (altlen + 2)) & 3);
|
||||
}
|
||||
FSfree((char *) alt_data);
|
||||
alt_data = NULL;
|
||||
|
||||
svr->alternate_servers = alts;
|
||||
svr->num_alternates = prefix.num_alternates;
|
||||
@ -208,31 +200,21 @@ FSOpenServer(char *server)
|
||||
if (setuplength > (SIZE_MAX>>2)
|
||||
|| (auth_data = (char *)
|
||||
(setup = FSmalloc((unsigned) setuplength))) == NULL) {
|
||||
errno = ENOMEM;
|
||||
FSfree((char *) alts);
|
||||
FSfree((char *) svr);
|
||||
return (FSServer *) NULL;
|
||||
goto fail;
|
||||
}
|
||||
_FSRead(svr, (char *) auth_data, setuplength);
|
||||
|
||||
if (prefix.status != AuthSuccess) {
|
||||
fprintf(stderr, "%s: connection to \"%s\" refused by server\r\n%s: ",
|
||||
"FSlib", server, "FSlib");
|
||||
FSfree((char *) alts);
|
||||
FSfree((char *) svr);
|
||||
FSfree(setup);
|
||||
return (FSServer *) NULL;
|
||||
goto fail;
|
||||
}
|
||||
/* get rest */
|
||||
_FSRead(svr, (char *) &conn, (long) SIZEOF(fsConnSetupAccept));
|
||||
|
||||
if ((vendor_string = (char *)
|
||||
FSmalloc((unsigned) conn.vendor_len + 1)) == NULL) {
|
||||
errno = ENOMEM;
|
||||
FSfree((char *) auth_data);
|
||||
FSfree((char *) alts);
|
||||
FSfree((char *) svr);
|
||||
return (FSServer *) NULL;
|
||||
goto fail;
|
||||
}
|
||||
_FSReadPad(svr, (char *) vendor_string, conn.vendor_len);
|
||||
|
||||
@ -260,17 +242,9 @@ FSOpenServer(char *server)
|
||||
svr->last_request_read = 0;
|
||||
svr->last_req = (char *) &_dummy_request;
|
||||
|
||||
if ((svr->server_name = FSmalloc((unsigned) (strlen(server) + 1)))
|
||||
== NULL) {
|
||||
OutOfMemory(svr, setup);
|
||||
return (FSServer *) NULL;
|
||||
}
|
||||
(void) strcpy(svr->server_name, server);
|
||||
|
||||
/* setup the output buffers */
|
||||
if ((svr->bufptr = svr->buffer = FSmalloc(BUFSIZE)) == NULL) {
|
||||
OutOfMemory(svr, setup);
|
||||
return (FSServer *) NULL;
|
||||
goto fail;
|
||||
}
|
||||
svr->bufmax = svr->buffer + BUFSIZE;
|
||||
|
||||
@ -279,6 +253,7 @@ FSOpenServer(char *server)
|
||||
svr->qlen = 0;
|
||||
|
||||
FSfree(setup);
|
||||
setup = NULL;
|
||||
|
||||
(void) FSSynchronize(svr, _FSdebug);
|
||||
|
||||
@ -286,4 +261,12 @@ FSOpenServer(char *server)
|
||||
_FSHeadOfServerList = svr;
|
||||
|
||||
return (svr);
|
||||
|
||||
fail: /* Failure: clean up and return null */
|
||||
FSfree((char *) alts);
|
||||
FSfree((char *) alt_data);
|
||||
FSfree((char *) auth_data);
|
||||
OutOfMemory(svr, setup);
|
||||
return (FSServer *) NULL;
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $Xorg: FSQGlyphs.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -23,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSQGlyphs.c,v 1.5tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSQXExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.7tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $Xorg: FSQXInfo.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -23,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSQXInfo.c,v 1.5tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSQuExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
/* $Xorg: FSServName.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSServName.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -24,7 +23,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSServName.c,v 1.3 2001/07/29 05:01:11 tsi Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSSetCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSFlush.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSSync.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -56,8 +54,6 @@ in this Software without prior written authorization from The Open Group.
|
||||
#endif
|
||||
#include "FSlibint.h"
|
||||
|
||||
extern _FSQEvent *_FSqfree;
|
||||
|
||||
/* synchronize with errors and events */
|
||||
|
||||
int FSSync(
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/* $Xorg: FSSynchro.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSSynchro.c 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -24,7 +22,6 @@
|
||||
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSlibInt.c,v 1.5 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -50,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.10tsi Exp $ */
|
||||
|
||||
/*
|
||||
* FSlibInt.c - Internal support routines for the C subroutine
|
||||
@ -964,7 +961,7 @@ _FSDefaultIOError(FSServer *svr)
|
||||
|
||||
errno, _SysErrorMsg(errno),
|
||||
#endif
|
||||
FSServerString(svr));
|
||||
FSServerString(svr) ? FSServerString(svr) : "");
|
||||
(void) fprintf(stderr,
|
||||
" after %lu requests (%lu known processed) with %d events remaining.\r\n",
|
||||
FSNextRequest(svr) - 1, FSLastKnownRequestProcessed(svr),
|
||||
@ -1120,7 +1117,7 @@ Data(
|
||||
long len)
|
||||
{
|
||||
if (svr->bufptr + (len) <= svr->bufmax) {
|
||||
bcopy(data, svr->bufptr, (int) len);
|
||||
memmove(svr->bufptr, data, len);
|
||||
svr->bufptr += ((len) + 3) & ~3;
|
||||
} else {
|
||||
_FSSend(svr, data, len);
|
||||
@ -1290,9 +1287,6 @@ _FSFreeQ(void)
|
||||
#ifdef hpux
|
||||
#define NEED_UTSNAME
|
||||
#endif
|
||||
#ifdef USG
|
||||
#define NEED_UTSNAME
|
||||
#endif
|
||||
#ifdef SVR4
|
||||
#ifndef _SEQUENT_
|
||||
#define NEED_UTSNAME
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $Xorg: FSlibint.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
@ -50,29 +48,13 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSlibint.h,v 3.8 2003/08/29 18:01:12 herrb Exp $ */
|
||||
|
||||
/*
|
||||
* FSlib internal decls
|
||||
*/
|
||||
#include <X11/Xos.h>
|
||||
#include <stdio.h>
|
||||
|
||||
/* This is all probably superfluous given Xos.h above */
|
||||
#ifdef USG
|
||||
#ifndef __TYPES__
|
||||
#include <sys/types.h> /* forgot to protect it... */
|
||||
#define __TYPES__
|
||||
#endif /* __TYPES__ */
|
||||
#else
|
||||
#if defined(_POSIX_SOURCE) && defined(MOTOROLA)
|
||||
#undef _POSIX_SOURCE
|
||||
#include <sys/types.h>
|
||||
#define _POSIX_SOURCE
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#endif /* USG */
|
||||
|
||||
#include "FSlib.h"
|
||||
#include "FSlibos.h"
|
||||
@ -118,6 +100,9 @@ extern int _FSGetHostname ( char *buf, int maxlen );
|
||||
extern FSErrorHandler FSSetErrorHandler ( FSErrorHandler handler );
|
||||
extern FSIOErrorHandler FSSetIOErrorHandler ( FSIOErrorHandler handler );
|
||||
|
||||
extern _FSQEvent *_FSqfree;
|
||||
extern FSServer *_FSHeadOfServerList;
|
||||
|
||||
#ifndef BUFSIZE
|
||||
#define BUFSIZE 2048 /* FS output buffer size. */
|
||||
#endif
|
||||
@ -285,7 +270,7 @@ extern void Data();
|
||||
#else
|
||||
#define Data(svr, data, len) \
|
||||
if (svr->bufptr + (len) <= svr->bufmax) {\
|
||||
bcopy(data, svr->bufptr, (int)len);\
|
||||
memmove(svr->bufptr, data, len);\
|
||||
svr->bufptr += ((len) + 3) & ~3;\
|
||||
} else\
|
||||
_FSSend(svr, data, len)
|
||||
@ -337,7 +322,7 @@ extern void Data();
|
||||
#define STARTITERATE(tpvar,type,start,endcond,decr) \
|
||||
{ register char *cpvar; \
|
||||
for (cpvar = (char *) start; endcond; cpvar = NEXTPTR(cpvar,type), decr) { \
|
||||
type dummy; bcopy (cpvar, (char *) &dummy, SIZEOF(type)); \
|
||||
type dummy; memmove ((char *) &dummy, cpvar, SIZEOF(type)); \
|
||||
tpvar = (type *) cpvar;
|
||||
#define ENDITERATE }}
|
||||
|
||||
|
||||
@ -1,7 +1,4 @@
|
||||
/* $XdotOrg: xc/lib/FS/FSlibos.h,v 1.3 2005/06/09 15:52:02 ago Exp $ */
|
||||
/* $Xorg: FSlibos.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
|
||||
|
||||
/* @(#)FSlibos.h 4.1 91/05/02
|
||||
/*
|
||||
* Copyright 1990 Network Computing Devices;
|
||||
* Portions Copyright 1987 by Digital Equipment Corporation
|
||||
*
|
||||
@ -51,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/lib/FS/FSlibos.h,v 3.10 2003/09/01 20:50:10 herrb Exp $ */
|
||||
|
||||
/*
|
||||
* FSlib networking & os include file
|
||||
@ -228,7 +224,7 @@ typedef unsigned long FdSet[MSKCNT];
|
||||
#endif
|
||||
|
||||
#if (MSKCNT>4)
|
||||
#define COPYBITS(src, dst) bcopy((caddr_t) src, (caddr_t) dst, sizeof(FdSet))
|
||||
#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src, sizeof(FdSet))
|
||||
#define CLEARBITS(buf) bzero((caddr_t) buf, sizeof(FdSet))
|
||||
#define MASKANDSETBITS(dst, b1, b2) \
|
||||
{ int cri; \
|
||||
@ -301,32 +297,4 @@ typedef fd_set FdSet;
|
||||
#define FScalloc(nelem, elsize) calloc((nelem), (elsize))
|
||||
#endif
|
||||
|
||||
/*
|
||||
* ReadvFromServer and WritevToSever use struct iovec, normally found
|
||||
* in Berkeley systems in <sys/uio.h>. See the readv(2) and writev(2)
|
||||
* manual pages for details.
|
||||
*
|
||||
* struct iovec {
|
||||
* caddr_t iov_base;
|
||||
* int iov_len;
|
||||
* };
|
||||
*/
|
||||
|
||||
#ifdef USG
|
||||
|
||||
#if defined(USG) && !defined(CRAY) && !defined(umips) && !defined(MOTOROLA)
|
||||
#ifndef __TIMEVAL__
|
||||
#define __TIMEVAL__
|
||||
struct timeval { /* BSD has in <sys/time.h> */
|
||||
long tv_sec;
|
||||
long tv_usec;
|
||||
};
|
||||
|
||||
#endif /* __TIMEVAL__ */
|
||||
|
||||
#endif /* not CRAY or umips */
|
||||
|
||||
#endif /* USG */
|
||||
|
||||
|
||||
#define SearchString(string, char) index((string), (char))
|
||||
|
||||
@ -29,7 +29,7 @@ libFS_la_SOURCES = \
|
||||
FSSynchro.c \
|
||||
fs_transport.c
|
||||
|
||||
AM_CFLAGS = $(FS_CFLAGS) $(XTRANS_CFLAGS) $(MALLOC_ZERO_CFLAGS) \
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(FS_CFLAGS) $(XTRANS_CFLAGS) $(MALLOC_ZERO_CFLAGS) \
|
||||
-DFS_t -DTRANS_CLIENT
|
||||
libFS_la_LIBADD = $(FS_LIBS) $(XTRANS_LIBS)
|
||||
|
||||
|
||||
@ -99,8 +99,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -119,6 +121,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FS_CFLAGS = @FS_CFLAGS@
|
||||
FS_LIBS = @FS_LIBS@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -161,15 +164,9 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||
XTRANS_CFLAGS = @XTRANS_CFLAGS@
|
||||
XTRANS_LIBS = @XTRANS_LIBS@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -186,23 +183,31 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -237,7 +242,7 @@ libFS_la_SOURCES = \
|
||||
FSSynchro.c \
|
||||
fs_transport.c
|
||||
|
||||
AM_CFLAGS = $(FS_CFLAGS) $(XTRANS_CFLAGS) $(MALLOC_ZERO_CFLAGS) \
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(FS_CFLAGS) $(XTRANS_CFLAGS) $(MALLOC_ZERO_CFLAGS) \
|
||||
-DFS_t -DTRANS_CLIENT
|
||||
|
||||
libFS_la_LIBADD = $(FS_LIBS) $(XTRANS_LIBS)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user