mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-14 21:29:14 +00:00
Update to listres 1.0.6
This commit is contained in:
@@ -1,3 +1,35 @@
|
|||||||
|
commit be836dd49be49040f0420893393c1b864fc79611
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun Mar 3 09:51:43 2024 -0800
|
||||||
|
|
||||||
|
listres 1.0.6
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit aee575262a9c70fe537bc1cda72c1b00931f87b0
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Wed Feb 8 15:15:32 2023 -0800
|
||||||
|
|
||||||
|
Add -help and -version options
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit 3f09f6c5771cfc70ab73ce301da683c3884cabd1
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Wed Feb 8 15:09:58 2023 -0800
|
||||||
|
|
||||||
|
Print which argument was unknown before giving usage message
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit 1565da2398ea92eb5e2bf9a308c004feedfe1fa6
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Thu Jul 28 17:30:21 2022 -0700
|
||||||
|
|
||||||
|
gitlab CI: stop requiring Signed-off-by in commits
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
commit 0527098de837af8c4720170df94ba9748ba8009e
|
commit 0527098de837af8c4720170df94ba9748ba8009e
|
||||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
Date: Sun Apr 3 12:06:29 2022 -0700
|
Date: Sun Apr 3 12:06:29 2022 -0700
|
||||||
@@ -524,13 +556,13 @@ Date: Wed Jul 20 19:31:49 2005 +0000
|
|||||||
configure cache, you cache it, and the cached value is probably wrong.
|
configure cache, you cache it, and the cached value is probably wrong.
|
||||||
|
|
||||||
commit 8b25b98b1cbe95610a862d75cdecd59cd40bca30
|
commit 8b25b98b1cbe95610a862d75cdecd59cd40bca30
|
||||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||||
Date: Thu Jul 14 22:40:14 2005 +0000
|
Date: Thu Jul 14 22:40:14 2005 +0000
|
||||||
|
|
||||||
Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
|
Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
|
||||||
|
|
||||||
commit 0b8defdf67bc0354d90c525bd4d81dff7f397925
|
commit 0b8defdf67bc0354d90c525bd4d81dff7f397925
|
||||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||||
Date: Tue Jun 28 15:09:55 2005 +0000
|
Date: Tue Jun 28 15:09:55 2005 +0000
|
||||||
|
|
||||||
Check in build system for listres
|
Check in build system for listres
|
||||||
|
|||||||
@@ -202,7 +202,6 @@ CC = @CC@
|
|||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
@@ -213,11 +212,9 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
|||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|||||||
72
app/listres/aclocal.m4
vendored
72
app/listres/aclocal.m4
vendored
@@ -13,8 +13,8 @@
|
|||||||
|
|
||||||
m4_ifndef([AC_AUTOCONF_VERSION],
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
||||||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||||
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
|
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
|
||||||
[m4_warning([this file was generated for autoconf 2.69.
|
[m4_warning([this file was generated for autoconf 2.71.
|
||||||
You have another version of autoconf. It may work, but is not guaranteed to.
|
You have another version of autoconf. It may work, but is not guaranteed to.
|
||||||
If you have problems, you may need to regenerate the build system entirely.
|
If you have problems, you may need to regenerate the build system entirely.
|
||||||
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
||||||
@@ -1318,7 +1318,7 @@ AC_SUBST([am__untar])
|
|||||||
|
|
||||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||||
dnl
|
dnl
|
||||||
dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
|
dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates.
|
||||||
dnl
|
dnl
|
||||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
dnl copy of this software and associated documentation files (the "Software"),
|
dnl copy of this software and associated documentation files (the "Software"),
|
||||||
@@ -1355,7 +1355,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
|||||||
# See the "minimum version" comment for each macro you use to see what
|
# See the "minimum version" comment for each macro you use to see what
|
||||||
# version you require.
|
# version you require.
|
||||||
m4_defun([XORG_MACROS_VERSION],[
|
m4_defun([XORG_MACROS_VERSION],[
|
||||||
m4_define([vers_have], [1.19.2])
|
m4_define([vers_have], [1.20.0])
|
||||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
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_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||||
@@ -1376,7 +1376,7 @@ AM_MAINTAINER_MODE
|
|||||||
# such as man pages and config files
|
# such as man pages and config files
|
||||||
AC_DEFUN([XORG_PROG_RAWCPP],[
|
AC_DEFUN([XORG_PROG_RAWCPP],[
|
||||||
AC_REQUIRE([AC_PROG_CPP])
|
AC_REQUIRE([AC_PROG_CPP])
|
||||||
AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
|
AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
|
||||||
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
|
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
|
||||||
|
|
||||||
# Check for flag to avoid builtin definitions - assumes unix is predefined,
|
# Check for flag to avoid builtin definitions - assumes unix is predefined,
|
||||||
@@ -1686,7 +1686,7 @@ AC_SUBST(MAKE_HTML)
|
|||||||
# Documentation tools are not always available on all platforms and sometimes
|
# Documentation tools are not always available on all platforms and sometimes
|
||||||
# not at the appropriate level. This macro enables a module to test for the
|
# not at the appropriate level. This macro enables a module to test for the
|
||||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||||
# the --with-xmlto option, it allows maximum flexibilty in making decisions
|
# the --with-xmlto option, it allows maximum flexibility in making decisions
|
||||||
# as whether or not to use the xmlto package. When DEFAULT is not specified,
|
# as whether or not to use the xmlto package. When DEFAULT is not specified,
|
||||||
# --with-xmlto assumes 'auto'.
|
# --with-xmlto assumes 'auto'.
|
||||||
#
|
#
|
||||||
@@ -1900,7 +1900,7 @@ AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes])
|
|||||||
# Documentation tools are not always available on all platforms and sometimes
|
# Documentation tools are not always available on all platforms and sometimes
|
||||||
# not at the appropriate level. This macro enables a module to test for the
|
# not at the appropriate level. This macro enables a module to test for the
|
||||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||||
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
|
# the --with-asciidoc option, it allows maximum flexibility in making decisions
|
||||||
# as whether or not to use the asciidoc package. When DEFAULT is not specified,
|
# as whether or not to use the asciidoc package. When DEFAULT is not specified,
|
||||||
# --with-asciidoc assumes 'auto'.
|
# --with-asciidoc assumes 'auto'.
|
||||||
#
|
#
|
||||||
@@ -1970,7 +1970,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
|||||||
# Documentation tools are not always available on all platforms and sometimes
|
# Documentation tools are not always available on all platforms and sometimes
|
||||||
# not at the appropriate level. This macro enables a module to test for the
|
# not at the appropriate level. This macro enables a module to test for the
|
||||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||||
# the --with-doxygen option, it allows maximum flexibilty in making decisions
|
# the --with-doxygen option, it allows maximum flexibility in making decisions
|
||||||
# as whether or not to use the doxygen package. When DEFAULT is not specified,
|
# as whether or not to use the doxygen package. When DEFAULT is not specified,
|
||||||
# --with-doxygen assumes 'auto'.
|
# --with-doxygen assumes 'auto'.
|
||||||
#
|
#
|
||||||
@@ -2054,7 +2054,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
|||||||
# Documentation tools are not always available on all platforms and sometimes
|
# Documentation tools are not always available on all platforms and sometimes
|
||||||
# not at the appropriate level. This macro enables a module to test for the
|
# not at the appropriate level. This macro enables a module to test for the
|
||||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||||
# the --with-groff option, it allows maximum flexibilty in making decisions
|
# the --with-groff option, it allows maximum flexibility in making decisions
|
||||||
# as whether or not to use the groff package. When DEFAULT is not specified,
|
# as whether or not to use the groff package. When DEFAULT is not specified,
|
||||||
# --with-groff assumes 'auto'.
|
# --with-groff assumes 'auto'.
|
||||||
#
|
#
|
||||||
@@ -2162,7 +2162,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
|
|||||||
# Documentation tools are not always available on all platforms and sometimes
|
# Documentation tools are not always available on all platforms and sometimes
|
||||||
# not at the appropriate level. This macro enables a module to test for the
|
# not at the appropriate level. This macro enables a module to test for the
|
||||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||||
# the --with-fop option, it allows maximum flexibilty in making decisions
|
# the --with-fop option, it allows maximum flexibility in making decisions
|
||||||
# as whether or not to use the fop package. When DEFAULT is not specified,
|
# as whether or not to use the fop package. When DEFAULT is not specified,
|
||||||
# --with-fop assumes 'auto'.
|
# --with-fop assumes 'auto'.
|
||||||
#
|
#
|
||||||
@@ -2256,7 +2256,7 @@ AC_SUBST([M4], [$ac_cv_path_M4])
|
|||||||
# Documentation tools are not always available on all platforms and sometimes
|
# Documentation tools are not always available on all platforms and sometimes
|
||||||
# not at the appropriate level. This macro enables a module to test for the
|
# not at the appropriate level. This macro enables a module to test for the
|
||||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||||
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
|
# the --with-ps2pdf option, it allows maximum flexibility in making decisions
|
||||||
# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
|
# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
|
||||||
# --with-ps2pdf assumes 'auto'.
|
# --with-ps2pdf assumes 'auto'.
|
||||||
#
|
#
|
||||||
@@ -2311,7 +2311,7 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
|
|||||||
# not at the appropriate level. This macro enables a builder to skip all
|
# not at the appropriate level. This macro enables a builder to skip all
|
||||||
# documentation targets except traditional man pages.
|
# documentation targets except traditional man pages.
|
||||||
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
||||||
# maximum flexibilty in controlling documentation building.
|
# maximum flexibility in controlling documentation building.
|
||||||
# Refer to:
|
# Refer to:
|
||||||
# XORG_WITH_XMLTO --with-xmlto
|
# XORG_WITH_XMLTO --with-xmlto
|
||||||
# XORG_WITH_ASCIIDOC --with-asciidoc
|
# XORG_WITH_ASCIIDOC --with-asciidoc
|
||||||
@@ -2344,7 +2344,7 @@ AC_MSG_RESULT([$build_docs])
|
|||||||
#
|
#
|
||||||
# This macro enables a builder to skip all developer documentation.
|
# This macro enables a builder to skip all developer documentation.
|
||||||
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
||||||
# maximum flexibilty in controlling documentation building.
|
# maximum flexibility in controlling documentation building.
|
||||||
# Refer to:
|
# Refer to:
|
||||||
# XORG_WITH_XMLTO --with-xmlto
|
# XORG_WITH_XMLTO --with-xmlto
|
||||||
# XORG_WITH_ASCIIDOC --with-asciidoc
|
# XORG_WITH_ASCIIDOC --with-asciidoc
|
||||||
@@ -2377,7 +2377,7 @@ AC_MSG_RESULT([$build_devel_docs])
|
|||||||
#
|
#
|
||||||
# This macro enables a builder to skip all functional specification targets.
|
# This macro enables a builder to skip all functional specification targets.
|
||||||
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
# Combined with the specific tool checking macros XORG_WITH_*, it provides
|
||||||
# maximum flexibilty in controlling documentation building.
|
# maximum flexibility in controlling documentation building.
|
||||||
# Refer to:
|
# Refer to:
|
||||||
# XORG_WITH_XMLTO --with-xmlto
|
# XORG_WITH_XMLTO --with-xmlto
|
||||||
# XORG_WITH_ASCIIDOC --with-asciidoc
|
# XORG_WITH_ASCIIDOC --with-asciidoc
|
||||||
@@ -2852,7 +2852,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
|||||||
AC_DEFUN([XORG_COMPILER_BRAND], [
|
AC_DEFUN([XORG_COMPILER_BRAND], [
|
||||||
AC_LANG_CASE(
|
AC_LANG_CASE(
|
||||||
[C], [
|
[C], [
|
||||||
AC_REQUIRE([AC_PROG_CC_C99])
|
dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC
|
||||||
|
dnl and complains that AC_PROG_CC_C99 is obsolete
|
||||||
|
m4_version_prereq([2.70],
|
||||||
|
[AC_REQUIRE([AC_PROG_CC])],
|
||||||
|
[AC_REQUIRE([AC_PROG_CC_C99])])
|
||||||
],
|
],
|
||||||
[C++], [
|
[C++], [
|
||||||
AC_REQUIRE([AC_PROG_CXX])
|
AC_REQUIRE([AC_PROG_CXX])
|
||||||
@@ -2868,7 +2872,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
|||||||
# Minimum version: 1.16.0
|
# Minimum version: 1.16.0
|
||||||
#
|
#
|
||||||
# Test if the compiler works when passed the given flag as a command line argument.
|
# Test if the compiler works when passed the given flag as a command line argument.
|
||||||
# If it succeeds, the flag is appeneded to the given variable. If not, it tries the
|
# If it succeeds, the flag is appended to the given variable. If not, it tries the
|
||||||
# next flag in the list until there are no more options.
|
# next flag in the list until there are no more options.
|
||||||
#
|
#
|
||||||
# Note that this does not guarantee that the compiler supports the flag as some
|
# Note that this does not guarantee that the compiler supports the flag as some
|
||||||
@@ -2884,7 +2888,11 @@ AC_LANG_COMPILER_REQUIRE
|
|||||||
|
|
||||||
AC_LANG_CASE(
|
AC_LANG_CASE(
|
||||||
[C], [
|
[C], [
|
||||||
AC_REQUIRE([AC_PROG_CC_C99])
|
dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC
|
||||||
|
dnl and complains that AC_PROG_CC_C99 is obsolete
|
||||||
|
m4_version_prereq([2.70],
|
||||||
|
[AC_REQUIRE([AC_PROG_CC])],
|
||||||
|
[AC_REQUIRE([AC_PROG_CC_C99])])
|
||||||
define([PREFIX], [C])
|
define([PREFIX], [C])
|
||||||
define([CACHE_PREFIX], [cc])
|
define([CACHE_PREFIX], [cc])
|
||||||
define([COMPILER], [$CC])
|
define([COMPILER], [$CC])
|
||||||
@@ -3025,7 +3033,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
|||||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
|
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
|
||||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||||
|
|
||||||
# Turn some warnings into errors, so we don't accidently get successful builds
|
# Turn some warnings into errors, so we don't accidentally get successful builds
|
||||||
# when there are problems that should be fixed.
|
# when there are problems that should be fixed.
|
||||||
|
|
||||||
if test "x$SELECTIVE_WERROR" = "xyes" ; then
|
if test "x$SELECTIVE_WERROR" = "xyes" ; then
|
||||||
@@ -3134,23 +3142,35 @@ AC_SUBST([BASE_]PREFIX[FLAGS])
|
|||||||
AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS]))
|
AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS]))
|
||||||
]) # XORG_STRICT_OPTION
|
]) # XORG_STRICT_OPTION
|
||||||
|
|
||||||
# XORG_DEFAULT_OPTIONS
|
# XORG_DEFAULT_NOCODE_OPTIONS
|
||||||
# --------------------
|
# ---------------------------
|
||||||
# Minimum version: 1.3.0
|
# Minimum version: 1.20.0
|
||||||
#
|
#
|
||||||
# Defines default options for X.Org modules.
|
# Defines default options for X.Org modules which don't compile code,
|
||||||
|
# such as fonts, bitmaps, cursors, and docs.
|
||||||
#
|
#
|
||||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [
|
||||||
AC_REQUIRE([AC_PROG_INSTALL])
|
AC_REQUIRE([AC_PROG_INSTALL])
|
||||||
XORG_COMPILER_FLAGS
|
|
||||||
XORG_CWARNFLAGS
|
|
||||||
XORG_STRICT_OPTION
|
|
||||||
XORG_RELEASE_VERSION
|
XORG_RELEASE_VERSION
|
||||||
XORG_CHANGELOG
|
XORG_CHANGELOG
|
||||||
XORG_INSTALL
|
XORG_INSTALL
|
||||||
XORG_MANPAGE_SECTIONS
|
XORG_MANPAGE_SECTIONS
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
|
||||||
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
|
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
|
||||||
|
]) # XORG_DEFAULT_NOCODE_OPTIONS
|
||||||
|
|
||||||
|
# XORG_DEFAULT_OPTIONS
|
||||||
|
# --------------------
|
||||||
|
# Minimum version: 1.3.0
|
||||||
|
#
|
||||||
|
# Defines default options for X.Org modules which compile code.
|
||||||
|
#
|
||||||
|
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||||
|
AC_REQUIRE([AC_PROG_INSTALL])
|
||||||
|
XORG_COMPILER_FLAGS
|
||||||
|
XORG_CWARNFLAGS
|
||||||
|
XORG_STRICT_OPTION
|
||||||
|
XORG_DEFAULT_NOCODE_OPTIONS
|
||||||
]) # XORG_DEFAULT_OPTIONS
|
]) # XORG_DEFAULT_OPTIONS
|
||||||
|
|
||||||
# XORG_INSTALL()
|
# XORG_INSTALL()
|
||||||
|
|||||||
@@ -3,12 +3,12 @@
|
|||||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||||
#undef HAVE_INTTYPES_H
|
#undef HAVE_INTTYPES_H
|
||||||
|
|
||||||
/* Define to 1 if you have the <memory.h> header file. */
|
|
||||||
#undef HAVE_MEMORY_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdint.h> header file. */
|
/* Define to 1 if you have the <stdint.h> header file. */
|
||||||
#undef HAVE_STDINT_H
|
#undef HAVE_STDINT_H
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <stdio.h> header file. */
|
||||||
|
#undef HAVE_STDIO_H
|
||||||
|
|
||||||
/* 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
|
||||||
|
|
||||||
@@ -57,7 +57,9 @@
|
|||||||
/* Patch version of this package */
|
/* Patch version of this package */
|
||||||
#undef PACKAGE_VERSION_PATCHLEVEL
|
#undef PACKAGE_VERSION_PATCHLEVEL
|
||||||
|
|
||||||
/* Define to 1 if you have the ANSI C header files. */
|
/* Define to 1 if all of the C90 standard headers exist (not just the ones
|
||||||
|
required in a freestanding environment). This macro is provided for
|
||||||
|
backward compatibility; new code need not use it. */
|
||||||
#undef STDC_HEADERS
|
#undef STDC_HEADERS
|
||||||
|
|
||||||
/* Version number of package */
|
/* Version number of package */
|
||||||
|
|||||||
6430
app/listres/configure
vendored
6430
app/listres/configure
vendored
File diff suppressed because it is too large
Load Diff
@@ -23,8 +23,8 @@ dnl Process this file with autoconf to create configure.
|
|||||||
|
|
||||||
# Initialize Autoconf
|
# Initialize Autoconf
|
||||||
AC_PREREQ([2.60])
|
AC_PREREQ([2.60])
|
||||||
AC_INIT(listres, [1.0.5],
|
AC_INIT(listres, [1.0.6],
|
||||||
[https://gitlab.freedesktop.org/xorg/app/listres/issues], listres)
|
[https://gitlab.freedesktop.org/xorg/app/listres/-/issues], [listres])
|
||||||
AC_CONFIG_SRCDIR([Makefile.am])
|
AC_CONFIG_SRCDIR([Makefile.am])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# install - install a program, script, or datafile
|
# install - install a program, script, or datafile
|
||||||
|
|
||||||
scriptversion=2011-11-20.07; # UTC
|
scriptversion=2020-11-14.01; # UTC
|
||||||
|
|
||||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||||
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
|
|||||||
# This script is compatible with the BSD install script, but was written
|
# This script is compatible with the BSD install script, but was written
|
||||||
# from scratch.
|
# from scratch.
|
||||||
|
|
||||||
|
tab=' '
|
||||||
nl='
|
nl='
|
||||||
'
|
'
|
||||||
IFS=" "" $nl"
|
IFS=" $tab$nl"
|
||||||
|
|
||||||
# set DOITPROG to echo to test this script
|
# Set DOITPROG to "echo" to test this script.
|
||||||
|
|
||||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
|
||||||
doit=${DOITPROG-}
|
doit=${DOITPROG-}
|
||||||
if test -z "$doit"; then
|
doit_exec=${doit:-exec}
|
||||||
doit_exec=exec
|
|
||||||
else
|
|
||||||
doit_exec=$doit
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Put in absolute file names if you don't have them in your path;
|
# Put in absolute file names if you don't have them in your path;
|
||||||
# or use environment vars.
|
# or use environment vars.
|
||||||
@@ -68,22 +64,16 @@ mvprog=${MVPROG-mv}
|
|||||||
rmprog=${RMPROG-rm}
|
rmprog=${RMPROG-rm}
|
||||||
stripprog=${STRIPPROG-strip}
|
stripprog=${STRIPPROG-strip}
|
||||||
|
|
||||||
posix_glob='?'
|
|
||||||
initialize_posix_glob='
|
|
||||||
test "$posix_glob" != "?" || {
|
|
||||||
if (set -f) 2>/dev/null; then
|
|
||||||
posix_glob=
|
|
||||||
else
|
|
||||||
posix_glob=:
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
'
|
|
||||||
|
|
||||||
posix_mkdir=
|
posix_mkdir=
|
||||||
|
|
||||||
# Desired mode of installed file.
|
# Desired mode of installed file.
|
||||||
mode=0755
|
mode=0755
|
||||||
|
|
||||||
|
# Create dirs (including intermediate dirs) using mode 755.
|
||||||
|
# This is like GNU 'install' as of coreutils 8.32 (2020).
|
||||||
|
mkdir_umask=22
|
||||||
|
|
||||||
|
backupsuffix=
|
||||||
chgrpcmd=
|
chgrpcmd=
|
||||||
chmodcmd=$chmodprog
|
chmodcmd=$chmodprog
|
||||||
chowncmd=
|
chowncmd=
|
||||||
@@ -97,7 +87,7 @@ dir_arg=
|
|||||||
dst_arg=
|
dst_arg=
|
||||||
|
|
||||||
copy_on_change=false
|
copy_on_change=false
|
||||||
no_target_directory=
|
is_target_a_directory=possibly
|
||||||
|
|
||||||
usage="\
|
usage="\
|
||||||
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||||
@@ -114,18 +104,28 @@ Options:
|
|||||||
--version display version info and exit.
|
--version display version info and exit.
|
||||||
|
|
||||||
-c (ignored)
|
-c (ignored)
|
||||||
-C install only if different (preserve the last data modification time)
|
-C install only if different (preserve data modification time)
|
||||||
-d create directories instead of installing files.
|
-d create directories instead of installing files.
|
||||||
-g GROUP $chgrpprog installed files to GROUP.
|
-g GROUP $chgrpprog installed files to GROUP.
|
||||||
-m MODE $chmodprog installed files to MODE.
|
-m MODE $chmodprog installed files to MODE.
|
||||||
-o USER $chownprog installed files to USER.
|
-o USER $chownprog installed files to USER.
|
||||||
|
-p pass -p to $cpprog.
|
||||||
-s $stripprog installed files.
|
-s $stripprog installed files.
|
||||||
|
-S SUFFIX attempt to back up existing files, with suffix SUFFIX.
|
||||||
-t DIRECTORY install into DIRECTORY.
|
-t DIRECTORY install into DIRECTORY.
|
||||||
-T report an error if DSTFILE is a directory.
|
-T report an error if DSTFILE is a directory.
|
||||||
|
|
||||||
Environment variables override the default commands:
|
Environment variables override the default commands:
|
||||||
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
||||||
RMPROG STRIPPROG
|
RMPROG STRIPPROG
|
||||||
|
|
||||||
|
By default, rm is invoked with -f; when overridden with RMPROG,
|
||||||
|
it's up to you to specify -f if you want it.
|
||||||
|
|
||||||
|
If -S is not specified, no backups are attempted.
|
||||||
|
|
||||||
|
Email bug reports to bug-automake@gnu.org.
|
||||||
|
Automake home page: https://www.gnu.org/software/automake/
|
||||||
"
|
"
|
||||||
|
|
||||||
while test $# -ne 0; do
|
while test $# -ne 0; do
|
||||||
@@ -137,46 +137,62 @@ while test $# -ne 0; do
|
|||||||
-d) dir_arg=true;;
|
-d) dir_arg=true;;
|
||||||
|
|
||||||
-g) chgrpcmd="$chgrpprog $2"
|
-g) chgrpcmd="$chgrpprog $2"
|
||||||
shift;;
|
shift;;
|
||||||
|
|
||||||
--help) echo "$usage"; exit $?;;
|
--help) echo "$usage"; exit $?;;
|
||||||
|
|
||||||
-m) mode=$2
|
-m) mode=$2
|
||||||
case $mode in
|
case $mode in
|
||||||
*' '* | *' '* | *'
|
*' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
|
||||||
'* | *'*'* | *'?'* | *'['*)
|
echo "$0: invalid mode: $mode" >&2
|
||||||
echo "$0: invalid mode: $mode" >&2
|
exit 1;;
|
||||||
exit 1;;
|
esac
|
||||||
esac
|
shift;;
|
||||||
shift;;
|
|
||||||
|
|
||||||
-o) chowncmd="$chownprog $2"
|
-o) chowncmd="$chownprog $2"
|
||||||
shift;;
|
shift;;
|
||||||
|
|
||||||
|
-p) cpprog="$cpprog -p";;
|
||||||
|
|
||||||
-s) stripcmd=$stripprog;;
|
-s) stripcmd=$stripprog;;
|
||||||
|
|
||||||
-t) dst_arg=$2
|
-S) backupsuffix="$2"
|
||||||
# Protect names problematic for 'test' and other utilities.
|
shift;;
|
||||||
case $dst_arg in
|
|
||||||
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
|
||||||
esac
|
|
||||||
shift;;
|
|
||||||
|
|
||||||
-T) no_target_directory=true;;
|
-t)
|
||||||
|
is_target_a_directory=always
|
||||||
|
dst_arg=$2
|
||||||
|
# Protect names problematic for 'test' and other utilities.
|
||||||
|
case $dst_arg in
|
||||||
|
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
||||||
|
esac
|
||||||
|
shift;;
|
||||||
|
|
||||||
|
-T) is_target_a_directory=never;;
|
||||||
|
|
||||||
--version) echo "$0 $scriptversion"; exit $?;;
|
--version) echo "$0 $scriptversion"; exit $?;;
|
||||||
|
|
||||||
--) shift
|
--) shift
|
||||||
break;;
|
break;;
|
||||||
|
|
||||||
-*) echo "$0: invalid option: $1" >&2
|
-*) echo "$0: invalid option: $1" >&2
|
||||||
exit 1;;
|
exit 1;;
|
||||||
|
|
||||||
*) break;;
|
*) break;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# We allow the use of options -d and -T together, by making -d
|
||||||
|
# take the precedence; this is for compatibility with GNU install.
|
||||||
|
|
||||||
|
if test -n "$dir_arg"; then
|
||||||
|
if test -n "$dst_arg"; then
|
||||||
|
echo "$0: target directory not allowed when installing a directory." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||||
# When -d is used, all remaining arguments are directories to create.
|
# When -d is used, all remaining arguments are directories to create.
|
||||||
# When -t is used, the destination is already specified.
|
# When -t is used, the destination is already specified.
|
||||||
@@ -207,6 +223,15 @@ if test $# -eq 0; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test -z "$dir_arg"; then
|
||||||
|
if test $# -gt 1 || test "$is_target_a_directory" = always; then
|
||||||
|
if test ! -d "$dst_arg"; then
|
||||||
|
echo "$0: $dst_arg: Is not a directory." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if test -z "$dir_arg"; then
|
if test -z "$dir_arg"; then
|
||||||
do_exit='(exit $ret); exit $ret'
|
do_exit='(exit $ret); exit $ret'
|
||||||
trap "ret=129; $do_exit" 1
|
trap "ret=129; $do_exit" 1
|
||||||
@@ -223,16 +248,16 @@ if test -z "$dir_arg"; then
|
|||||||
|
|
||||||
*[0-7])
|
*[0-7])
|
||||||
if test -z "$stripcmd"; then
|
if test -z "$stripcmd"; then
|
||||||
u_plus_rw=
|
u_plus_rw=
|
||||||
else
|
else
|
||||||
u_plus_rw='% 200'
|
u_plus_rw='% 200'
|
||||||
fi
|
fi
|
||||||
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
|
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
|
||||||
*)
|
*)
|
||||||
if test -z "$stripcmd"; then
|
if test -z "$stripcmd"; then
|
||||||
u_plus_rw=
|
u_plus_rw=
|
||||||
else
|
else
|
||||||
u_plus_rw=,u+rw
|
u_plus_rw=,u+rw
|
||||||
fi
|
fi
|
||||||
cp_umask=$mode$u_plus_rw;;
|
cp_umask=$mode$u_plus_rw;;
|
||||||
esac
|
esac
|
||||||
@@ -250,6 +275,10 @@ do
|
|||||||
dstdir=$dst
|
dstdir=$dst
|
||||||
test -d "$dstdir"
|
test -d "$dstdir"
|
||||||
dstdir_status=$?
|
dstdir_status=$?
|
||||||
|
# Don't chown directories that already exist.
|
||||||
|
if test $dstdir_status = 0; then
|
||||||
|
chowncmd=""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
|
|
||||||
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
||||||
@@ -266,178 +295,148 @@ do
|
|||||||
fi
|
fi
|
||||||
dst=$dst_arg
|
dst=$dst_arg
|
||||||
|
|
||||||
# If destination is a directory, append the input filename; won't work
|
# If destination is a directory, append the input filename.
|
||||||
# if double slashes aren't ignored.
|
|
||||||
if test -d "$dst"; then
|
if test -d "$dst"; then
|
||||||
if test -n "$no_target_directory"; then
|
if test "$is_target_a_directory" = never; then
|
||||||
echo "$0: $dst_arg: Is a directory" >&2
|
echo "$0: $dst_arg: Is a directory" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
dstdir=$dst
|
dstdir=$dst
|
||||||
dst=$dstdir/`basename "$src"`
|
dstbase=`basename "$src"`
|
||||||
|
case $dst in
|
||||||
|
*/) dst=$dst$dstbase;;
|
||||||
|
*) dst=$dst/$dstbase;;
|
||||||
|
esac
|
||||||
dstdir_status=0
|
dstdir_status=0
|
||||||
else
|
else
|
||||||
# Prefer dirname, but fall back on a substitute if dirname fails.
|
dstdir=`dirname "$dst"`
|
||||||
dstdir=`
|
|
||||||
(dirname "$dst") 2>/dev/null ||
|
|
||||||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
||||||
X"$dst" : 'X\(//\)[^/]' \| \
|
|
||||||
X"$dst" : 'X\(//\)$' \| \
|
|
||||||
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
|
|
||||||
echo X"$dst" |
|
|
||||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\/\)[^/].*/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\/\)$/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\).*/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
s/.*/./; q'
|
|
||||||
`
|
|
||||||
|
|
||||||
test -d "$dstdir"
|
test -d "$dstdir"
|
||||||
dstdir_status=$?
|
dstdir_status=$?
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case $dstdir in
|
||||||
|
*/) dstdirslash=$dstdir;;
|
||||||
|
*) dstdirslash=$dstdir/;;
|
||||||
|
esac
|
||||||
|
|
||||||
obsolete_mkdir_used=false
|
obsolete_mkdir_used=false
|
||||||
|
|
||||||
if test $dstdir_status != 0; then
|
if test $dstdir_status != 0; then
|
||||||
case $posix_mkdir in
|
case $posix_mkdir in
|
||||||
'')
|
'')
|
||||||
# Create intermediate dirs using mode 755 as modified by the umask.
|
# With -d, create the new directory with the user-specified mode.
|
||||||
# This is like FreeBSD 'install' as of 1997-10-28.
|
# Otherwise, rely on $mkdir_umask.
|
||||||
umask=`umask`
|
if test -n "$dir_arg"; then
|
||||||
case $stripcmd.$umask in
|
mkdir_mode=-m$mode
|
||||||
# Optimize common cases.
|
else
|
||||||
*[2367][2367]) mkdir_umask=$umask;;
|
mkdir_mode=
|
||||||
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
|
fi
|
||||||
|
|
||||||
*[0-7])
|
posix_mkdir=false
|
||||||
mkdir_umask=`expr $umask + 22 \
|
# The $RANDOM variable is not portable (e.g., dash). Use it
|
||||||
- $umask % 100 % 40 + $umask % 20 \
|
# here however when possible just to lower collision chance.
|
||||||
- $umask % 10 % 4 + $umask % 2
|
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
||||||
`;;
|
|
||||||
*) mkdir_umask=$umask,go-w;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# With -d, create the new directory with the user-specified mode.
|
trap '
|
||||||
# Otherwise, rely on $mkdir_umask.
|
ret=$?
|
||||||
if test -n "$dir_arg"; then
|
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
|
||||||
mkdir_mode=-m$mode
|
exit $ret
|
||||||
|
' 0
|
||||||
|
|
||||||
|
# Because "mkdir -p" follows existing symlinks and we likely work
|
||||||
|
# directly in world-writeable /tmp, make sure that the '$tmpdir'
|
||||||
|
# directory is successfully created first before we actually test
|
||||||
|
# 'mkdir -p'.
|
||||||
|
if (umask $mkdir_umask &&
|
||||||
|
$mkdirprog $mkdir_mode "$tmpdir" &&
|
||||||
|
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
if test -z "$dir_arg" || {
|
||||||
|
# Check for POSIX incompatibilities with -m.
|
||||||
|
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
||||||
|
# other-writable bit of parent directory when it shouldn't.
|
||||||
|
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
||||||
|
test_tmpdir="$tmpdir/a"
|
||||||
|
ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
|
||||||
|
case $ls_ld_tmpdir in
|
||||||
|
d????-?r-*) different_mode=700;;
|
||||||
|
d????-?--*) different_mode=755;;
|
||||||
|
*) false;;
|
||||||
|
esac &&
|
||||||
|
$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
|
||||||
|
ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
|
||||||
|
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
then posix_mkdir=:
|
||||||
|
fi
|
||||||
|
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
|
||||||
else
|
else
|
||||||
mkdir_mode=
|
# Remove any dirs left behind by ancient mkdir implementations.
|
||||||
|
rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
|
||||||
fi
|
fi
|
||||||
|
trap '' 0;;
|
||||||
posix_mkdir=false
|
|
||||||
case $umask in
|
|
||||||
*[123567][0-7][0-7])
|
|
||||||
# POSIX mkdir -p sets u+wx bits regardless of umask, which
|
|
||||||
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
|
||||||
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
|
|
||||||
|
|
||||||
if (umask $mkdir_umask &&
|
|
||||||
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
if test -z "$dir_arg" || {
|
|
||||||
# Check for POSIX incompatibilities with -m.
|
|
||||||
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
|
||||||
# other-writable bit of parent directory when it shouldn't.
|
|
||||||
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
|
||||||
ls_ld_tmpdir=`ls -ld "$tmpdir"`
|
|
||||||
case $ls_ld_tmpdir in
|
|
||||||
d????-?r-*) different_mode=700;;
|
|
||||||
d????-?--*) different_mode=755;;
|
|
||||||
*) false;;
|
|
||||||
esac &&
|
|
||||||
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
|
||||||
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
|
|
||||||
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
then posix_mkdir=:
|
|
||||||
fi
|
|
||||||
rmdir "$tmpdir/d" "$tmpdir"
|
|
||||||
else
|
|
||||||
# Remove any dirs left behind by ancient mkdir implementations.
|
|
||||||
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
|
|
||||||
fi
|
|
||||||
trap '' 0;;
|
|
||||||
esac;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if
|
if
|
||||||
$posix_mkdir && (
|
$posix_mkdir && (
|
||||||
umask $mkdir_umask &&
|
umask $mkdir_umask &&
|
||||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
|
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
|
||||||
)
|
)
|
||||||
then :
|
then :
|
||||||
else
|
else
|
||||||
|
|
||||||
# The umask is ridiculous, or mkdir does not conform to POSIX,
|
# mkdir does not conform to POSIX,
|
||||||
# or it failed possibly due to a race condition. Create the
|
# or it failed possibly due to a race condition. Create the
|
||||||
# directory the slow way, step by step, checking for races as we go.
|
# directory the slow way, step by step, checking for races as we go.
|
||||||
|
|
||||||
case $dstdir in
|
case $dstdir in
|
||||||
/*) prefix='/';;
|
/*) prefix='/';;
|
||||||
[-=\(\)!]*) prefix='./';;
|
[-=\(\)!]*) prefix='./';;
|
||||||
*) prefix='';;
|
*) prefix='';;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
eval "$initialize_posix_glob"
|
|
||||||
|
|
||||||
oIFS=$IFS
|
oIFS=$IFS
|
||||||
IFS=/
|
IFS=/
|
||||||
$posix_glob set -f
|
set -f
|
||||||
set fnord $dstdir
|
set fnord $dstdir
|
||||||
shift
|
shift
|
||||||
$posix_glob set +f
|
set +f
|
||||||
IFS=$oIFS
|
IFS=$oIFS
|
||||||
|
|
||||||
prefixes=
|
prefixes=
|
||||||
|
|
||||||
for d
|
for d
|
||||||
do
|
do
|
||||||
test X"$d" = X && continue
|
test X"$d" = X && continue
|
||||||
|
|
||||||
prefix=$prefix$d
|
prefix=$prefix$d
|
||||||
if test -d "$prefix"; then
|
if test -d "$prefix"; then
|
||||||
prefixes=
|
prefixes=
|
||||||
else
|
else
|
||||||
if $posix_mkdir; then
|
if $posix_mkdir; then
|
||||||
(umask=$mkdir_umask &&
|
(umask $mkdir_umask &&
|
||||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
|
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
|
||||||
# Don't fail if two instances are running concurrently.
|
# Don't fail if two instances are running concurrently.
|
||||||
test -d "$prefix" || exit 1
|
test -d "$prefix" || exit 1
|
||||||
else
|
else
|
||||||
case $prefix in
|
case $prefix in
|
||||||
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
|
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
|
||||||
*) qprefix=$prefix;;
|
*) qprefix=$prefix;;
|
||||||
esac
|
esac
|
||||||
prefixes="$prefixes '$qprefix'"
|
prefixes="$prefixes '$qprefix'"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
prefix=$prefix/
|
prefix=$prefix/
|
||||||
done
|
done
|
||||||
|
|
||||||
if test -n "$prefixes"; then
|
if test -n "$prefixes"; then
|
||||||
# Don't fail if two instances are running concurrently.
|
# Don't fail if two instances are running concurrently.
|
||||||
(umask $mkdir_umask &&
|
(umask $mkdir_umask &&
|
||||||
eval "\$doit_exec \$mkdirprog $prefixes") ||
|
eval "\$doit_exec \$mkdirprog $prefixes") ||
|
||||||
test -d "$dstdir" || exit 1
|
test -d "$dstdir" || exit 1
|
||||||
obsolete_mkdir_used=true
|
obsolete_mkdir_used=true
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -450,14 +449,25 @@ do
|
|||||||
else
|
else
|
||||||
|
|
||||||
# Make a couple of temp file names in the proper directory.
|
# Make a couple of temp file names in the proper directory.
|
||||||
dsttmp=$dstdir/_inst.$$_
|
dsttmp=${dstdirslash}_inst.$$_
|
||||||
rmtmp=$dstdir/_rm.$$_
|
rmtmp=${dstdirslash}_rm.$$_
|
||||||
|
|
||||||
# Trap to clean up those temp files at exit.
|
# Trap to clean up those temp files at exit.
|
||||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
||||||
|
|
||||||
# Copy the file name to the temp name.
|
# Copy the file name to the temp name.
|
||||||
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
|
(umask $cp_umask &&
|
||||||
|
{ test -z "$stripcmd" || {
|
||||||
|
# Create $dsttmp read-write so that cp doesn't create it read-only,
|
||||||
|
# which would cause strip to fail.
|
||||||
|
if test -z "$doit"; then
|
||||||
|
: >"$dsttmp" # No need to fork-exec 'touch'.
|
||||||
|
else
|
||||||
|
$doit touch "$dsttmp"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
} &&
|
||||||
|
$doit_exec $cpprog "$src" "$dsttmp") &&
|
||||||
|
|
||||||
# and set any options; do chmod last to preserve setuid bits.
|
# and set any options; do chmod last to preserve setuid bits.
|
||||||
#
|
#
|
||||||
@@ -472,20 +482,24 @@ do
|
|||||||
|
|
||||||
# If -C, don't bother to copy if it wouldn't change the file.
|
# If -C, don't bother to copy if it wouldn't change the file.
|
||||||
if $copy_on_change &&
|
if $copy_on_change &&
|
||||||
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
||||||
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
||||||
|
set -f &&
|
||||||
eval "$initialize_posix_glob" &&
|
|
||||||
$posix_glob set -f &&
|
|
||||||
set X $old && old=:$2:$4:$5:$6 &&
|
set X $old && old=:$2:$4:$5:$6 &&
|
||||||
set X $new && new=:$2:$4:$5:$6 &&
|
set X $new && new=:$2:$4:$5:$6 &&
|
||||||
$posix_glob set +f &&
|
set +f &&
|
||||||
|
|
||||||
test "$old" = "$new" &&
|
test "$old" = "$new" &&
|
||||||
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
||||||
then
|
then
|
||||||
rm -f "$dsttmp"
|
rm -f "$dsttmp"
|
||||||
else
|
else
|
||||||
|
# If $backupsuffix is set, and the file being installed
|
||||||
|
# already exists, attempt a backup. Don't worry if it fails,
|
||||||
|
# e.g., if mv doesn't support -f.
|
||||||
|
if test -n "$backupsuffix" && test -f "$dst"; then
|
||||||
|
$doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
# Rename the file to the real destination.
|
# Rename the file to the real destination.
|
||||||
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
||||||
|
|
||||||
@@ -493,24 +507,24 @@ do
|
|||||||
# to itself, or perhaps because mv is so ancient that it does not
|
# to itself, or perhaps because mv is so ancient that it does not
|
||||||
# support -f.
|
# support -f.
|
||||||
{
|
{
|
||||||
# Now remove or move aside any old file at destination location.
|
# Now remove or move aside any old file at destination location.
|
||||||
# We try this two ways since rm can't unlink itself on some
|
# We try this two ways since rm can't unlink itself on some
|
||||||
# systems and the destination file might be busy for other
|
# systems and the destination file might be busy for other
|
||||||
# reasons. In this case, the final cleanup might fail but the new
|
# reasons. In this case, the final cleanup might fail but the new
|
||||||
# file should still install successfully.
|
# file should still install successfully.
|
||||||
{
|
{
|
||||||
test ! -f "$dst" ||
|
test ! -f "$dst" ||
|
||||||
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
$doit $rmcmd "$dst" 2>/dev/null ||
|
||||||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
||||||
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
{ $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
|
||||||
} ||
|
} ||
|
||||||
{ echo "$0: cannot unlink or rename $dst" >&2
|
{ echo "$0: cannot unlink or rename $dst" >&2
|
||||||
(exit 1); exit 1
|
(exit 1); exit 1
|
||||||
}
|
}
|
||||||
} &&
|
} &&
|
||||||
|
|
||||||
# Now rename the file to the real destination.
|
# Now rename the file to the real destination.
|
||||||
$doit $mvcmd "$dsttmp" "$dst"
|
$doit $mvcmd "$dsttmp" "$dst"
|
||||||
}
|
}
|
||||||
fi || exit 1
|
fi || exit 1
|
||||||
|
|
||||||
@@ -519,9 +533,9 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
# Local variables:
|
# Local variables:
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||||
# time-stamp-start: "scriptversion="
|
# time-stamp-start: "scriptversion="
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
# time-stamp-time-zone: "UTC"
|
# time-stamp-time-zone: "UTC0"
|
||||||
# time-stamp-end: "; # UTC"
|
# time-stamp-end: "; # UTC"
|
||||||
# End:
|
# End:
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ in this Software without prior written authorization from the X Consortium.
|
|||||||
*/
|
*/
|
||||||
/* $XFree86: xc/programs/listres/listres.c,v 1.3 2000/02/17 14:00:32 dawes Exp $ */
|
/* $XFree86: xc/programs/listres/listres.c,v 1.3 2000/02/17 14:00:32 dawes Exp $ */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <X11/Xos.h>
|
#include <X11/Xos.h>
|
||||||
@@ -83,7 +87,7 @@ static XtResource Resources[] = {
|
|||||||
static const char *ProgramName;
|
static const char *ProgramName;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
usage (void)
|
usage (int exitval)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "usage: %s [-options...]\n%s\n", ProgramName,
|
fprintf(stderr, "usage: %s [-options...]\n%s\n", ProgramName,
|
||||||
"\nwhere options include:\n"
|
"\nwhere options include:\n"
|
||||||
@@ -92,8 +96,11 @@ usage (void)
|
|||||||
" -nosuper do not print superclass resources\n"
|
" -nosuper do not print superclass resources\n"
|
||||||
" -variable show variable name instead of class name\n"
|
" -variable show variable name instead of class name\n"
|
||||||
" -top name object to be top of tree\n"
|
" -top name object to be top of tree\n"
|
||||||
" -format string printf format for instance, class, type\n");
|
" -format string printf format for instance, class, type\n"
|
||||||
exit (1);
|
" -help print this message and exit\n"
|
||||||
|
" -version print version info and exit\n"
|
||||||
|
);
|
||||||
|
exit (exitval);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_tree_level (register XmuWidgetNode *wn, register int level)
|
static void print_tree_level (register XmuWidgetNode *wn, register int level)
|
||||||
@@ -234,6 +241,22 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
|
XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
|
||||||
|
|
||||||
|
/* Handle args that don't require opening a display */
|
||||||
|
for (int n = 1; n < argc; n++) {
|
||||||
|
const char *argn = argv[n];
|
||||||
|
/* accept single or double dash for -help & -version */
|
||||||
|
if (argn[0] == '-' && argn[1] == '-') {
|
||||||
|
argn++;
|
||||||
|
}
|
||||||
|
if (strcmp(argn, "-help") == 0) {
|
||||||
|
usage(0);
|
||||||
|
}
|
||||||
|
if (strcmp(argn, "-version") == 0) {
|
||||||
|
puts(PACKAGE_STRING);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
toplevel = XtAppInitialize (&appcon, "Listres", Options, XtNumber(Options),
|
toplevel = XtAppInitialize (&appcon, "Listres", Options, XtNumber(Options),
|
||||||
&argc, argv, NULL, NULL, 0);
|
&argc, argv, NULL, NULL, 0);
|
||||||
container = XtCreateWidget ("dummy", widgetClass, toplevel, NULL, ZERO);
|
container = XtCreateWidget ("dummy", widgetClass, toplevel, NULL, ZERO);
|
||||||
@@ -262,13 +285,18 @@ main (int argc, char **argv)
|
|||||||
(Bool) options.show_superclass,
|
(Bool) options.show_superclass,
|
||||||
(Bool) options.show_variable);
|
(Bool) options.show_variable);
|
||||||
}
|
}
|
||||||
} else
|
} else {
|
||||||
usage();
|
fprintf(stderr, "Unknown argument: %s\n", argv[0]);
|
||||||
|
usage(1);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
for (; argc > 0; argc--, argv++) {
|
for (; argc > 0; argc--, argv++) {
|
||||||
XmuWidgetNode *node;
|
XmuWidgetNode *node;
|
||||||
|
|
||||||
if (argv[0][0] == '-') usage ();
|
if (argv[0][0] == '-') {
|
||||||
|
fprintf(stderr, "Unknown argument: %s\n", argv[0]);
|
||||||
|
usage(1);
|
||||||
|
}
|
||||||
node = XmuWnNameToNode (widget_list, nwidgets, *argv);
|
node = XmuWnNameToNode (widget_list, nwidgets, *argv);
|
||||||
if (!node) {
|
if (!node) {
|
||||||
fprintf (stderr, "%s: unable to find widget \"%s\"\n",
|
fprintf (stderr, "%s: unable to find widget \"%s\"\n",
|
||||||
|
|||||||
@@ -125,7 +125,6 @@ CC = @CC@
|
|||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
@@ -136,11 +135,9 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
|||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|||||||
@@ -67,6 +67,12 @@ variable name or the class name. The default is ``core''.
|
|||||||
.B \-format \fIprintf\-string\fP
|
.B \-format \fIprintf\-string\fP
|
||||||
This option specifies the \fIprintf\fP-style format string to be used to print
|
This option specifies the \fIprintf\fP-style format string to be used to print
|
||||||
out the name, instance, class, and type of each resource.
|
out the name, instance, class, and type of each resource.
|
||||||
|
.TP 8
|
||||||
|
.B \-help
|
||||||
|
This option indicates that \fIlistres\fP should print a usage message and exit.
|
||||||
|
.TP 8
|
||||||
|
.B \-version
|
||||||
|
This option indicates that \fIlistres\fP should print version info and exit.
|
||||||
.SH "X DEFAULTS"
|
.SH "X DEFAULTS"
|
||||||
To be written.
|
To be written.
|
||||||
.SH "SEE ALSO"
|
.SH "SEE ALSO"
|
||||||
|
|||||||
Reference in New Issue
Block a user