Hello community, here is the log from the commit of package xhost for openSUSE:Factory checked in at 2013-07-22 15:23:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xhost (Old) and /work/SRC/openSUSE:Factory/.xhost.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xhost" Changes: -------- --- /work/SRC/openSUSE:Factory/xhost/xhost.changes 2012-05-08 12:05:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xhost.new/xhost.changes 2013-07-22 15:23:38.000000000 +0200 @@ -1,0 +2,21 @@ +Sun Jul 21 19:08:28 UTC 2013 - [email protected] + +- Update to version 1.0.6: + + Fix const warning for FamilyLocalHost empty address string. + + Mark argument to nameserver_lost signal handler as unused. + + If SIGALRM isn't available, don't use alarm() to timeout + gethostaddr(), just wait. + + Drop pre-POSIX signal handling support in favor of sigaction(). + + Provide dummy sethostent(),endhostent() for Win32 also. + + Link with winsock for MinGW. + + Use Xwinsock.h on WIN32. + + Fix some integer sign/size conversion warnings flagged by + clang. + + Convert sprintf to snprintf in SECURE_RPC code. + + Move dpy declaration from static to main() function. + + Assume signal handlers return void, as C89 requires. + + Remove unused TLI ("STREAMSCONN") code from xhost. + + Remove unused DECnet ("DNETCONN") code from xhost. +- Add pkgconfig(xproto) BuildRequires: new dependency. + +------------------------------------------------------------------- Old: ---- xhost-1.0.5.tar.bz2 New: ---- xhost-1.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xhost.spec ++++++ --- /var/tmp/diff_new_pack.0ZrUpq/_old 2013-07-22 15:23:38.000000000 +0200 +++ /var/tmp/diff_new_pack.0ZrUpq/_new 2013-07-22 15:23:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xhost # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xhost -Version: 1.0.5 -Release: 1 -License: MIT +Version: 1.0.6 +Release: 0 Summary: Utility to control X server access -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xmuu) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.22 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xhost-1.0.5.tar.bz2 -> xhost-1.0.6.tar.bz2 ++++++ ++++ 7235 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xhost-1.0.5/ChangeLog new/xhost-1.0.6/ChangeLog --- old/xhost-1.0.5/ChangeLog 2012-03-23 05:57:40.000000000 +0100 +++ new/xhost-1.0.6/ChangeLog 2013-07-17 08:21:33.000000000 +0200 @@ -1,3 +1,202 @@ +commit 6c3d341467acd10eafc1462ee94c3efd3a4788ef +Author: Alan Coopersmith <[email protected]> +Date: Tue Jul 16 23:10:37 2013 -0700 + + xhost 1.0.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4ffd1c45709bf8aa41e57d23a5241c4b4817d318 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jun 14 00:02:21 2013 -0700 + + Fix const warning for FamilyLocalHost empty address string + + xhost.c: In function ‘change_host’: + xhost.c:452:13: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e100ad533203fdc0d80078835c557f1bc47954bd +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 2 08:49:40 2013 -0800 + + Mark argument to nameserver_lost signal handler as unused + + Quiets clang warning: + xhost.c:812:21: warning: unused parameter 'sig' [-Wunused-parameter] + nameserver_lost(int sig) + ^ + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 214c90d6b01017fe02675e133129cf389e740533 +Author: Jon TURNEY <[email protected]> +Date: Fri Oct 26 14:48:03 2012 +0100 + + If SIGALRM isn't available, don't use alarm() to timeout gethostaddr(), just wait + + Win32 has neither SIGALRM nor sigaction(), so don't use SIGALRM to timeout + gethostaddr(), just wait + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Colin Harrison <[email protected]> + +commit 19250c1aed852e151bf66819e75f8d796018223b +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 09:47:42 2013 -0800 + + Drop pre-POSIX signal handling support in favor of sigaction() + + X_NOT_POSIX has never been defined by our autoconf scripts, only for a few + platforms in <X11/Xosdefs.h>, of which MinGW seems to be the most relevant + today, and since that doesn't have alarm() it doesn't need this code either. + + First pass was done with 'unifdef -UX_NOT_POSIX', followed by + manual tweaking to adjust indent levels, etc. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Jon TURNEY <[email protected]> + +commit 618eebf5aa99138f6ab3b8a96f93eb422f1a138e +Author: Jon TURNEY <[email protected]> +Date: Fri Oct 26 14:46:51 2012 +0100 + + Provide dummy sethostent(),endhostent() for Win32 also + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Colin Harrison <[email protected]> + +commit 4dc834b5d98a6b07bee7ec8d06ed63efe03d1076 +Author: Jon TURNEY <[email protected]> +Date: Fri Oct 26 14:52:45 2012 +0100 + + Link with winsock for MinGW + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Colin Harrison <[email protected]> + +commit 9316e88c68c2a2189cf90c55e9850d7428bcd356 +Author: Jon TURNEY <[email protected]> +Date: Wed Jan 4 18:25:26 2012 +0000 + + Use Xwinsock.h on WIN32 + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Colin Harrison <[email protected]> + +commit 01433c7bdd169ae8a59ffe79842de55e318bc3b8 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 09:40:22 2013 -0800 + + Fix some integer sign/size conversion warnings flagged by clang + + xhost.c:154:19: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare] + for (i = 0; i < FAMILIES; i++) + ~ ^ ~~~~~~~~ + xhost.c:310:15: warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + namelen = strlen(name); + ~ ^~~~~~~~~~~~ + xhost.c:311:40: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + if ((lname = (char *)malloc(namelen+1)) == NULL) { + ~~~~~~ ~~~~~~~^~ + xhost.c:707:46: warning: implicit conversion changes signedness: 'int' to 'socklen_t' (aka 'unsigned int') [-Wsign-conversion] + getnameinfo((struct sockaddr *) &saddr, saddrlen, inetname, + ~~~~~~~~~~~ ^~~~~~~~ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 59da6b7438ab624593fe4ce52a402755cce25b12 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 08:50:29 2013 -0800 + + Convert sprintf to snprintf in SECURE_RPC code + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a9218c958e992adb727ea5fe45cb04f9ba611de1 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 08:45:48 2013 -0800 + + Move dpy declaration from static to main() function + + Fixes gcc warnings: + xhost.c:290: warning: declaration of 'dpy' shadows a global declaration + xhost.c:160: warning: shadowed declaration is here + xhost.c:839: warning: declaration of 'dpy' shadows a global declaration + xhost.c:160: warning: shadowed declaration is here + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a3f0c2a060f30259dc3830ea8165be15f2aeae75 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 08:38:57 2013 -0800 + + Assume signal handlers return void, as C89 requires + + Drops use of autoconf's obsolete AC_TYPE_SIGNAL and the even more + obsolete Imake SIGNALRETURNSINT. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3911e16aa570ca0709b50727c82df421f1401bd7 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 08:35:24 2013 -0800 + + unifdef -UBAD_ARPAINET + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0a09ff485babcf0d3087b1710f1151bb60ed9263 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 08:34:29 2013 -0800 + + unifdef -Uatt + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit f4ba8fcd272878dcc4a0994640a9457624d899ea +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 08:33:55 2013 -0800 + + unifdef -ULynx + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 830ce053ff5e4f3175bfa59539536b72a847739c +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 08:33:04 2013 -0800 + + unifdef -UCRAY + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a06b486b62d35ac6aca7ecad92226da5d34196a5 +Author: Alan Coopersmith <[email protected]> +Date: Wed Dec 26 23:24:52 2012 -0800 + + Remove unused TLI ("STREAMSCONN") code from xhost + + Has never been converted to build in modular builds, so has been unusable + since X11R7.0 release in 2005. All known platforms with TLI/XTI support + that X11R7 & later releases run on also have (and mostly prefer) BSD + socket support for their networking API. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit c902d69987a893cdf66a83fc7cad9dfd4bc72da0 +Author: Alan Coopersmith <[email protected]> +Date: Wed Dec 26 23:20:58 2012 -0800 + + Remove unused DECnet ("DNETCONN") code from xhost + + Has never been converted to build in modular builds, so has been unusable + since X11R7.0 release in 2005. DNETCONN support was removed from xtrans + back in 2008. + + Performed via "unifdef -UDNETCONN". + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 497ea5c9d998385c4b877ff4e7995d85aefd066b Author: Alan Coopersmith <[email protected]> Date: Thu Mar 22 21:57:16 2012 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xhost-1.0.5/compile new/xhost-1.0.6/compile --- old/xhost-1.0.5/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xhost-1.0.6/compile 2013-07-17 08:10:48.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xhost-1.0.5/configure.ac new/xhost-1.0.6/configure.ac --- old/xhost-1.0.5/configure.ac 2012-03-23 05:57:21.000000000 +0100 +++ new/xhost-1.0.6/configure.ac 2013-07-17 08:10:42.000000000 +0200 @@ -2,7 +2,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xhost], [1.0.5], +AC_INIT([xhost], [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xhost]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -17,11 +17,9 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AC_TYPE_SIGNAL - # Checks for pkg-config packages # - Both CFLAGS & LIBS needed: -PKG_CHECK_MODULES(XHOST, x11 xmuu) +PKG_CHECK_MODULES(XHOST, [xproto >= 7.0.22 x11 xmuu]) # - Only CFLAGS needed, not libs: PKG_CHECK_MODULES(XAU, xau) @@ -31,6 +29,15 @@ # Secure RPC detection macro from xtrans.m4 XTRANS_SECURE_RPC_FLAGS +# Link with winsock if mingw target +case $host_os in + *mingw*) + AC_CHECK_LIB([ws2_32],[main]) + ;; + *) + ;; +esac + AC_CONFIG_FILES([ Makefile man/Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xhost-1.0.5/missing new/xhost-1.0.6/missing --- old/xhost-1.0.5/missing 2012-03-23 05:57:25.000000000 +0100 +++ new/xhost-1.0.6/missing 2013-07-17 08:10:48.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xhost-1.0.5/xhost.c new/xhost-1.0.6/xhost.c --- old/xhost-1.0.5/xhost.c 2012-03-23 05:57:21.000000000 +0100 +++ new/xhost-1.0.6/xhost.c 2013-07-17 08:10:42.000000000 +0200 @@ -59,15 +59,12 @@ #include "config.h" #endif -#if defined(TCPCONN) || defined(STREAMSCONN) +#ifdef TCPCONN #define NEEDSOCKETS #endif #ifdef UNIXCONN #define NEEDSOCKETS #endif -#ifdef DNETCONN -#define NEEDSOCKETS -#endif #include <X11/Xlib.h> #include <X11/Xos.h> @@ -76,45 +73,25 @@ #include <stdio.h> #include <stdlib.h> #include <signal.h> -#ifdef X_NOT_POSIX -#include <setjmp.h> -#endif #include <ctype.h> #include <X11/Xauth.h> #include <X11/Xmu/Error.h> #include <stdlib.h> #ifdef NEEDSOCKETS -#ifdef att -typedef unsigned short unsign16; -typedef unsigned long unsign32; -typedef short sign16; -typedef long sign32; -#include <interlan/socket.h> -#include <interlan/netdb.h> -#include <interlan/in.h> +#ifdef WIN32 +#include <X11/Xwinsock.h> #else -#ifndef Lynx #include <sys/socket.h> -#else -#include <socket.h> -#endif #include <netdb.h> #include <netinet/in.h> #endif #endif /* NEEDSOCKETS */ -#ifndef BAD_ARPAINET +#ifndef WIN32 #include <arpa/inet.h> -#else -/* bogus definition of inet_makeaddr() in BSD 4.2 and Ultrix */ -extern unsigned long inet_makeaddr(); #endif -#ifdef DNETCONN -#include <netdnet/dn.h> -#include <netdnet/dnetdb.h> -#endif #ifdef SECURE_RPC #include <pwd.h> @@ -124,7 +101,7 @@ #include <limits.h> #undef _POSIX_C_SOURCE #else -#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE) +#ifdef _POSIX_SOURCE #include <limits.h> #else #define _POSIX_SOURCE @@ -145,17 +122,7 @@ static int change_host(Display *dpy, char *name, Bool add); static const char *get_hostname(XHostAddress *ha); static int local_xerror(Display *dpy, XErrorEvent *rep); - -#ifdef RETSIGTYPE /* autoconf AC_TYPE_SIGNAL */ -# define signal_t RETSIGTYPE -#else /* Imake */ -#ifdef SIGNALRETURNSINT -#define signal_t int -#else -#define signal_t void -#endif -#endif /* RETSIGTYPE */ -static signal_t nameserver_lost(int sig); +static void nameserver_lost(int sig); #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */ @@ -167,7 +134,7 @@ static int XFamily(int af) { - int i; + unsigned int i; static struct _familyMap { int af, xf; } familyMap[] = { @@ -193,8 +160,6 @@ } #endif /* NEEDSOCKETS */ -static Display *dpy; - int main(int argc, char *argv[]) { @@ -204,12 +169,7 @@ int nfailed = 0; XHostAddress *list; Bool enabled = False; -#ifdef DNETCONN - char *dnet_htoa(); - struct nodeent *np; - struct dn_naddr *nlist, dnaddr, *dnaddrp, *dnet_addr(); - char *cp; -#endif + Display *dpy; ProgramName = argv[0]; @@ -228,9 +188,6 @@ if (argc == 1) { -#ifdef DNETCONN - setnodeent(1); /* keep the database accessed */ -#endif sethostent(1); /* don't close the data base each time */ list = XListHosts(dpy, &nhosts, &enabled); if (enabled) @@ -336,7 +293,8 @@ { XHostAddress ha; char *lname; - int namelen, i, family = FamilyWild; + size_t namelen, i; + int family = FamilyWild; #ifdef K5AUTH krb5_principal princ; krb5_data kbuf; @@ -350,11 +308,6 @@ #endif #endif char *cp; -#ifdef DNETCONN - struct dn_naddr *dnaddrp; - struct nodeent *np; - static struct dn_naddr dnaddr; -#endif /* DNETCONN */ static const char *add_msg = "being added to access control list"; static const char *remove_msg = "being removed from access control list"; @@ -368,7 +321,7 @@ } lname[namelen] = '\0'; if (!strncmp("inet:", lname, 5)) { -#if defined(TCPCONN) || defined(STREAMSCONN) +#ifdef TCPCONN family = FamilyInternet; name += 5; #else @@ -378,8 +331,7 @@ #endif } else if (!strncmp("inet6:", lname, 6)) { -#if (defined(TCPCONN) || defined(STREAMSCONN)) && \ - defined(IPv6) && defined(AF_INET6) +#if defined(TCPCONN) && defined(IPv6) && defined(AF_INET6) family = FamilyInternet6; name += 6; #else @@ -391,8 +343,7 @@ #ifdef ACCEPT_INETV6 /* Allow inetv6 as an alias for inet6 for compatibility with original X11 over IPv6 draft. */ else if (!strncmp("inetv6:", lname, 7)) { -#if (defined(TCPCONN) || defined(STREAMSCONN)) && \ - defined(IPv6) && defined(AF_INET6) +#if defined(TCPCONN) && defined(IPv6) && defined(AF_INET6) family = FamilyInternet6; name += 7; #else @@ -403,14 +354,9 @@ } #endif /* ACCEPT_INETV6 */ else if (!strncmp("dnet:", lname, 5)) { -#ifdef DNETCONN - family = FamilyDECnet; - name += 5; -#else fprintf (stderr, "%s: not compiled for DECnet\n", ProgramName); free(lname); return 0; -#endif } else if (!strncmp("nis:", lname, 4)) { #ifdef SECURE_RPC @@ -476,34 +422,6 @@ return 1; } -#ifdef DNETCONN - if (family == FamilyDECnet || ((family == FamilyWild) && - (cp = strchr(name, ':')) && (*(cp + 1) == ':') && - !(*cp = '\0'))) { - ha.family = FamilyDECnet; - if (dnaddrp = dnet_addr(name)) { - dnaddr = *dnaddrp; - } else { - if ((np = getnodebyname (name)) == NULL) { - fprintf (stderr, "%s: unable to get node name for \"%s::\"\n", - ProgramName, name); - return 0; - } - dnaddr.a_len = np->n_length; - memmove( dnaddr.a_addr, np->n_addr, np->n_length); - } - ha.length = sizeof(struct dn_naddr); - ha.address = (char *)&dnaddr; - if (add) { - XAddHost (dpy, &ha); - printf ("%s:: %s\n", name, add_msg); - } else { - XRemoveHost (dpy, &ha); - printf ("%s:: %s\n", name, remove_msg); - } - return 1; - } -#endif /* DNETCONN */ #ifdef K5AUTH if (family == FamilyKrb5Principal) { krb5_error_code retval; @@ -530,8 +448,9 @@ } #endif if (family == FamilyLocalHost) { + char empty[] = ""; ha.length = 0; - ha.address = ""; + ha.address = empty; ha.family = family; if (add) XAddHost(dpy, &ha); @@ -722,37 +641,29 @@ * be found. */ -#ifdef X_NOT_POSIX -jmp_buf env; -#endif static const char * get_hostname(XHostAddress *ha) { -#if (defined(TCPCONN) || defined(STREAMSCONN)) && \ - (!defined(IPv6) || !defined(AF_INET6)) +#if defined(TCPCONN) && (!defined(IPv6) || !defined(AF_INET6)) static struct hostent *hp = NULL; #endif -#ifdef DNETCONN - struct nodeent *np; - static char nodeaddr[5 + 2 * DN_MAXADDL]; -#endif /* DNETCONN */ #ifdef K5AUTH krb5_principal princ; krb5_data kbuf; char *kname; static char kname_out[255]; #endif -#ifndef X_NOT_POSIX +#ifdef SIGALRM struct sigaction sa; #endif -#if defined(TCPCONN) || defined(STREAMSCONN) +#ifdef TCPCONN #if defined(IPv6) && defined(AF_INET6) if ((ha->family == FamilyInternet) || (ha->family == FamilyInternet6)) { struct sockaddr_storage saddr; static char inetname[NI_MAXHOST]; - int saddrlen; + unsigned int saddrlen; inetname[0] = '\0'; memset(&saddr, 0, sizeof saddr); @@ -782,23 +693,18 @@ gethostbyaddr will continue after a signal, so we have to jump out of it. */ -#ifndef X_NOT_POSIX +#ifdef SIGALRM memset(&sa, 0, sizeof sa); sa.sa_handler = nameserver_lost; sa.sa_flags = 0; /* don't restart syscalls */ sigaction(SIGALRM, &sa, NULL); -#else - signal(SIGALRM, nameserver_lost); -#endif alarm(NAMESERVER_TIMEOUT); -#ifdef X_NOT_POSIX - if (setjmp(env) == 0) #endif - { - getnameinfo((struct sockaddr *) &saddr, saddrlen, inetname, - sizeof(inetname), NULL, 0, 0); - } + getnameinfo((struct sockaddr *) &saddr, saddrlen, inetname, + sizeof(inetname), NULL, 0, 0); +#ifdef SIGALRM alarm(0); +#endif if (nameserver_timedout || inetname[0] == '\0') inet_ntop(((struct sockaddr *)&saddr)->sa_family, ha->address, inetname, sizeof(inetname)); @@ -806,35 +712,23 @@ } #else if (ha->family == FamilyInternet) { -#ifdef CRAY - struct in_addr t_addr; - bzero((char *)&t_addr, sizeof(t_addr)); - bcopy(ha->address, (char *)&t_addr, 4); - ha->address = (char *)&t_addr; -#endif /* gethostbyaddr can take a LONG time if the host does not exist. Assume that if it does not respond in NAMESERVER_TIMEOUT seconds that something is wrong and do not make the user wait. gethostbyaddr will continue after a signal, so we have to jump out of it. */ -#ifndef X_NOT_POSIX +#ifdef SIGALRM memset(&sa, 0, sizeof sa); sa.sa_handler = nameserver_lost; sa.sa_flags = 0; /* don't restart syscalls */ sigaction(SIGALRM, &sa, NULL); -#else - signal(SIGALRM, nameserver_lost); -#endif alarm(4); -#ifdef X_NOT_POSIX - if (setjmp(env) == 0) { -#endif - hp = gethostbyaddr (ha->address, ha->length, AF_INET); -#ifdef X_NOT_POSIX - } #endif + hp = gethostbyaddr (ha->address, ha->length, AF_INET); +#ifdef SIGALRM alarm(0); +#endif if (hp) return (hp->h_name); else return (inet_ntoa(*((struct in_addr *)(ha->address)))); @@ -862,24 +756,12 @@ pwd = getpwuid(uid); if (pwd) - sprintf(netname, "%s@ (%*.*s)", pwd->pw_name, - ha->length, ha->length, ha->address); + snprintf(netname, sizeof(netname), "%s@ (%*.*s)", + pwd->pw_name, ha->length, ha->length, ha->address); } #endif return (netname); } -#ifdef DNETCONN - if (ha->family == FamilyDECnet) { - struct dn_naddr *addr_ptr = (struct dn_naddr *) ha->address; - - if (np = getnodebyaddr(addr_ptr->a_addr, addr_ptr->a_len, AF_DECnet)) { - sprintf(nodeaddr, "%s", np->n_name); - } else { - sprintf(nodeaddr, "%s", dnet_htoa(ha->address)); - } - return(nodeaddr); - } -#endif #ifdef K5AUTH if (ha->family == FamilyKrb5Principal) { kbuf.data = ha->address; @@ -927,15 +809,10 @@ } /*ARGUSED*/ -static signal_t -nameserver_lost(int sig) +static void +nameserver_lost(_X_UNUSED int sig) { nameserver_timedout = 1; -#ifdef X_NOT_POSIX - /* not needed with POSIX signals - stuck syscalls will not - be restarted after signal delivery */ - longjmp(env, -1); -#endif } /* @@ -966,7 +843,7 @@ return 0; } -#ifdef __CYGWIN__ +#if defined(__CYGWIN__) || defined(WIN32) void sethostent(int x) {} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
