Revert to luit 1.0.3 for now. 1.0.4 breakage reported by naddy@.
This commit is contained in:
matthieu
parent
2e533db842
commit
683b9ddb1b
@ -1,54 +1,3 @@
|
||||
commit f5e4bc812cec6503722ee289a0cc1099ce6fb3f5
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Oct 1 18:14:18 2009 -0700
|
||||
|
||||
luit 1.0.4
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 61bb775852796628207a5062d8fdd8bcd6ec77bd
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Oct 1 18:01:27 2009 -0700
|
||||
|
||||
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 8f9d685e4bb91640fb01392c6d73e7d9e365b41b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Oct 1 14:54:17 2009 -0700
|
||||
|
||||
Add README with pointers to mailing lists, bugzilla, & git
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 4823838f77ab03cccd07860fdf8002bc577e0f04
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Apr 9 14:55:03 2009 -0700
|
||||
|
||||
luit: Convert platform #ifdefs to configure tests for functions & headers
|
||||
|
||||
Also check for __SVR4 in remaining SVR4 check to match Solaris compiler
|
||||
default definition.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 638f4ac8e233973dc3c89d87cd9f6ac05489fef4
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Fri Jan 16 20:01:11 2009 -0200
|
||||
|
||||
Ansification and compile warning fixes.
|
||||
|
||||
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
|
||||
make distcheck and most gcc 4.3 and sparse warnings.
|
||||
|
||||
commit 51eae7b3a07faab716ea7ef3186cee658f393d04
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Fri Apr 11 10:32:59 2008 -0700
|
||||
|
||||
Apple: Use secure tty
|
||||
Thanks to Martin Otte for the patch
|
||||
|
||||
commit 2547b637ab615884ea51458dfb793f1a70bc5201
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Fri Feb 1 00:08:27 2008 +0100
|
||||
|
||||
@ -23,8 +23,7 @@ bin_PROGRAMS = luit
|
||||
|
||||
LOCALEALIASFILE = @LOCALEALIASFILE@
|
||||
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(LUIT_CFLAGS) \
|
||||
-DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
|
||||
AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
|
||||
luit_LDADD = $(LUIT_LIBS)
|
||||
|
||||
luit_SOURCES = \
|
||||
@ -60,7 +59,7 @@ MAINTAINERCLEANFILES = ChangeLog
|
||||
.PHONY: ChangeLog
|
||||
|
||||
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)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
@ -85,4 +84,4 @@ MAN_SUBSTS = \
|
||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
$(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
@ -171,8 +171,6 @@ SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
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__include = @am__include@
|
||||
@ -187,23 +185,30 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
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@
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
Luit is a filter that can be run between an arbitrary application and
|
||||
a UTF-8 terminal emulator such as xterm. It will convert application
|
||||
output from the locale's encoding into UTF-8, and convert terminal
|
||||
input from UTF-8 into the locale's encoding.
|
||||
|
||||
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/app/luit
|
||||
|
||||
http://cgit.freedesktop.org/xorg/app/luit
|
||||
|
||||
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
|
||||
|
||||
138
app/luit/aclocal.m4
vendored
138
app/luit/aclocal.m4
vendored
@ -995,6 +995,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
|
||||
@ -1031,27 +1032,24 @@ dnl of the copyright holder.
|
||||
# your configure.ac with the minimum required version, such as:
|
||||
# XORG_MACROS_VERSION(1.1)
|
||||
#
|
||||
# To force at least a version with this macro defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
# To ensure that this macro is defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION],
|
||||
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
#
|
||||
#
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
[XORG_MACROS_needed_version=$1
|
||||
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_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
|
||||
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
|
||||
fi
|
||||
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
||||
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
|
||||
fi
|
||||
AC_MSG_RESULT([yes, $XORG_MACROS_version])
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.3.0])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
|
||||
m4_if(m4_version_compare(vers_have, [$1]), -1,
|
||||
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
|
||||
m4_undefine([vers_have])
|
||||
m4_undefine([maj_have])
|
||||
m4_undefine([maj_needed])
|
||||
]) # XORG_MACROS_VERSION
|
||||
|
||||
# XORG_PROG_RAWCPP()
|
||||
@ -1076,6 +1074,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
|
||||
@ -1188,7 +1190,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
|
||||
@ -1244,7 +1248,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
|
||||
@ -1310,7 +1316,7 @@ AC_SUBST(MAKE_HTML)
|
||||
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
|
||||
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
|
||||
AC_ARG_ENABLE(malloc0returnsnull,
|
||||
AC_HELP_STRING([--enable-malloc0returnsnull],
|
||||
AS_HELP_STRING([--enable-malloc0returnsnull],
|
||||
[malloc(0) returns NULL (default: auto)]),
|
||||
[MALLOC_ZERO_RETURNS_NULL=$enableval],
|
||||
[MALLOC_ZERO_RETURNS_NULL=auto])
|
||||
@ -1362,7 +1368,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
||||
AC_DEFUN([XORG_WITH_LINT],[
|
||||
|
||||
# Allow checking code with lint, sparse, etc.
|
||||
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
|
||||
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
|
||||
[Use a lint-style source code checker (default: disabled)])],
|
||||
[use_lint=$withval], [use_lint=no])
|
||||
if test "x$use_lint" = "xyes" ; then
|
||||
@ -1403,7 +1409,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||
AC_DEFUN([XORG_LINT_LIBRARY],[
|
||||
AC_REQUIRE([XORG_WITH_LINT])
|
||||
# Build lint "library" for more indepth checks of programs calling this library
|
||||
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
|
||||
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
|
||||
[Create lint library (default: disabled)])],
|
||||
[make_lint_lib=$enableval], [make_lint_lib=no])
|
||||
if test "x$make_lint_lib" != "xno" ; then
|
||||
@ -1421,6 +1427,75 @@ 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 `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$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)
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
]) # XORG_CWARNFLAGS
|
||||
|
||||
# XORG_STRICT_OPTION
|
||||
# -----------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Add configure option to enable strict compilation
|
||||
AC_DEFUN([XORG_STRICT_OPTION], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
AC_REQUIRE([XORG_CWARNFLAGS])
|
||||
|
||||
AC_ARG_ENABLE(strict-compilation,
|
||||
AS_HELP_STRING([--enable-strict-compilation],
|
||||
[Enable all warnings from compiler and make them errors (default: disabled)]),
|
||||
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
|
||||
if test "x$STRICT_COMPILE" = "xyes"; then
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
|
||||
if test "x$GCC" = xyes ; then
|
||||
STRICT_CFLAGS="-pedantic -Werror"
|
||||
elif test "x$SUNCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-errwarn"
|
||||
elif test "x$INTELCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-Werror"
|
||||
fi
|
||||
fi
|
||||
CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
|
||||
AC_SUBST([CWARNFLAGS])
|
||||
]) # XORG_STRICT_OPTION
|
||||
|
||||
# XORG_DEFAULT_OPTIONS
|
||||
# --------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Defines default options for X.Org modules.
|
||||
#
|
||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||
XORG_CWARNFLAGS
|
||||
XORG_STRICT_OPTION
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
XORG_MANPAGE_SECTIONS
|
||||
]) # XORG_DEFAULT_OPTIONS
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -1455,7 +1530,7 @@ dnl
|
||||
|
||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_ARG_WITH(release-version,
|
||||
AC_HELP_STRING([--with-release-version=STRING],
|
||||
AS_HELP_STRING([--with-release-version=STRING],
|
||||
[Use release version string in package name]),
|
||||
[RELEASE_VERSION="$withval"],
|
||||
[RELEASE_VERSION=""])
|
||||
@ -1483,3 +1558,20 @@ 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
|
||||
|
||||
|
||||
@ -75,13 +75,13 @@ NullReverse(unsigned int n, CharsetPtr self)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static CharsetRec Unknown94Charset =
|
||||
CharsetRec Unknown94Charset =
|
||||
{ "Unknown (94)", T_94, 0, IdentityRecode, NullReverse, NULL, NULL};
|
||||
static CharsetRec Unknown96Charset =
|
||||
CharsetRec Unknown96Charset =
|
||||
{ "Unknown (96)", T_96, 0, IdentityRecode, NullReverse, NULL, NULL};
|
||||
static CharsetRec Unknown9494Charset =
|
||||
CharsetRec Unknown9494Charset =
|
||||
{ "Unknown (94x94)", T_9494, 0, IdentityRecode, NullReverse, NULL, NULL};
|
||||
static CharsetRec Unknown9696Charset =
|
||||
CharsetRec Unknown9696Charset =
|
||||
{ "Unknown (96x96)", T_9696, 0, IdentityRecode, NullReverse, NULL, NULL};
|
||||
|
||||
typedef struct _FontencCharset {
|
||||
@ -94,7 +94,7 @@ typedef struct _FontencCharset {
|
||||
FontMapReversePtr reverse;
|
||||
} FontencCharsetRec, *FontencCharsetPtr;
|
||||
|
||||
static FontencCharsetRec fontencCharsets[] = {
|
||||
FontencCharsetRec fontencCharsets[] = {
|
||||
{"ISO 646 (1973)", T_94, '@', "iso646.1973-0", 0x00, NULL, NULL},
|
||||
{"ASCII", T_94, 'B', "iso8859-1", 0x00, NULL, NULL},
|
||||
{"JIS X 0201:GL", T_94, 'J', "jisx0201.1976-0", 0x00, NULL, NULL},
|
||||
@ -154,7 +154,7 @@ typedef struct _OtherCharset {
|
||||
int (*stack)(unsigned char, OtherStatePtr);
|
||||
} OtherCharsetRec, *OtherCharsetPtr;
|
||||
|
||||
static OtherCharsetRec otherCharsets[] = {
|
||||
OtherCharsetRec otherCharsets[] = {
|
||||
{"GBK", init_gbk, mapping_gbk, reverse_gbk, stack_gbk},
|
||||
{"UTF-8", init_utf8, mapping_utf8, reverse_utf8, stack_utf8},
|
||||
{"SJIS", init_sjis, mapping_sjis, reverse_sjis, stack_sjis},
|
||||
@ -393,7 +393,7 @@ getCharsetByName(const char *name)
|
||||
return getUnknownCharset(T_94);
|
||||
}
|
||||
|
||||
static const LocaleCharsetRec localeCharsets[] = {
|
||||
const LocaleCharsetRec localeCharsets[] = {
|
||||
{ "C", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
|
||||
{ "POSIX", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
|
||||
{ "ISO8859-1", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
|
||||
@ -481,7 +481,7 @@ getLocaleState(const char *locale, char *charset,
|
||||
}
|
||||
|
||||
if(p->name == NULL) {
|
||||
if (resolved != NULL)
|
||||
if (resolved != 0)
|
||||
free(resolved);
|
||||
return -1;
|
||||
}
|
||||
|
||||
4832
app/luit/configure
vendored
4832
app/luit/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -22,25 +22,16 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(luit,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
|
||||
AC_INIT(luit,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
AC_CHECK_HEADERS([poll.h pty.h stropts.h sys/param.h sys/select.h])
|
||||
AC_CHECK_FUNCS([poll select grantpt])
|
||||
|
||||
AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([zlib not found]))
|
||||
|
||||
AC_ARG_WITH(localealiasfile,
|
||||
@ -66,4 +57,7 @@ LUIT_CFLAGS="$LUIT_CFLAGS $OS_CFLAGS"
|
||||
AC_SUBST(LUIT_CFLAGS)
|
||||
AC_SUBST(LUIT_LIBS)
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
AC_OUTPUT([Makefile])
|
||||
|
||||
@ -37,8 +37,8 @@ THE SOFTWARE.
|
||||
#include "iso2022.h"
|
||||
|
||||
#define BUFFERED_INPUT_SIZE 4
|
||||
static unsigned char buffered_input[BUFFERED_INPUT_SIZE];
|
||||
static int buffered_input_count = 0;
|
||||
unsigned char buffered_input[BUFFERED_INPUT_SIZE];
|
||||
int buffered_input_count = 0;
|
||||
|
||||
static void
|
||||
FatalError(char *f, ...)
|
||||
|
||||
@ -34,12 +34,8 @@ THE SOFTWARE.
|
||||
#include <sys/ioctl.h>
|
||||
#include <signal.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STROPTS_H
|
||||
# include <stropts.h>
|
||||
#ifdef SVR4
|
||||
#include <stropts.h>
|
||||
#endif
|
||||
|
||||
#include <X11/fonts/fontenc.h>
|
||||
@ -56,11 +52,11 @@ static char *locale_name = NULL;
|
||||
int ilog = -1;
|
||||
int olog = -1;
|
||||
int verbose = 0;
|
||||
static int converter = 0;
|
||||
static int exitOnChild = 0;
|
||||
int converter = 0;
|
||||
int exitOnChild = 0;
|
||||
|
||||
static volatile int sigwinch_queued = 0;
|
||||
static volatile int sigchld_queued = 0;
|
||||
volatile int sigwinch_queued = 0;
|
||||
volatile int sigchld_queued = 0;
|
||||
|
||||
static int convert(int, int);
|
||||
static int condom(int, char**);
|
||||
@ -456,8 +452,6 @@ condom(int argc, char **argv)
|
||||
int rc;
|
||||
int val;
|
||||
|
||||
path = NULL;
|
||||
child_argv = NULL;
|
||||
rc = parseArgs(argc, argv, child_argv0,
|
||||
&path, &child_argv);
|
||||
if(rc < 0)
|
||||
|
||||
@ -34,8 +34,14 @@ THE SOFTWARE.
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#ifdef SVR4
|
||||
#define HAVE_POLL
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_POLL
|
||||
#ifndef _MINIX
|
||||
#define HAVE_SELECT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_POLL
|
||||
@ -43,20 +49,27 @@ THE SOFTWARE.
|
||||
#undef HAVE_SELECT
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
# include <sys/select.h>
|
||||
#ifdef __QNX__
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_PTY_H
|
||||
# include <pty.h>
|
||||
|
||||
#if (defined(__GLIBC__) && \
|
||||
(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))) || \
|
||||
defined(SVR4)
|
||||
#define HAVE_GRANTPT
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STROPTS_H
|
||||
# include <stropts.h>
|
||||
#ifdef __GLIBC__
|
||||
#include <pty.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
# include <sys/param.h>
|
||||
#ifdef SVR4
|
||||
#include <stropts.h>
|
||||
#endif
|
||||
|
||||
#if (defined(__unix__) || defined(unix)) && !defined(USG)
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#include "sys.h"
|
||||
@ -327,12 +340,7 @@ allocatePty(int *pty_return, char **line_return)
|
||||
char *temp_line;
|
||||
int rc;
|
||||
|
||||
#ifdef __APPLE__
|
||||
pty = posix_openpt(O_RDWR);
|
||||
#else
|
||||
pty = open("/dev/ptmx", O_RDWR);
|
||||
#endif
|
||||
|
||||
if(pty < 0)
|
||||
goto bsd;
|
||||
|
||||
@ -420,7 +428,7 @@ openTty(char *line)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(SVR4) || defined(__SVR4)
|
||||
#ifdef SVR4
|
||||
rc = ioctl(tty, I_PUSH, "ptem");
|
||||
if(rc < 0)
|
||||
goto bail;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user