diff -ruN inetutils-1.4.0/ChangeLog inetutils-1.4.1/ChangeLog --- inetutils-1.4.0/ChangeLog Wed Jul 31 17:51:19 2002 +++ inetutils-1.4.1/ChangeLog Mon Sep 2 18:59:51 2002 @@ -1,3 +1,31 @@ +2002-09-02 Jeff Bailey + + * configure.ac: Bump version to 1.4.1 + +2002-09-02 Sergey Poznyakoff + + * THANKS: Added Michael Deutschmann. + * NEWS: Updated. + +2002-09-02 Jeff Bailey + + * ROADMAP: Update + + * NEWS: Update + + * THANKS: Add Chris Ulherr + +2002-08-04 Sergey Poznyakoff + + * acinclude.m4 (IU_CHECK_MEMBER,IU_CHECK_MEMBERS): added new + macros to override the autoconf bug noted on 2002-05-14. + The old workaround didn't work for some cases (namely, + utmp.ut_exit, whose members are named differently on + different systems). When the autoconf is updated, the + need for these macros will disappear. + * configure.ac: Use IU_CHECK_MEMBER(S) instead of AC_CHECK_MEMBERS + throughout the file. + 2002-07-31 Jeff Bailey * configure.ac: Update version to 1.4 diff -ruN inetutils-1.4.0/Makefile.in inetutils-1.4.1/Makefile.in --- inetutils-1.4.0/Makefile.in Wed Jul 31 17:58:23 2002 +++ inetutils-1.4.1/Makefile.in Mon Sep 2 19:01:03 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -137,7 +137,8 @@ .SUFFIXES: -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile diff -ruN inetutils-1.4.0/NEWS inetutils-1.4.1/NEWS --- inetutils-1.4.0/NEWS Sat Jul 27 12:03:02 2002 +++ inetutils-1.4.1/NEWS Mon Sep 2 12:19:10 2002 @@ -1,9 +1,27 @@ -GNU inetutils NEWS -- history of user-visible changes. 2002-07-27 +GNU inetutils NEWS -- history of user-visible changes. Copyright (C) 2002 Free Software Foundation, Inc. See the end for copying conditions. Please send inetutils bug reports to . +September 02, 2002 +Version 1.4.1: + +* Fixes a build problem on Solaris + +* rsh now honours -V as well as --version + +* Fixed a security problem with rshd where new files were being + created as uid 0. + +* Fixed improper ping initialization. + +* The syntax of syslog.conf file has been extended. The new + wildcard facility specification, **, catches all messages with + a facility not specified explicitely in the configuration file. + + +July 31, 2002 Version 1.4.0: * It is now possible to specify whether to compile individual diff -ruN inetutils-1.4.0/THANKS inetutils-1.4.1/THANKS --- inetutils-1.4.0/THANKS Tue Feb 12 09:01:02 2002 +++ inetutils-1.4.1/THANKS Mon Sep 2 18:58:25 2002 @@ -21,8 +21,10 @@ Jeff Smith Joachim Gabler Marcus Brinkmann +Michael Deutschmann Michael Vogt Michael Weiser Matt Roberds Bert De Knuydt -Sergey Poznyakoff \ No newline at end of file +Sergey Poznyakoff +Chris Ulherr diff -ruN inetutils-1.4.0/acinclude.m4 inetutils-1.4.1/acinclude.m4 --- inetutils-1.4.0/acinclude.m4 Sun Apr 28 12:47:58 2002 +++ inetutils-1.4.1/acinclude.m4 Wed Aug 21 21:35:07 2002 @@ -623,3 +623,44 @@ AC_MSG_CHECKING(krb5 implementation) AC_MSG_RESULT(${cached}$KRB5_IMPL) ]) + +dnl IU_CHECK_MEMBER(AGGREGATE.MEMBER, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], +dnl [INCLUDES]) +dnl AGGREGATE.MEMBER is for instance `struct passwd.pw_gecos'. +dnl The member itself can be of an aggregate type +dnl Shell variables are not a valid argument. +AC_DEFUN([IU_CHECK_MEMBER], +[AS_LITERAL_IF([$1], [], + [AC_FATAL([$0: requires literal arguments])])dnl +m4_bmatch([$1], [\.], , + [m4_fatal([$0: Did not see any dot in `$1'])])dnl +AS_VAR_PUSHDEF([ac_Member], [ac_cv_member_$1])dnl +dnl Extract the aggregate name, and the member name +AC_CACHE_CHECK([for $1], ac_Member, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])], +[dnl AGGREGATE ac_aggr; +static m4_bpatsubst([$1], [\..*]) ac_aggr; +dnl ac_aggr.MEMBER; +if (sizeof(ac_aggr.m4_bpatsubst([$1], [^[^.]*\.]))) +return 0;])], + [AS_VAR_SET(ac_Member, yes)], + [AS_VAR_SET(ac_Member, no)])]) +AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])dnl +AS_VAR_POPDEF([ac_Member])dnl +])dnl IU_CHECK_MEMBER + + +dnl IU_CHECK_MEMBERS([AGGREGATE.MEMBER, ...], +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND] +dnl [INCLUDES]) +AC_DEFUN([IU_CHECK_MEMBERS], +[m4_foreach([AC_Member], [$1], + [IU_CHECK_MEMBER(AC_Member, + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_Member), 1, + [Define to 1 if `]m4_bpatsubst(AC_Member, + [^[^.]*\.])[' is + member of `]m4_bpatsubst(AC_Member, [\..*])['.]) +$2], + [$3], + [$4])])]) diff -ruN inetutils-1.4.0/aclocal.m4 inetutils-1.4.1/aclocal.m4 --- inetutils-1.4.0/aclocal.m4 Wed Jul 31 17:58:05 2002 +++ inetutils-1.4.1/aclocal.m4 Mon Sep 2 19:01:00 2002 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.6.2 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -637,6 +637,47 @@ AC_MSG_RESULT(${cached}$KRB5_IMPL) ]) +dnl IU_CHECK_MEMBER(AGGREGATE.MEMBER, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], +dnl [INCLUDES]) +dnl AGGREGATE.MEMBER is for instance `struct passwd.pw_gecos'. +dnl The member itself can be of an aggregate type +dnl Shell variables are not a valid argument. +AC_DEFUN([IU_CHECK_MEMBER], +[AS_LITERAL_IF([$1], [], + [AC_FATAL([$0: requires literal arguments])])dnl +m4_bmatch([$1], [\.], , + [m4_fatal([$0: Did not see any dot in `$1'])])dnl +AS_VAR_PUSHDEF([ac_Member], [ac_cv_member_$1])dnl +dnl Extract the aggregate name, and the member name +AC_CACHE_CHECK([for $1], ac_Member, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])], +[dnl AGGREGATE ac_aggr; +static m4_bpatsubst([$1], [\..*]) ac_aggr; +dnl ac_aggr.MEMBER; +if (sizeof(ac_aggr.m4_bpatsubst([$1], [^[^.]*\.]))) +return 0;])], + [AS_VAR_SET(ac_Member, yes)], + [AS_VAR_SET(ac_Member, no)])]) +AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])dnl +AS_VAR_POPDEF([ac_Member])dnl +])dnl IU_CHECK_MEMBER + + +dnl IU_CHECK_MEMBERS([AGGREGATE.MEMBER, ...], +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND] +dnl [INCLUDES]) +AC_DEFUN([IU_CHECK_MEMBERS], +[m4_foreach([AC_Member], [$1], + [IU_CHECK_MEMBER(AC_Member, + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_Member), 1, + [Define to 1 if `]m4_bpatsubst(AC_Member, + [^[^.]*\.])[' is + member of `]m4_bpatsubst(AC_Member, [\..*])['.]) +$2], + [$3], + [$4])])]) + # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. @@ -842,7 +883,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6.2])]) + [AM_AUTOMAKE_VERSION([1.6.3])]) # Helper functions for option handling. -*- Autoconf -*- diff -ruN inetutils-1.4.0/config.hin inetutils-1.4.1/config.hin --- inetutils-1.4.0/config.hin Wed Jul 31 17:58:14 2002 +++ inetutils-1.4.1/config.hin Mon Sep 2 19:02:10 2002 @@ -407,11 +407,11 @@ /* Define to 1 if `h_addr_list' is member of `struct hostent'. */ #undef HAVE_STRUCT_HOSTENT_H_ADDR_LIST -/* Define to 1 if `ifr_broadaddr.sa_family' is member of `struct ifreq'. */ -#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR_SA_FAMILY +/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR -/* Define to 1 if `ifr_netmask.sa_family' is member of `struct ifreq'. */ -#undef HAVE_STRUCT_IFREQ_IFR_NETMASK_SA_FAMILY +/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_NETMASK /* Define to 1 if the system has the type `struct if_nameindex'. */ #undef HAVE_STRUCT_IF_NAMEINDEX @@ -431,6 +431,27 @@ /* Define to 1 if `ut_tv' is member of `struct utmpx'. */ #undef HAVE_STRUCT_UTMPX_UT_TV +/* Define to 1 if `ut_exit' is member of `struct utmp'. */ +#undef HAVE_STRUCT_UTMP_UT_EXIT + +/* Define to 1 if `ut_host' is member of `struct utmp'. */ +#undef HAVE_STRUCT_UTMP_UT_HOST + +/* Define to 1 if `ut_id' is member of `struct utmp'. */ +#undef HAVE_STRUCT_UTMP_UT_ID + +/* Define to 1 if `ut_pid' is member of `struct utmp'. */ +#undef HAVE_STRUCT_UTMP_UT_PID + +/* Define to 1 if `ut_tv' is member of `struct utmp'. */ +#undef HAVE_STRUCT_UTMP_UT_TV + +/* Define to 1 if `ut_type' is member of `struct utmp'. */ +#undef HAVE_STRUCT_UTMP_UT_TYPE + +/* Define to 1 if `ut_user' is member of `struct utmp'. */ +#undef HAVE_STRUCT_UTMP_UT_USER + /* Define to 1 if `ifr_index' is member of `stuct ifreq'. */ #undef HAVE_STUCT_IFREQ_IFR_INDEX @@ -547,27 +568,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UTMP_H -/* Define to 1 if `ut_exit' is member of `utmp'. */ -#undef HAVE_UTMP_UT_EXIT - -/* Define to 1 if `ut_host' is member of `utmp'. */ -#undef HAVE_UTMP_UT_HOST - -/* Define to 1 if `ut_id' is member of `utmp'. */ -#undef HAVE_UTMP_UT_ID - -/* Define to 1 if `ut_pid' is member of `utmp'. */ -#undef HAVE_UTMP_UT_PID - -/* Define to 1 if `ut_tv' is member of `utmp'. */ -#undef HAVE_UTMP_UT_TV - -/* Define to 1 if `ut_type' is member of `utmp'. */ -#undef HAVE_UTMP_UT_TYPE - -/* Define to 1 if `ut_user' is member of `utmp'. */ -#undef HAVE_UTMP_UT_USER - /* Define to 1 if you have the `vfork' function. */ #undef HAVE_VFORK @@ -754,11 +754,6 @@ #endif #endif /* HAVE___P */ -#ifndef HAVE_MEMSET -/* Declare our own silly version. */ -extern void memset __P ((void *mem, int val, size_t sz)); -#endif - #ifndef HAVE_VSNPRINTF #include #if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__ @@ -806,19 +801,11 @@ extern struct group *getgrnam __P ((const char *)); #endif -#ifndef HAVE_SIG_T -typedef RETSIGTYPE (*sig_t) (); -#endif - /* Defaults for PATH_ variables. */ #include - -#ifdef HAVE_STRUCT_IFREQ_IFR_NETMASK_SA_FAMILY -# define HAVE_STRUCT_IFREQ_IFR_NETMASK -#endif -#ifdef HAVE_STRUCT_IFREQ_IFR_BROADADDR_SA_FAMILY -# define HAVE_STRUCT_IFREQ_IFR_BROADADDR +#ifndef HAVE_SIG_T +typedef RETSIGTYPE (*sig_t) (); #endif #ifdef HAVE_SYS_PARAM_H @@ -867,4 +854,9 @@ #ifndef HAVE_MEMMOVE /* Declare our own silly version. */ extern void *memmove __P ((void *to, const void *from, size_t sz)); +#endif + +#ifndef HAVE_MEMSET +/* Declare our own silly version. */ +extern void memset __P ((void *mem, int val, size_t sz)); #endif diff -ruN inetutils-1.4.0/configure inetutils-1.4.1/configure --- inetutils-1.4.0/configure Wed Jul 31 17:58:31 2002 +++ inetutils-1.4.1/configure Mon Sep 2 19:01:14 2002 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for GNU inetutils 1.4.0. +# Generated by GNU Autoconf 2.53 for GNU inetutils 1.4.1. # # Report bugs to . # @@ -256,8 +256,8 @@ # Identity of this package. PACKAGE_NAME='GNU inetutils' PACKAGE_TARNAME='inetutils' -PACKAGE_VERSION='1.4.0' -PACKAGE_STRING='GNU inetutils 1.4.0' +PACKAGE_VERSION='1.4.1' +PACKAGE_STRING='GNU inetutils 1.4.1' PACKAGE_BUGREPORT='bug-inetutils@gnu.org' ac_unique_file="inetd/inetd.c" @@ -762,7 +762,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU inetutils 1.4.0 to adapt to many kinds of systems. +\`configure' configures GNU inetutils 1.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -829,7 +829,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU inetutils 1.4.0:";; + short | recursive ) echo "Configuration of GNU inetutils 1.4.1:";; esac cat <<\_ACEOF @@ -963,7 +963,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU inetutils configure 1.4.0 +GNU inetutils configure 1.4.1 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -978,7 +978,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU inetutils $as_me 1.4.0, which was +It was created by GNU inetutils $as_me 1.4.1, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1976,7 +1976,7 @@ # Define the identity of the package. PACKAGE=inetutils - VERSION=1.4.0 + VERSION=1.4.1 cat >>confdefs.h <<_ACEOF @@ -8036,7 +8036,7 @@ main () { static struct sockaddr_in ac_aggr; -if (ac_aggr.sin_len) +if (sizeof(ac_aggr.sin_len)) return 0; ; return 0; @@ -8133,9 +8133,9 @@ fi - echo "$as_me:$LINENO: checking for utmp.ut_type" >&5 -echo $ECHO_N "checking for utmp.ut_type... $ECHO_C" >&6 -if test "${ac_cv_member_utmp_ut_type+set}" = set; then + echo "$as_me:$LINENO: checking for struct utmp.ut_type" >&5 +echo $ECHO_N "checking for struct utmp.ut_type... $ECHO_C" >&6 +if test "${ac_cv_member_struct_utmp_ut_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8155,8 +8155,8 @@ int main () { -static utmp ac_aggr; -if (ac_aggr.ut_type) +static struct utmp ac_aggr; +if (sizeof(ac_aggr.ut_type)) return 0; ; return 0; @@ -8174,27 +8174,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_utmp_ut_type=yes + ac_cv_member_struct_utmp_ut_type=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_utmp_ut_type=no +ac_cv_member_struct_utmp_ut_type=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_utmp_ut_type" >&5 -echo "${ECHO_T}$ac_cv_member_utmp_ut_type" >&6 -if test $ac_cv_member_utmp_ut_type = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_type" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_type" >&6 +if test $ac_cv_member_struct_utmp_ut_type = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_UTMP_UT_TYPE 1 +#define HAVE_STRUCT_UTMP_UT_TYPE 1 _ACEOF fi -echo "$as_me:$LINENO: checking for utmp.ut_pid" >&5 -echo $ECHO_N "checking for utmp.ut_pid... $ECHO_C" >&6 -if test "${ac_cv_member_utmp_ut_pid+set}" = set; then +echo "$as_me:$LINENO: checking for struct utmp.ut_pid" >&5 +echo $ECHO_N "checking for struct utmp.ut_pid... $ECHO_C" >&6 +if test "${ac_cv_member_struct_utmp_ut_pid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8214,8 +8214,8 @@ int main () { -static utmp ac_aggr; -if (ac_aggr.ut_pid) +static struct utmp ac_aggr; +if (sizeof(ac_aggr.ut_pid)) return 0; ; return 0; @@ -8233,27 +8233,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_utmp_ut_pid=yes + ac_cv_member_struct_utmp_ut_pid=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_utmp_ut_pid=no +ac_cv_member_struct_utmp_ut_pid=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_utmp_ut_pid" >&5 -echo "${ECHO_T}$ac_cv_member_utmp_ut_pid" >&6 -if test $ac_cv_member_utmp_ut_pid = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_pid" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_pid" >&6 +if test $ac_cv_member_struct_utmp_ut_pid = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_UTMP_UT_PID 1 +#define HAVE_STRUCT_UTMP_UT_PID 1 _ACEOF fi -echo "$as_me:$LINENO: checking for utmp.ut_id" >&5 -echo $ECHO_N "checking for utmp.ut_id... $ECHO_C" >&6 -if test "${ac_cv_member_utmp_ut_id+set}" = set; then +echo "$as_me:$LINENO: checking for struct utmp.ut_id" >&5 +echo $ECHO_N "checking for struct utmp.ut_id... $ECHO_C" >&6 +if test "${ac_cv_member_struct_utmp_ut_id+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8273,8 +8273,8 @@ int main () { -static utmp ac_aggr; -if (ac_aggr.ut_id) +static struct utmp ac_aggr; +if (sizeof(ac_aggr.ut_id)) return 0; ; return 0; @@ -8292,27 +8292,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_utmp_ut_id=yes + ac_cv_member_struct_utmp_ut_id=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_utmp_ut_id=no +ac_cv_member_struct_utmp_ut_id=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_utmp_ut_id" >&5 -echo "${ECHO_T}$ac_cv_member_utmp_ut_id" >&6 -if test $ac_cv_member_utmp_ut_id = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_id" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_id" >&6 +if test $ac_cv_member_struct_utmp_ut_id = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_UTMP_UT_ID 1 +#define HAVE_STRUCT_UTMP_UT_ID 1 _ACEOF fi -echo "$as_me:$LINENO: checking for utmp.ut_user" >&5 -echo $ECHO_N "checking for utmp.ut_user... $ECHO_C" >&6 -if test "${ac_cv_member_utmp_ut_user+set}" = set; then +echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5 +echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6 +if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8332,8 +8332,8 @@ int main () { -static utmp ac_aggr; -if (ac_aggr.ut_user) +static struct utmp ac_aggr; +if (sizeof(ac_aggr.ut_user)) return 0; ; return 0; @@ -8351,27 +8351,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_utmp_ut_user=yes + ac_cv_member_struct_utmp_ut_user=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_utmp_ut_user=no +ac_cv_member_struct_utmp_ut_user=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_utmp_ut_user" >&5 -echo "${ECHO_T}$ac_cv_member_utmp_ut_user" >&6 -if test $ac_cv_member_utmp_ut_user = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6 +if test $ac_cv_member_struct_utmp_ut_user = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_UTMP_UT_USER 1 +#define HAVE_STRUCT_UTMP_UT_USER 1 _ACEOF fi -echo "$as_me:$LINENO: checking for utmp.ut_host" >&5 -echo $ECHO_N "checking for utmp.ut_host... $ECHO_C" >&6 -if test "${ac_cv_member_utmp_ut_host+set}" = set; then +echo "$as_me:$LINENO: checking for struct utmp.ut_host" >&5 +echo $ECHO_N "checking for struct utmp.ut_host... $ECHO_C" >&6 +if test "${ac_cv_member_struct_utmp_ut_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8391,8 +8391,8 @@ int main () { -static utmp ac_aggr; -if (ac_aggr.ut_host) +static struct utmp ac_aggr; +if (sizeof(ac_aggr.ut_host)) return 0; ; return 0; @@ -8410,27 +8410,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_utmp_ut_host=yes + ac_cv_member_struct_utmp_ut_host=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_utmp_ut_host=no +ac_cv_member_struct_utmp_ut_host=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_utmp_ut_host" >&5 -echo "${ECHO_T}$ac_cv_member_utmp_ut_host" >&6 -if test $ac_cv_member_utmp_ut_host = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_host" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_host" >&6 +if test $ac_cv_member_struct_utmp_ut_host = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_UTMP_UT_HOST 1 +#define HAVE_STRUCT_UTMP_UT_HOST 1 _ACEOF fi -echo "$as_me:$LINENO: checking for utmp.ut_tv" >&5 -echo $ECHO_N "checking for utmp.ut_tv... $ECHO_C" >&6 -if test "${ac_cv_member_utmp_ut_tv+set}" = set; then +echo "$as_me:$LINENO: checking for struct utmp.ut_tv" >&5 +echo $ECHO_N "checking for struct utmp.ut_tv... $ECHO_C" >&6 +if test "${ac_cv_member_struct_utmp_ut_tv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8450,8 +8450,8 @@ int main () { -static utmp ac_aggr; -if (ac_aggr.ut_tv) +static struct utmp ac_aggr; +if (sizeof(ac_aggr.ut_tv)) return 0; ; return 0; @@ -8469,27 +8469,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_utmp_ut_tv=yes + ac_cv_member_struct_utmp_ut_tv=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_utmp_ut_tv=no +ac_cv_member_struct_utmp_ut_tv=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_utmp_ut_tv" >&5 -echo "${ECHO_T}$ac_cv_member_utmp_ut_tv" >&6 -if test $ac_cv_member_utmp_ut_tv = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_tv" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_tv" >&6 +if test $ac_cv_member_struct_utmp_ut_tv = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_UTMP_UT_TV 1 +#define HAVE_STRUCT_UTMP_UT_TV 1 _ACEOF fi -echo "$as_me:$LINENO: checking for utmp.ut_exit" >&5 -echo $ECHO_N "checking for utmp.ut_exit... $ECHO_C" >&6 -if test "${ac_cv_member_utmp_ut_exit+set}" = set; then +echo "$as_me:$LINENO: checking for struct utmp.ut_exit" >&5 +echo $ECHO_N "checking for struct utmp.ut_exit... $ECHO_C" >&6 +if test "${ac_cv_member_struct_utmp_ut_exit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8509,8 +8509,8 @@ int main () { -static utmp ac_aggr; -if (ac_aggr.ut_exit) +static struct utmp ac_aggr; +if (sizeof(ac_aggr.ut_exit)) return 0; ; return 0; @@ -8528,20 +8528,20 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_utmp_ut_exit=yes + ac_cv_member_struct_utmp_ut_exit=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_utmp_ut_exit=no +ac_cv_member_struct_utmp_ut_exit=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_utmp_ut_exit" >&5 -echo "${ECHO_T}$ac_cv_member_utmp_ut_exit" >&6 -if test $ac_cv_member_utmp_ut_exit = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_exit" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_exit" >&6 +if test $ac_cv_member_struct_utmp_ut_exit = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_UTMP_UT_EXIT 1 +#define HAVE_STRUCT_UTMP_UT_EXIT 1 _ACEOF @@ -8569,7 +8569,7 @@ main () { static struct utmpx ac_aggr; -if (ac_aggr.ut_tv) +if (sizeof(ac_aggr.ut_tv)) return 0; ; return 0; @@ -8608,10 +8608,6 @@ fi -# AC_CHECK_MEMBERS (as of version 2.53 ) fails to recognize the presense -# of a structure member which is itself of an aggregate type. To work -# around the bug, we first check for a non-aggregate sub-member of the -# member in question and then create an appropriate HAVE_ define. echo "$as_me:$LINENO: checking for stuct ifreq.ifr_index" >&5 echo $ECHO_N "checking for stuct ifreq.ifr_index... $ECHO_C" >&6 if test "${ac_cv_member_stuct_ifreq_ifr_index+set}" = set; then @@ -8633,7 +8629,7 @@ main () { static stuct ifreq ac_aggr; -if (ac_aggr.ifr_index) +if (sizeof(ac_aggr.ifr_index)) return 0; ; return 0; @@ -8669,9 +8665,9 @@ fi -echo "$as_me:$LINENO: checking for struct ifreq.ifr_netmask.sa_family" >&5 -echo $ECHO_N "checking for struct ifreq.ifr_netmask.sa_family... $ECHO_C" >&6 -if test "${ac_cv_member_struct_ifreq_ifr_netmask_sa_family+set}" = set; then +echo "$as_me:$LINENO: checking for struct ifreq.ifr_netmask" >&5 +echo $ECHO_N "checking for struct ifreq.ifr_netmask... $ECHO_C" >&6 +if test "${ac_cv_member_struct_ifreq_ifr_netmask+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8690,7 +8686,7 @@ main () { static struct ifreq ac_aggr; -if (ac_aggr.ifr_netmask.sa_family) +if (sizeof(ac_aggr.ifr_netmask)) return 0; ; return 0; @@ -8708,27 +8704,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_ifreq_ifr_netmask_sa_family=yes + ac_cv_member_struct_ifreq_ifr_netmask=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_struct_ifreq_ifr_netmask_sa_family=no +ac_cv_member_struct_ifreq_ifr_netmask=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask_sa_family" >&5 -echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_netmask_sa_family" >&6 -if test $ac_cv_member_struct_ifreq_ifr_netmask_sa_family = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_netmask" >&6 +if test $ac_cv_member_struct_ifreq_ifr_netmask = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_IFREQ_IFR_NETMASK_SA_FAMILY 1 +#define HAVE_STRUCT_IFREQ_IFR_NETMASK 1 _ACEOF fi -echo "$as_me:$LINENO: checking for struct ifreq.ifr_broadaddr.sa_family" >&5 -echo $ECHO_N "checking for struct ifreq.ifr_broadaddr.sa_family... $ECHO_C" >&6 -if test "${ac_cv_member_struct_ifreq_ifr_broadaddr_sa_family+set}" = set; then +echo "$as_me:$LINENO: checking for struct ifreq.ifr_broadaddr" >&5 +echo $ECHO_N "checking for struct ifreq.ifr_broadaddr... $ECHO_C" >&6 +if test "${ac_cv_member_struct_ifreq_ifr_broadaddr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8747,7 +8743,7 @@ main () { static struct ifreq ac_aggr; -if (ac_aggr.ifr_broadaddr.sa_family) +if (sizeof(ac_aggr.ifr_broadaddr)) return 0; ; return 0; @@ -8765,29 +8761,26 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_ifreq_ifr_broadaddr_sa_family=yes + ac_cv_member_struct_ifreq_ifr_broadaddr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_struct_ifreq_ifr_broadaddr_sa_family=no +ac_cv_member_struct_ifreq_ifr_broadaddr=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr_sa_family" >&5 -echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_broadaddr_sa_family" >&6 -if test $ac_cv_member_struct_ifreq_ifr_broadaddr_sa_family = yes; then +echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_broadaddr" >&6 +if test $ac_cv_member_struct_ifreq_ifr_broadaddr = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_IFREQ_IFR_BROADADDR_SA_FAMILY 1 +#define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1 _ACEOF fi - - - echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5 echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6 if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then @@ -8809,7 +8802,7 @@ main () { static struct sockaddr ac_aggr; -if (ac_aggr.sa_len) +if (sizeof(ac_aggr.sa_len)) return 0; ; return 0; @@ -8866,7 +8859,7 @@ main () { static struct hostent ac_aggr; -if (ac_aggr.h_addr_list) +if (sizeof(ac_aggr.h_addr_list)) return 0; ; return 0; @@ -8923,7 +8916,7 @@ main () { static struct stat ac_aggr; -if (ac_aggr.st_blksize) +if (sizeof(ac_aggr.st_blksize)) return 0; ; return 0; @@ -14944,7 +14937,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by GNU inetutils $as_me 1.4.0, which was +This file was extended by GNU inetutils $as_me 1.4.1, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15009,7 +15002,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU inetutils config.status 1.4.0 +GNU inetutils config.status 1.4.1 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -ruN inetutils-1.4.0/configure.ac inetutils-1.4.1/configure.ac --- inetutils-1.4.0/configure.ac Wed Jul 31 17:24:10 2002 +++ inetutils-1.4.1/configure.ac Mon Sep 2 18:59:31 2002 @@ -21,7 +21,7 @@ AC_PREREQ(2.52) -AC_INIT([GNU inetutils], [1.4.0], [bug-inetutils@gnu.org]) +AC_INIT([GNU inetutils], [1.4.1], [bug-inetutils@gnu.org]) AC_CONFIG_SRCDIR([inetd/inetd.c]) AM_CONFIG_HEADER([config.h:config.hin]) @@ -385,47 +385,37 @@ #endif ]) ### Checks for structures. -AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], , , +IU_CHECK_MEMBERS([struct sockaddr_in.sin_len], , , [ #include #include ]) if test "$ac_cv_header_utmp_h" = yes; then AC_CHECK_TYPES(struct lastlog, , , [#include ]) - AC_CHECK_MEMBERS([utmp.ut_type, utmp.ut_pid, utmp.ut_id, utmp.ut_user, - utmp.ut_host, utmp.ut_tv, utmp.ut_exit], , , + IU_CHECK_MEMBERS([struct utmp.ut_type, struct utmp.ut_pid, + struct utmp.ut_id, struct utmp.ut_user, + struct utmp.ut_host, struct utmp.ut_tv, + struct utmp.ut_exit], , , [#ifdef HAVE_SYS_TYPES_H # include #endif #include ]) fi if test "$ac_cv_header_utmpx_h" = yes; then - AC_CHECK_MEMBERS([struct utmpx.ut_tv], , , [#include ]) + IU_CHECK_MEMBERS([struct utmpx.ut_tv], , , [#include ]) fi -# AC_CHECK_MEMBERS (as of version 2.53 ) fails to recognize the presense -# of a structure member which is itself of an aggregate type. To work -# around the bug, we first check for a non-aggregate sub-member of the -# member in question and then create an appropriate HAVE_ define. -AC_CHECK_MEMBERS([stuct ifreq.ifr_index, - struct ifreq.ifr_netmask.sa_family, - struct ifreq.ifr_broadaddr.sa_family], , , +IU_CHECK_MEMBERS([stuct ifreq.ifr_index, + struct ifreq.ifr_netmask, + struct ifreq.ifr_broadaddr], , , [#include #include ]) -AH_BOTTOM([ -#ifdef HAVE_STRUCT_IFREQ_IFR_NETMASK_SA_FAMILY -# define HAVE_STRUCT_IFREQ_IFR_NETMASK -#endif -#ifdef HAVE_STRUCT_IFREQ_IFR_BROADADDR_SA_FAMILY -# define HAVE_STRUCT_IFREQ_IFR_BROADADDR -#endif]) - -AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , +IU_CHECK_MEMBERS([struct sockaddr.sa_len], , , [#include #include ]) -AC_CHECK_MEMBERS([struct hostent.h_addr_list], , , [#include ]) +IU_CHECK_MEMBERS([struct hostent.h_addr_list], , , [#include ]) -AC_CHECK_MEMBERS([struct stat.st_blksize]) +IU_CHECK_MEMBERS([struct stat.st_blksize]) AH_BOTTOM( [#ifdef HAVE_SYS_PARAM_H diff -ruN inetutils-1.4.0/doc/ChangeLog inetutils-1.4.1/doc/ChangeLog --- inetutils-1.4.0/doc/ChangeLog Sun Feb 10 23:17:00 2002 +++ inetutils-1.4.1/doc/ChangeLog Mon Sep 2 18:58:25 2002 @@ -1,3 +1,8 @@ +2002-09-02 Sergey Poznyakoff + + * doc/syslogd.texi: Documented ** extensions, provided + by Michael Deutschmann . + 2002-02-10 Jeff Bailey * rfc/.cvsignore: New file diff -ruN inetutils-1.4.0/doc/Makefile.in inetutils-1.4.1/doc/Makefile.in --- inetutils-1.4.0/doc/Makefile.in Wed Jul 31 17:58:23 2002 +++ inetutils-1.4.1/doc/Makefile.in Mon Sep 2 19:03:31 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -216,8 +216,8 @@ mostlyclean-aminfo: -rm -f inetutils.aux inetutils.cp inetutils.cps inetutils.dvi inetutils.fl \ inetutils.fn inetutils.ky inetutils.log inetutils.op \ - inetutils.pg inetutils.ps inetutils.toc inetutils.tp \ - inetutils.vr + inetutils.pg inetutils.ps inetutils.tmp inetutils.toc \ + inetutils.tp inetutils.vr maintainer-clean-aminfo: cd $(srcdir) && \ diff -ruN inetutils-1.4.0/doc/inetutils.info inetutils-1.4.1/doc/inetutils.info --- inetutils-1.4.0/doc/inetutils.info Wed Jul 31 18:02:26 2002 +++ inetutils-1.4.1/doc/inetutils.info Mon Sep 2 19:03:35 2002 @@ -42,7 +42,7 @@ Indirect: inetutils.info-1: 1972 inetutils.info-2: 48820 -inetutils.info-3: 93531 +inetutils.info-3: 93625  Tag Table: (Indirect) @@ -60,11 +60,11 @@ Node: rshd72058 Node: logger77390 Node: syslogd79057 -Node: talk86479 -Node: talkd88773 -Node: tftp90142 -Node: Reporting Bugs93036 -Node: Concept Index93531 -Node: Index103602 +Node: talk86573 +Node: talkd88867 +Node: tftp90236 +Node: Reporting Bugs93130 +Node: Concept Index93625 +Node: Index103696  End Tag Table diff -ruN inetutils-1.4.0/doc/inetutils.info-1 inetutils-1.4.1/doc/inetutils.info-1 --- inetutils-1.4.0/doc/inetutils.info-1 Wed Jul 31 18:02:26 2002 +++ inetutils-1.4.1/doc/inetutils.info-1 Mon Sep 2 19:03:35 2002 @@ -44,7 +44,7 @@ GNU networking utilities ************************ - This manual documents version 1.4.0 of the GNU network utilities. + This manual documents version 1.4.1 of the GNU network utilities. * Menu: diff -ruN inetutils-1.4.0/doc/inetutils.info-2 inetutils-1.4.1/doc/inetutils.info-2 --- inetutils-1.4.0/doc/inetutils.info-2 Wed Jul 31 18:02:26 2002 +++ inetutils-1.4.1/doc/inetutils.info-2 Mon Sep 2 19:03:35 2002 @@ -1052,7 +1052,8 @@ them with comma (`,') characters. An asterisk (`*') can be used to specify all facilities or all -levels. +levels. Two asterisks (`**') specifie all facilities not named +previously in the configuration file. By default, a level applies to all messages with the same or higher level. The equal (`=') character can be prepended to a level to diff -ruN inetutils-1.4.0/doc/rfc/Makefile.in inetutils-1.4.1/doc/rfc/Makefile.in --- inetutils-1.4.0/doc/rfc/Makefile.in Wed Jul 31 17:58:23 2002 +++ inetutils-1.4.1/doc/rfc/Makefile.in Mon Sep 2 19:03:34 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff -ruN inetutils-1.4.0/doc/stamp-vti inetutils-1.4.1/doc/stamp-vti --- inetutils-1.4.0/doc/stamp-vti Wed Jul 31 18:02:26 2002 +++ inetutils-1.4.1/doc/stamp-vti Mon Sep 2 19:03:31 2002 @@ -1,4 +1,4 @@ @set UPDATED 11 November 2001 @set UPDATED-MONTH November 2001 -@set EDITION 1.4.0 -@set VERSION 1.4.0 +@set EDITION 1.4.1 +@set VERSION 1.4.1 diff -ruN inetutils-1.4.0/doc/syslogd.texi inetutils-1.4.1/doc/syslogd.texi --- inetutils-1.4.0/doc/syslogd.texi Sat Nov 10 22:40:54 2001 +++ inetutils-1.4.1/doc/syslogd.texi Mon Sep 2 18:58:25 2002 @@ -144,7 +144,8 @@ them with comma (@samp{,}) characters. An asterisk (@samp{*}) can be used to specify all facilities or all -levels. +levels. Two asterisks (@samp{**}) specifie all facilities not named +previously in the configuration file. By default, a level applies to all messages with the same or higher level. The equal (@samp{=}) character can be prepended to a level to diff -ruN inetutils-1.4.0/doc/version.texi inetutils-1.4.1/doc/version.texi --- inetutils-1.4.0/doc/version.texi Wed Jul 31 18:02:26 2002 +++ inetutils-1.4.1/doc/version.texi Mon Sep 2 19:03:31 2002 @@ -1,4 +1,4 @@ @set UPDATED 11 November 2001 @set UPDATED-MONTH November 2001 -@set EDITION 1.4.0 -@set VERSION 1.4.0 +@set EDITION 1.4.1 +@set VERSION 1.4.1 diff -ruN inetutils-1.4.0/ftp/Makefile.in inetutils-1.4.1/ftp/Makefile.in --- inetutils-1.4.0/ftp/Makefile.in Wed Jul 31 17:58:23 2002 +++ inetutils-1.4.1/ftp/Makefile.in Mon Sep 2 19:03:02 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -177,8 +177,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -187,8 +186,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/ftpd/Makefile.in inetutils-1.4.1/ftpd/Makefile.in --- inetutils-1.4.0/ftpd/Makefile.in Wed Jul 31 17:58:23 2002 +++ inetutils-1.4.1/ftpd/Makefile.in Mon Sep 2 19:02:35 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -187,8 +187,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -197,8 +196,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done @@ -422,6 +420,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "ftpcmd.c" || rm -f ftpcmd.c clean: clean-am clean-am: clean-generic clean-inetdaemonPROGRAMS mostlyclean-am diff -ruN inetutils-1.4.0/ftpd/ftpcmd.c inetutils-1.4.1/ftpd/ftpcmd.c --- inetutils-1.4.0/ftpd/ftpcmd.c Wed Jul 31 18:01:34 2002 +++ inetutils-1.4.1/ftpd/ftpcmd.c Sun Feb 10 22:35:29 2002 @@ -1,73 +1,74 @@ -/* A Bison parser, made from ../../inetutils/ftpd/ftpcmd.y - by GNU bison 1.35. */ + +/* A Bison parser, made from ftpcmd.y + by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ -# define A 257 -# define B 258 -# define C 259 -# define E 260 -# define F 261 -# define I 262 -# define L 263 -# define N 264 -# define P 265 -# define R 266 -# define S 267 -# define T 268 -# define SP 269 -# define CRLF 270 -# define COMMA 271 -# define USER 272 -# define PASS 273 -# define ACCT 274 -# define REIN 275 -# define QUIT 276 -# define PORT 277 -# define PASV 278 -# define TYPE 279 -# define STRU 280 -# define MODE 281 -# define RETR 282 -# define STOR 283 -# define APPE 284 -# define MLFL 285 -# define MAIL 286 -# define MSND 287 -# define MSOM 288 -# define MSAM 289 -# define MRSQ 290 -# define MRCP 291 -# define ALLO 292 -# define REST 293 -# define RNFR 294 -# define RNTO 295 -# define ABOR 296 -# define DELE 297 -# define CWD 298 -# define LIST 299 -# define NLST 300 -# define SITE 301 -# define STAT 302 -# define HELP 303 -# define NOOP 304 -# define MKD 305 -# define RMD 306 -# define PWD 307 -# define CDUP 308 -# define STOU 309 -# define SMNT 310 -# define SYST 311 -# define SIZE 312 -# define MDTM 313 -# define UMASK 314 -# define IDLE 315 -# define CHMOD 316 -# define LEXERR 317 -# define STRING 318 -# define NUMBER 319 +#define A 257 +#define B 258 +#define C 259 +#define E 260 +#define F 261 +#define I 262 +#define L 263 +#define N 264 +#define P 265 +#define R 266 +#define S 267 +#define T 268 +#define SP 269 +#define CRLF 270 +#define COMMA 271 +#define USER 272 +#define PASS 273 +#define ACCT 274 +#define REIN 275 +#define QUIT 276 +#define PORT 277 +#define PASV 278 +#define TYPE 279 +#define STRU 280 +#define MODE 281 +#define RETR 282 +#define STOR 283 +#define APPE 284 +#define MLFL 285 +#define MAIL 286 +#define MSND 287 +#define MSOM 288 +#define MSAM 289 +#define MRSQ 290 +#define MRCP 291 +#define ALLO 292 +#define REST 293 +#define RNFR 294 +#define RNTO 295 +#define ABOR 296 +#define DELE 297 +#define CWD 298 +#define LIST 299 +#define NLST 300 +#define SITE 301 +#define STAT 302 +#define HELP 303 +#define NOOP 304 +#define MKD 305 +#define RMD 306 +#define PWD 307 +#define CDUP 308 +#define STOU 309 +#define SMNT 310 +#define SYST 311 +#define SIZE 312 +#define MDTM 313 +#define UMASK 314 +#define IDLE 315 +#define CHMOD 316 +#define LEXERR 317 +#define STRING 318 +#define NUMBER 319 -#line 37 "../../inetutils/ftpd/ftpcmd.y" +#line 37 "ftpcmd.y" #ifndef lint @@ -147,17 +148,17 @@ static void yyerror __P ((const char *s)); -#line 117 "../../inetutils/ftpd/ftpcmd.y" -#ifndef YYSTYPE +#line 117 "ftpcmd.y" typedef union { int i; char *s; -} yystype; -# define YYSTYPE yystype -# define YYSTYPE_IS_TRIVIAL 1 +} YYSTYPE; +#include + +#ifndef __cplusplus +#ifndef __STDC__ +#define const #endif -#ifndef YYDEBUG -# define YYDEBUG 0 #endif @@ -166,287 +167,261 @@ #define YYFLAG -32768 #define YYNTBASE 66 -/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ #define YYTRANSLATE(x) ((unsigned)(x) <= 319 ? yytranslate[x] : 81) -/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ -static const char yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65 +static const char yytranslate[] = { 0, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65 }; -#if YYDEBUG -static const short yyprhs[] = -{ - 0, 0, 1, 4, 7, 12, 17, 23, 27, 32, - 37, 42, 47, 56, 62, 68, 74, 78, 84, 88, - 94, 100, 103, 109, 115, 118, 122, 128, 131, 136, - 139, 145, 151, 155, 159, 164, 171, 177, 185, 195, - 200, 208, 214, 217, 223, 229, 232, 235, 241, 246, - 248, 249, 251, 253, 265, 267, 269, 271, 273, 277, - 279, 283, 285, 287, 291, 294, 296, 298, 300, 302, - 304, 306, 308, 310, 312 +#if YYDEBUG != 0 +static const short yyprhs[] = { 0, + 0, 1, 4, 7, 12, 17, 23, 27, 32, 37, + 42, 47, 56, 62, 68, 74, 78, 84, 88, 94, + 100, 103, 109, 115, 118, 122, 128, 131, 136, 139, + 145, 151, 155, 159, 164, 171, 177, 185, 195, 200, + 208, 214, 217, 223, 229, 232, 235, 241, 246, 248, + 249, 251, 253, 265, 267, 269, 271, 273, 277, 279, + 283, 285, 287, 291, 294, 296, 298, 300, 302, 304, + 306, 308, 310, 312 }; -static const short yyrhs[] = -{ - -1, 66, 67, 0, 66, 68, 0, 18, 15, 69, - 16, 0, 19, 15, 70, 16, 0, 23, 80, 15, - 72, 16, 0, 24, 80, 16, 0, 25, 15, 74, - 16, 0, 26, 15, 75, 16, 0, 27, 15, 76, - 16, 0, 38, 15, 65, 16, 0, 38, 15, 65, - 15, 12, 15, 65, 16, 0, 28, 80, 15, 77, - 16, 0, 29, 80, 15, 77, 16, 0, 30, 80, - 15, 77, 16, 0, 46, 80, 16, 0, 46, 80, - 15, 64, 16, 0, 45, 80, 16, 0, 45, 80, - 15, 77, 16, 0, 48, 80, 15, 77, 16, 0, - 48, 16, 0, 43, 80, 15, 77, 16, 0, 41, - 80, 15, 77, 16, 0, 42, 16, 0, 44, 80, - 16, 0, 44, 80, 15, 77, 16, 0, 49, 16, - 0, 49, 15, 64, 16, 0, 50, 16, 0, 51, - 80, 15, 77, 16, 0, 52, 80, 15, 77, 16, - 0, 53, 80, 16, 0, 54, 80, 16, 0, 47, - 15, 49, 16, 0, 47, 15, 49, 15, 64, 16, - 0, 47, 15, 60, 80, 16, 0, 47, 15, 60, - 80, 15, 79, 16, 0, 47, 15, 62, 80, 15, - 79, 15, 77, 16, 0, 47, 15, 61, 16, 0, - 47, 15, 80, 61, 15, 65, 16, 0, 55, 80, - 15, 77, 16, 0, 57, 16, 0, 58, 80, 15, - 77, 16, 0, 59, 80, 15, 77, 16, 0, 22, - 16, 0, 1, 16, 0, 40, 80, 15, 77, 16, - 0, 39, 15, 71, 16, 0, 64, 0, 0, 64, - 0, 65, 0, 65, 17, 65, 17, 65, 17, 65, - 17, 65, 17, 65, 0, 10, 0, 14, 0, 5, - 0, 3, 0, 3, 15, 73, 0, 6, 0, 6, - 15, 73, 0, 8, 0, 9, 0, 9, 15, 71, - 0, 9, 71, 0, 7, 0, 12, 0, 11, 0, - 13, 0, 4, 0, 5, 0, 78, 0, 64, 0, - 65, 0, 0 + +static const short yyrhs[] = { -1, + 66, 67, 0, 66, 68, 0, 18, 15, 69, 16, + 0, 19, 15, 70, 16, 0, 23, 80, 15, 72, + 16, 0, 24, 80, 16, 0, 25, 15, 74, 16, + 0, 26, 15, 75, 16, 0, 27, 15, 76, 16, + 0, 38, 15, 65, 16, 0, 38, 15, 65, 15, + 12, 15, 65, 16, 0, 28, 80, 15, 77, 16, + 0, 29, 80, 15, 77, 16, 0, 30, 80, 15, + 77, 16, 0, 46, 80, 16, 0, 46, 80, 15, + 64, 16, 0, 45, 80, 16, 0, 45, 80, 15, + 77, 16, 0, 48, 80, 15, 77, 16, 0, 48, + 16, 0, 43, 80, 15, 77, 16, 0, 41, 80, + 15, 77, 16, 0, 42, 16, 0, 44, 80, 16, + 0, 44, 80, 15, 77, 16, 0, 49, 16, 0, + 49, 15, 64, 16, 0, 50, 16, 0, 51, 80, + 15, 77, 16, 0, 52, 80, 15, 77, 16, 0, + 53, 80, 16, 0, 54, 80, 16, 0, 47, 15, + 49, 16, 0, 47, 15, 49, 15, 64, 16, 0, + 47, 15, 60, 80, 16, 0, 47, 15, 60, 80, + 15, 79, 16, 0, 47, 15, 62, 80, 15, 79, + 15, 77, 16, 0, 47, 15, 61, 16, 0, 47, + 15, 80, 61, 15, 65, 16, 0, 55, 80, 15, + 77, 16, 0, 57, 16, 0, 58, 80, 15, 77, + 16, 0, 59, 80, 15, 77, 16, 0, 22, 16, + 0, 1, 16, 0, 40, 80, 15, 77, 16, 0, + 39, 15, 71, 16, 0, 64, 0, 0, 64, 0, + 65, 0, 65, 17, 65, 17, 65, 17, 65, 17, + 65, 17, 65, 0, 10, 0, 14, 0, 5, 0, + 3, 0, 3, 15, 73, 0, 6, 0, 6, 15, + 73, 0, 8, 0, 9, 0, 9, 15, 71, 0, + 9, 71, 0, 7, 0, 12, 0, 11, 0, 13, + 0, 4, 0, 5, 0, 78, 0, 64, 0, 65, + 0, 0 }; #endif -#if YYDEBUG -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const short yyrline[] = -{ - 0, 152, 153, 160, 164, 169, 175, 197, 202, 237, - 249, 261, 265, 269, 276, 283, 290, 295, 302, 307, - 314, 321, 325, 332, 345, 349, 354, 361, 365, 382, - 386, 393, 400, 405, 410, 414, 420, 430, 445, 459, - 465, 481, 488, 534, 551, 573, 578, 584, 595, 610, - 614, 618, 622, 626, 640, 644, 648, 655, 660, 665, - 670, 675, 679, 684, 690, 698, 702, 706, 713, 717, - 721, 728, 765, 769, 796 +#if YYDEBUG != 0 +static const short yyrline[] = { 0, + 152, 153, 160, 164, 169, 175, 197, 202, 237, 249, + 261, 265, 269, 276, 283, 290, 295, 302, 307, 314, + 321, 325, 332, 345, 349, 354, 361, 365, 382, 386, + 393, 400, 405, 410, 414, 420, 430, 445, 459, 465, + 481, 488, 534, 551, 573, 578, 584, 595, 610, 614, + 618, 622, 626, 640, 644, 648, 655, 660, 665, 670, + 675, 679, 684, 690, 698, 702, 706, 713, 717, 721, + 728, 765, 769, 796 }; #endif -#if (YYDEBUG) || defined YYERROR_VERBOSE +#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) -/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ -static const char *const yytname[] = -{ - "$", "error", "$undefined.", "A", "B", "C", "E", "F", "I", "L", "N", "P", - "R", "S", "T", "SP", "CRLF", "COMMA", "USER", "PASS", "ACCT", "REIN", - "QUIT", "PORT", "PASV", "TYPE", "STRU", "MODE", "RETR", "STOR", "APPE", - "MLFL", "MAIL", "MSND", "MSOM", "MSAM", "MRSQ", "MRCP", "ALLO", "REST", - "RNFR", "RNTO", "ABOR", "DELE", "CWD", "LIST", "NLST", "SITE", "STAT", - "HELP", "NOOP", "MKD", "RMD", "PWD", "CDUP", "STOU", "SMNT", "SYST", - "SIZE", "MDTM", "UMASK", "IDLE", "CHMOD", "LEXERR", "STRING", "NUMBER", - "cmd_list", "cmd", "rcmd", "username", "password", "byte_size", - "host_port", "form_code", "type_code", "struct_code", "mode_code", - "pathname", "pathstring", "octal_number", "check_login", 0 +static const char * const yytname[] = { "$","error","$undefined.","A","B", +"C","E","F","I","L","N","P","R","S","T","SP","CRLF","COMMA","USER","PASS","ACCT", +"REIN","QUIT","PORT","PASV","TYPE","STRU","MODE","RETR","STOR","APPE","MLFL", +"MAIL","MSND","MSOM","MSAM","MRSQ","MRCP","ALLO","REST","RNFR","RNTO","ABOR", +"DELE","CWD","LIST","NLST","SITE","STAT","HELP","NOOP","MKD","RMD","PWD","CDUP", +"STOU","SMNT","SYST","SIZE","MDTM","UMASK","IDLE","CHMOD","LEXERR","STRING", +"NUMBER","cmd_list","cmd","rcmd","username","password","byte_size","host_port", +"form_code","type_code","struct_code","mode_code","pathname","pathstring","octal_number", +"check_login", NULL }; #endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const short yyr1[] = -{ - 0, 66, 66, 66, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 68, 68, 69, - 70, 70, 71, 72, 73, 73, 73, 74, 74, 74, - 74, 74, 74, 74, 74, 75, 75, 75, 76, 76, - 76, 77, 78, 79, 80 +static const short yyr1[] = { 0, + 66, 66, 66, 67, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 67, 67, 67, 68, 68, 69, 70, + 70, 71, 72, 73, 73, 73, 74, 74, 74, 74, + 74, 74, 74, 74, 75, 75, 75, 76, 76, 76, + 77, 78, 79, 80 }; -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const short yyr2[] = -{ - 0, 0, 2, 2, 4, 4, 5, 3, 4, 4, - 4, 4, 8, 5, 5, 5, 3, 5, 3, 5, - 5, 2, 5, 5, 2, 3, 5, 2, 4, 2, - 5, 5, 3, 3, 4, 6, 5, 7, 9, 4, - 7, 5, 2, 5, 5, 2, 2, 5, 4, 1, - 0, 1, 1, 11, 1, 1, 1, 1, 3, 1, - 3, 1, 1, 3, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0 +static const short yyr2[] = { 0, + 0, 2, 2, 4, 4, 5, 3, 4, 4, 4, + 4, 8, 5, 5, 5, 3, 5, 3, 5, 5, + 2, 5, 5, 2, 3, 5, 2, 4, 2, 5, + 5, 3, 3, 4, 6, 5, 7, 9, 4, 7, + 5, 2, 5, 5, 2, 2, 5, 4, 1, 0, + 1, 1, 11, 1, 1, 1, 1, 3, 1, 3, + 1, 1, 3, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0 }; -/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE - doesn't specify something else to do. Zero means the default is an - error. */ -static const short yydefact[] = -{ - 1, 0, 0, 0, 0, 0, 74, 74, 0, 0, - 0, 74, 74, 74, 0, 0, 74, 74, 0, 74, - 74, 74, 74, 0, 74, 0, 0, 74, 74, 74, - 74, 74, 0, 74, 74, 2, 3, 46, 0, 50, - 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 21, - 0, 0, 27, 29, 0, 0, 0, 0, 0, 42, - 0, 0, 49, 0, 51, 0, 0, 7, 57, 59, - 61, 62, 0, 65, 67, 66, 0, 69, 70, 68, - 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, - 0, 25, 0, 18, 0, 16, 0, 74, 0, 74, - 0, 0, 0, 0, 0, 32, 33, 0, 0, 0, - 4, 5, 0, 0, 0, 0, 0, 64, 8, 9, - 10, 72, 0, 71, 0, 0, 0, 11, 48, 0, - 0, 0, 0, 0, 0, 0, 34, 0, 39, 0, - 0, 0, 28, 0, 0, 0, 0, 0, 0, 6, - 56, 54, 55, 58, 60, 63, 13, 14, 15, 0, - 47, 23, 22, 26, 19, 17, 0, 0, 36, 0, - 0, 20, 30, 31, 41, 43, 44, 0, 0, 35, - 73, 0, 0, 0, 0, 0, 37, 0, 40, 0, - 12, 0, 0, 38, 0, 0, 0, 0, 53, 0, - 0 +static const short yydefact[] = { 1, + 0, 0, 0, 0, 0, 74, 74, 0, 0, 0, + 74, 74, 74, 0, 0, 74, 74, 0, 74, 74, + 74, 74, 0, 74, 0, 0, 74, 74, 74, 74, + 74, 0, 74, 74, 2, 3, 46, 0, 50, 45, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 24, 0, 0, 0, 0, 0, 21, 0, + 0, 27, 29, 0, 0, 0, 0, 0, 42, 0, + 0, 49, 0, 51, 0, 0, 7, 57, 59, 61, + 62, 0, 65, 67, 66, 0, 69, 70, 68, 0, + 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, + 25, 0, 18, 0, 16, 0, 74, 0, 74, 0, + 0, 0, 0, 0, 32, 33, 0, 0, 0, 4, + 5, 0, 0, 0, 0, 0, 64, 8, 9, 10, + 72, 0, 71, 0, 0, 0, 11, 48, 0, 0, + 0, 0, 0, 0, 0, 34, 0, 39, 0, 0, + 0, 28, 0, 0, 0, 0, 0, 0, 6, 56, + 54, 55, 58, 60, 63, 13, 14, 15, 0, 47, + 23, 22, 26, 19, 17, 0, 0, 36, 0, 0, + 20, 30, 31, 41, 43, 44, 0, 0, 35, 73, + 0, 0, 0, 0, 0, 37, 0, 40, 0, 12, + 0, 0, 38, 0, 0, 0, 0, 53, 0, 0 }; -static const short yydefgoto[] = -{ - 1, 35, 36, 73, 75, 96, 123, 163, 82, 86, - 90, 132, 133, 191, 41 +static const short yydefgoto[] = { 1, + 35, 36, 73, 75, 96, 123, 163, 82, 86, 90, + 132, 133, 191, 41 }; -static const short yypact[] = -{ - -32768, 42, -7, 8, 20, 24,-32768,-32768, 44, 59, - 62,-32768,-32768,-32768, 83, 89,-32768,-32768, 47,-32768, - -32768,-32768,-32768, 97, 98, 16, 99,-32768,-32768,-32768, - -32768,-32768, 100,-32768,-32768,-32768,-32768,-32768, 49, 53, - -32768, 103, 104, 70, 6, 7, 106, 107, 108, 54, - 60, 112, 113,-32768, 114, 39, 41, 87, -46,-32768, - 115, 67,-32768,-32768, 117, 118, 119, 120, 122,-32768, - 123, 124,-32768, 125,-32768, 126, 69,-32768, 128, 129, - -32768, -13, 130,-32768,-32768,-32768, 131,-32768,-32768,-32768, - 132, 76, 76, 76, 91,-32768, 133, 76, 76, 76, - 76,-32768, 76,-32768, 81,-32768, 93,-32768, 134,-32768, - 90, 76, 136, 76, 76,-32768,-32768, 76, 76, 76, - -32768,-32768, 137, 139, 48, 48, 60,-32768,-32768,-32768, - -32768,-32768, 140,-32768, 141, 142, 147,-32768,-32768, 144, - 145, 146, 148, 149, 150, 105,-32768, 95,-32768, 138, - 152, 154,-32768, 155, 156, 157, 158, 159, 111,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 153, - -32768,-32768,-32768,-32768,-32768,-32768, 161, 116,-32768, 116, - 121,-32768,-32768,-32768,-32768,-32768,-32768, 162, 127,-32768, - -32768, 164, 163, 166, 135, 167,-32768, 76,-32768, 168, - -32768, 171, 143,-32768, 172, 151, 173, 160,-32768, 184, - -32768 +static const short yypact[] = {-32768, + 42, -7, 8, 20, 24,-32768,-32768, 44, 59, 62, +-32768,-32768,-32768, 83, 89,-32768,-32768, 47,-32768,-32768, +-32768,-32768, 97, 98, 16, 99,-32768,-32768,-32768,-32768, +-32768, 100,-32768,-32768,-32768,-32768,-32768, 49, 53,-32768, + 103, 104, 70, 6, 7, 106, 107, 108, 54, 60, + 112, 113,-32768, 114, 39, 41, 87, -46,-32768, 115, + 67,-32768,-32768, 117, 118, 119, 120, 122,-32768, 123, + 124,-32768, 125,-32768, 126, 69,-32768, 128, 129,-32768, + -13, 130,-32768,-32768,-32768, 131,-32768,-32768,-32768, 132, + 76, 76, 76, 91,-32768, 133, 76, 76, 76, 76, +-32768, 76,-32768, 81,-32768, 93,-32768, 134,-32768, 90, + 76, 136, 76, 76,-32768,-32768, 76, 76, 76,-32768, +-32768, 137, 139, 48, 48, 60,-32768,-32768,-32768,-32768, +-32768, 140,-32768, 141, 142, 147,-32768,-32768, 144, 145, + 146, 148, 149, 150, 105,-32768, 95,-32768, 138, 152, + 154,-32768, 155, 156, 157, 158, 159, 111,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 153,-32768, +-32768,-32768,-32768,-32768,-32768, 161, 116,-32768, 116, 121, +-32768,-32768,-32768,-32768,-32768,-32768, 162, 127,-32768,-32768, + 164, 163, 166, 135, 167,-32768, 76,-32768, 168,-32768, + 171, 143,-32768, 172, 151, 173, 160,-32768, 184,-32768 }; -static const short yypgoto[] = -{ - -32768,-32768,-32768,-32768,-32768, -77,-32768, 38,-32768,-32768, - -32768, -92,-32768, 9, 17 +static const short yypgoto[] = {-32768, +-32768,-32768,-32768,-32768, -77,-32768, 38,-32768,-32768,-32768, + -92,-32768, 9, 17 }; #define YYLAST 225 -static const short yytable[] = -{ - 134, 135, 126, 106, 127, 139, 140, 141, 142, 37, - 143, 87, 88, 83, 107, 108, 109, 84, 85, 151, - 89, 153, 154, 38, 42, 155, 156, 157, 46, 47, - 48, 61, 62, 51, 52, 39, 54, 55, 56, 57, - 40, 60, 209, 2, 64, 65, 66, 67, 68, 165, - 70, 71, 95, 160, 100, 101, 102, 103, 161, 43, - 3, 4, 162, 53, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 78, 44, 110, 79, 45, 80, 81, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 49, 32, - 33, 34, 104, 105, 50, 201, 136, 137, 145, 146, - 177, 178, 58, 72, 59, 63, 69, 74, 76, 94, - 77, 91, 92, 93, 147, 95, 149, 97, 98, 99, - 111, 112, 113, 114, 122, 115, 116, 117, 118, 119, - 131, 120, 121, 124, 125, 144, 128, 129, 130, 138, - 148, 150, 152, 179, 158, 159, 166, 167, 168, 169, - 170, 171, 172, 164, 173, 174, 175, 180, 188, 176, - 181, 182, 183, 184, 185, 186, 187, 189, 197, 194, - 196, 190, 198, 200, 210, 202, 193, 203, 192, 205, - 207, 0, 195, 0, 0, 0, 0, 0, 0, 0, - 199, 0, 0, 0, 0, 0, 0, 0, 204, 0, - 0, 0, 0, 0, 0, 0, 206, 0, 0, 0, - 0, 0, 0, 0, 0, 208 +static const short yytable[] = { 134, + 135, 126, 106, 127, 139, 140, 141, 142, 37, 143, + 87, 88, 83, 107, 108, 109, 84, 85, 151, 89, + 153, 154, 38, 42, 155, 156, 157, 46, 47, 48, + 61, 62, 51, 52, 39, 54, 55, 56, 57, 40, + 60, 209, 2, 64, 65, 66, 67, 68, 165, 70, + 71, 95, 160, 100, 101, 102, 103, 161, 43, 3, + 4, 162, 53, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 78, 44, 110, 79, 45, 80, 81, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 49, 32, 33, + 34, 104, 105, 50, 201, 136, 137, 145, 146, 177, + 178, 58, 72, 59, 63, 69, 74, 76, 94, 77, + 91, 92, 93, 147, 95, 149, 97, 98, 99, 111, + 112, 113, 114, 122, 115, 116, 117, 118, 119, 131, + 120, 121, 124, 125, 144, 128, 129, 130, 138, 148, + 150, 152, 179, 158, 159, 166, 167, 168, 169, 170, + 171, 172, 164, 173, 174, 175, 180, 188, 176, 181, + 182, 183, 184, 185, 186, 187, 189, 197, 194, 196, + 190, 198, 200, 210, 202, 193, 203, 192, 205, 207, + 0, 195, 0, 0, 0, 0, 0, 0, 0, 199, + 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, + 0, 0, 0, 0, 0, 206, 0, 0, 0, 0, + 0, 0, 0, 0, 208 }; -static const short yycheck[] = -{ - 92, 93, 15, 49, 81, 97, 98, 99, 100, 16, - 102, 4, 5, 7, 60, 61, 62, 11, 12, 111, - 13, 113, 114, 15, 7, 117, 118, 119, 11, 12, - 13, 15, 16, 16, 17, 15, 19, 20, 21, 22, - 16, 24, 0, 1, 27, 28, 29, 30, 31, 126, - 33, 34, 65, 5, 15, 16, 15, 16, 10, 15, - 18, 19, 14, 16, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 3, 15, 58, 6, 15, 8, 9, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 15, 57, - 58, 59, 15, 16, 15, 197, 15, 16, 15, 16, - 15, 16, 15, 64, 16, 16, 16, 64, 15, 65, - 16, 15, 15, 15, 107, 65, 109, 15, 15, 15, - 15, 64, 15, 15, 65, 16, 16, 15, 15, 15, - 64, 16, 16, 15, 15, 64, 16, 16, 16, 16, - 16, 61, 16, 15, 17, 16, 16, 16, 16, 12, - 16, 16, 16, 125, 16, 16, 16, 15, 15, 64, - 16, 16, 16, 16, 16, 16, 65, 16, 15, 17, - 16, 65, 16, 16, 0, 17, 65, 16, 179, 17, - 17, -1, 65, -1, -1, -1, -1, -1, -1, -1, - 65, -1, -1, -1, -1, -1, -1, -1, 65, -1, - -1, -1, -1, -1, -1, -1, 65, -1, -1, -1, - -1, -1, -1, -1, -1, 65 +static const short yycheck[] = { 92, + 93, 15, 49, 81, 97, 98, 99, 100, 16, 102, + 4, 5, 7, 60, 61, 62, 11, 12, 111, 13, + 113, 114, 15, 7, 117, 118, 119, 11, 12, 13, + 15, 16, 16, 17, 15, 19, 20, 21, 22, 16, + 24, 0, 1, 27, 28, 29, 30, 31, 126, 33, + 34, 65, 5, 15, 16, 15, 16, 10, 15, 18, + 19, 14, 16, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 3, 15, 58, 6, 15, 8, 9, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 15, 57, 58, + 59, 15, 16, 15, 197, 15, 16, 15, 16, 15, + 16, 15, 64, 16, 16, 16, 64, 15, 65, 16, + 15, 15, 15, 107, 65, 109, 15, 15, 15, 15, + 64, 15, 15, 65, 16, 16, 15, 15, 15, 64, + 16, 16, 15, 15, 64, 16, 16, 16, 16, 16, + 61, 16, 15, 17, 16, 16, 16, 16, 12, 16, + 16, 16, 125, 16, 16, 16, 15, 15, 64, 16, + 16, 16, 16, 16, 16, 65, 16, 15, 17, 16, + 65, 16, 16, 0, 17, 65, 16, 179, 17, 17, + -1, 65, -1, -1, -1, -1, -1, -1, -1, 65, + -1, -1, -1, -1, -1, -1, -1, 65, -1, -1, + -1, -1, -1, -1, -1, 65, -1, -1, -1, -1, + -1, -1, -1, -1, 65 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/share/bison/bison.simple" +/* This file comes from bison-1.28. */ /* Skeleton output parser for bison, - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software - Foundation, Inc. + Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. 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 @@ -468,131 +443,62 @@ This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -/* This is the parser code that is written into each bison parser when - the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free -# endif -#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */ - - -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - short yyss; - YYSTYPE yyvs; -# if YYLSP_NEEDED - YYLTYPE yyls; -# endif -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# if YYLSP_NEEDED -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAX) -# else -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAX) -# endif - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - register YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (0) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (0) +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +#ifndef YYSTACK_USE_ALLOCA +#ifdef alloca +#define YYSTACK_USE_ALLOCA +#else /* alloca not defined */ +#ifdef __GNUC__ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca +#else /* not GNU C. */ +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) +#define YYSTACK_USE_ALLOCA +#include +#else /* not sparc */ +/* We think this test detects Watcom and Microsoft C. */ +/* This used to test MSDOS, but that is a bad idea + since that symbol is in the user namespace. */ +#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) +#if 0 /* No need for malloc.h, which pollutes the namespace; + instead, just don't use alloca. */ +#include +#endif +#else /* not MSDOS, or __TURBOC__ */ +#if defined(_AIX) +/* I don't know what this was needed for, but it pollutes the namespace. + So I turned it off. rms, 2 May 1997. */ +/* #include */ + #pragma alloca +#define YYSTACK_USE_ALLOCA +#else /* not MSDOS, or __TURBOC__, or _AIX */ +#if 0 +#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, + and on HPUX 10. Eventually we can turn this on. */ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca +#endif /* __hpux */ +#endif +#endif /* not _AIX */ +#endif /* not MSDOS, or __TURBOC__ */ +#endif /* not sparc */ +#endif /* not GNU C */ +#endif /* alloca not defined */ +#endif /* YYSTACK_USE_ALLOCA not defined */ +#ifdef YYSTACK_USE_ALLOCA +#define YYSTACK_ALLOC alloca +#else +#define YYSTACK_ALLOC malloc #endif - -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif +/* Note: there must be only one dollar sign in this file. + It is replaced by the list of actions, each action + as one case of the switch. */ #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) @@ -601,161 +507,131 @@ #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. +/* Like YYERROR except do call yyerror. + This remains here temporarily to ease the + transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ #define YYFAIL goto yyerrlab #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ +#define YYBACKUP(token, value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ + { yychar = (token), yylval = (value); \ yychar1 = YYTRANSLATE (yychar); \ YYPOPSTACK; \ goto yybackup; \ } \ else \ - { \ - yyerror ("syntax error: cannot back up"); \ - YYERROR; \ - } \ + { yyerror ("syntax error: cannot back up"); YYERROR; } \ while (0) #define YYTERROR 1 #define YYERRCODE 256 +#ifndef YYPURE +#define YYLEX yylex() +#endif + +#ifdef YYPURE +#ifdef YYLSP_NEEDED +#ifdef YYLEX_PARAM +#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) +#else +#define YYLEX yylex(&yylval, &yylloc) +#endif +#else /* not YYLSP_NEEDED */ +#ifdef YYLEX_PARAM +#define YYLEX yylex(&yylval, YYLEX_PARAM) +#else +#define YYLEX yylex(&yylval) +#endif +#endif /* not YYLSP_NEEDED */ +#endif + +/* If nonreentrant, generate the variables here */ -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). +#ifndef YYPURE - When YYLLOC_DEFAULT is run, CURRENT is set the location of the - first token. By default, to implement support for ranges, extend - its range to the last symbol. */ - -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; +int yychar; /* the lookahead symbol */ +YYSTYPE yylval; /* the semantic value of the */ + /* lookahead symbol */ + +#ifdef YYLSP_NEEDED +YYLTYPE yylloc; /* location data for the lookahead */ + /* symbol */ #endif +int yynerrs; /* number of parse errors so far */ +#endif /* not YYPURE */ -/* YYLEX -- calling `yylex' with the right arguments. */ - -#if YYPURE -# if YYLSP_NEEDED -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval, &yylloc) -# endif -# else /* !YYLSP_NEEDED */ -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval) -# endif -# endif /* !YYLSP_NEEDED */ -#else /* !YYPURE */ -# define YYLEX yylex () -#endif /* !YYPURE */ - - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif +#if YYDEBUG != 0 +int yydebug; /* nonzero means print parse trace */ +/* Since this is uninitialized, it does not stop multiple parsers + from coexisting. */ +#endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (0) -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -#endif /* !YYDEBUG */ +/* YYINITDEPTH indicates the initial size of the parser's stacks */ -/* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH -# define YYINITDEPTH 200 +#define YYINITDEPTH 200 #endif -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ +/* YYMAXDEPTH is the maximum size the stacks can grow to + (effective only if the built-in stack extension method is used). */ #if YYMAXDEPTH == 0 -# undef YYMAXDEPTH +#undef YYMAXDEPTH #endif #ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 +#define YYMAXDEPTH 10000 #endif -#ifdef YYERROR_VERBOSE - -# ifndef yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -static YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) -yystrlen (const char *yystr) -# else -yystrlen (yystr) - const char *yystr; -# endif -{ - register const char *yys = yystr; +/* Define __yy_memcpy. Note that the size argument + should be passed with type unsigned int, because that is what the non-GCC + definitions require. With GCC, __builtin_memcpy takes an arg + of type size_t, but it can handle unsigned int. */ + +#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ +#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) +#else /* not GNU C or C++ */ +#ifndef __cplusplus + +/* This is the most reliable way to avoid incompatibilities + in available built-in functions on various systems. */ +static void +__yy_memcpy (to, from, count) + char *to; + char *from; + unsigned int count; +{ + register char *f = from; + register char *t = to; + register int i = count; - while (*yys++ != '\0') - continue; - - return yys - yystr - 1; + while (i-- > 0) + *t++ = *f++; } -# endif -# endif -# ifndef yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -static char * -# if defined (__STDC__) || defined (__cplusplus) -yystpcpy (char *yydest, const char *yysrc) -# else -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -# endif -{ - register char *yyd = yydest; - register const char *yys = yysrc; +#else /* __cplusplus */ - while ((*yyd++ = *yys++) != '\0') - continue; +/* This is the most reliable way to avoid incompatibilities + in available built-in functions on various systems. */ +static void +__yy_memcpy (char *to, char *from, unsigned int count) +{ + register char *t = to; + register char *f = from; + register int i = count; - return yyd - 1; + while (i-- > 0) + *t++ = *f++; } -# endif -# endif + +#endif #endif -#line 315 "/usr/share/bison/bison.simple" - +#line 217 "/usr/share/bison/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -764,121 +640,76 @@ to the proper pointer type. */ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -# define YYPARSE_PARAM_DECL -# else -# define YYPARSE_PARAM_ARG YYPARSE_PARAM -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -# endif -#else /* !YYPARSE_PARAM */ -# define YYPARSE_PARAM_ARG -# define YYPARSE_PARAM_DECL -#endif /* !YYPARSE_PARAM */ +#ifdef __cplusplus +#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM +#define YYPARSE_PARAM_DECL +#else /* not __cplusplus */ +#define YYPARSE_PARAM_ARG YYPARSE_PARAM +#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; +#endif /* not __cplusplus */ +#else /* not YYPARSE_PARAM */ +#define YYPARSE_PARAM_ARG +#define YYPARSE_PARAM_DECL +#endif /* not YYPARSE_PARAM */ /* Prevent warning if -Wstrict-prototypes. */ #ifdef __GNUC__ -# ifdef YYPARSE_PARAM +#ifdef YYPARSE_PARAM int yyparse (void *); -# else +#else int yyparse (void); -# endif #endif - -/* YY_DECL_VARIABLES -- depending whether we use a pure parser, - variables are global, or local to YYPARSE. */ - -#define YY_DECL_NON_LSP_VARIABLES \ -/* The lookahead symbol. */ \ -int yychar; \ - \ -/* The semantic value of the lookahead symbol. */ \ -YYSTYPE yylval; \ - \ -/* Number of parse errors so far. */ \ -int yynerrs; - -#if YYLSP_NEEDED -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES \ - \ -/* Location data for the lookahead symbol. */ \ -YYLTYPE yylloc; -#else -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES #endif - -/* If nonreentrant, generate the variables here. */ - -#if !YYPURE -YY_DECL_VARIABLES -#endif /* !YYPURE */ - int -yyparse (YYPARSE_PARAM_ARG) +yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL { - /* If reentrant, generate the variables here. */ -#if YYPURE - YY_DECL_VARIABLES -#endif /* !YYPURE */ - register int yystate; register int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ - int yychar1 = 0; - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; register short *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; register YYSTYPE *yyvsp; + int yyerrstatus; /* number of tokens to shift before error messages enabled */ + int yychar1 = 0; /* lookahead token as an internal (translated) token number */ -#if YYLSP_NEEDED - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; + short yyssa[YYINITDEPTH]; /* the state stack */ + YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ + + short *yyss = yyssa; /* refer to the stacks thru separate pointers */ + YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ + +#ifdef YYLSP_NEEDED + YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ YYLTYPE *yyls = yylsa; YYLTYPE *yylsp; -#endif -#if YYLSP_NEEDED -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) +#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) #else -# define YYPOPSTACK (yyvsp--, yyssp--) +#define YYPOPSTACK (yyvsp--, yyssp--) #endif - YYSIZE_T yystacksize = YYINITDEPTH; + int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; - - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; -#if YYLSP_NEEDED - YYLTYPE yyloc; +#ifdef YYPURE + int yychar; + YYSTYPE yylval; + int yynerrs; +#ifdef YYLSP_NEEDED + YYLTYPE yylloc; +#endif #endif - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ + YYSTYPE yyval; /* the variable used to return */ + /* semantic values from the action */ + /* routines */ + int yylen; - YYDPRINTF ((stderr, "Starting parse\n")); +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Starting parse\n"); +#endif yystate = 0; yyerrstatus = 0; @@ -890,110 +721,110 @@ so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; + yyssp = yyss - 1; yyvsp = yyvs; -#if YYLSP_NEEDED +#ifdef YYLSP_NEEDED yylsp = yyls; #endif - goto yysetstate; -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ - yyssp++; +/* Push a new state, which is found in yystate . */ +/* In all cases, when you get here, the value and location stacks + have just been pushed. so pushing a state here evens the stacks. */ +yynewstate: - yysetstate: - *yyssp = yystate; + *++yyssp = yystate; if (yyssp >= yyss + yystacksize - 1) { + /* Give user a chance to reallocate the stack */ + /* Use copies of these so that the &'s don't force the real ones into memory. */ + YYSTYPE *yyvs1 = yyvs; + short *yyss1 = yyss; +#ifdef YYLSP_NEEDED + YYLTYPE *yyls1 = yyls; +#endif + /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + int size = yyssp - yyss + 1; #ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. */ -# if YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - yyls = yyls1; -# else - yyoverflow ("parser stack overflow", - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); -# endif - yyss = yyss1; - yyvs = yyvs1; - } + /* Each stack pointer address is followed by the size of + the data in use in that stack, in bytes. */ +#ifdef YYLSP_NEEDED + /* This used to be a conditional around just the two extra args, + but that might be undefined if yyoverflow is a macro. */ + yyoverflow("parser stack overflow", + &yyss1, size * sizeof (*yyssp), + &yyvs1, size * sizeof (*yyvsp), + &yyls1, size * sizeof (*yylsp), + &yystacksize); +#else + yyoverflow("parser stack overflow", + &yyss1, size * sizeof (*yyssp), + &yyvs1, size * sizeof (*yyvsp), + &yystacksize); +#endif + + yyss = yyss1; yyvs = yyvs1; +#ifdef YYLSP_NEEDED + yyls = yyls1; +#endif #else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyoverflowlab; -# else /* Extend the stack our own way. */ if (yystacksize >= YYMAXDEPTH) - goto yyoverflowlab; + { + yyerror("parser stack overflow"); + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 2; + } yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; - - { - short *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyoverflowlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); -# if YYLSP_NEEDED - YYSTACK_RELOCATE (yyls); -# endif -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif +#ifndef YYSTACK_USE_ALLOCA + yyfree_stacks = 1; +#endif + yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, + size * (unsigned int) sizeof (*yyssp)); + yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, + size * (unsigned int) sizeof (*yyvsp)); +#ifdef YYLSP_NEEDED + yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, + size * (unsigned int) sizeof (*yylsp)); +#endif #endif /* no yyoverflow */ - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; -#if YYLSP_NEEDED - yylsp = yyls + yysize - 1; + yyssp = yyss + size - 1; + yyvsp = yyvs + size - 1; +#ifdef YYLSP_NEEDED + yylsp = yyls + size - 1; #endif - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Stack size increased to %d\n", yystacksize); +#endif if (yyssp >= yyss + yystacksize - 1) YYABORT; } - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Entering state %d\n", yystate); +#endif goto yybackup; - - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: + yybackup: /* Do appropriate processing given the current state. */ /* Read a lookahead token if we need one and don't already have one. */ @@ -1012,7 +843,10 @@ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Reading a token: "); +#endif yychar = YYLEX; } @@ -1023,25 +857,25 @@ yychar1 = 0; yychar = YYEOF; /* Don't call YYLEX any more */ - YYDPRINTF ((stderr, "Now at end of input.\n")); +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Now at end of input.\n"); +#endif } else { - yychar1 = YYTRANSLATE (yychar); + yychar1 = YYTRANSLATE(yychar); -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ +#if YYDEBUG != 0 if (yydebug) { - YYFPRINTF (stderr, "Next token is %d (%s", - yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise - meaning of a token, for further debugging info. */ -# ifdef YYPRINT + fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); + /* Give the individual parser a way to print the precise meaning + of a token, for further debugging info. */ +#ifdef YYPRINT YYPRINT (stderr, yychar, yylval); -# endif - YYFPRINTF (stderr, ")\n"); +#endif + fprintf (stderr, ")\n"); } #endif } @@ -1073,106 +907,84 @@ YYACCEPT; /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %d (%s), ", - yychar, yytname[yychar1])); + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); +#endif /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; *++yyvsp = yylval; -#if YYLSP_NEEDED +#ifdef YYLSP_NEEDED *++yylsp = yylloc; #endif - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; + /* count tokens shifted since error; after three, turn off error status. */ + if (yyerrstatus) yyerrstatus--; yystate = yyn; goto yynewstate; - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ +/* Do the default action for the current state. */ yydefault: + yyn = yydefact[yystate]; if (yyn == 0) goto yyerrlab; - goto yyreduce; - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ +/* Do a reduction. yyn is the number of a rule to reduce with. */ yyreduce: - /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; + if (yylen > 0) + yyval = yyvsp[1-yylen]; /* implement default value of the action */ - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to the semantic value of - the lookahead token. This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - -#if YYLSP_NEEDED - /* Similarly for the default location. Let the user run additional - commands if for instance locations are ranges. */ - yyloc = yylsp[1-yylen]; - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); -#endif - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ +#if YYDEBUG != 0 if (yydebug) { - int yyi; + int i; - YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); + fprintf (stderr, "Reducing via rule %d (line %d), ", + yyn, yyrline[yyn]); /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); + for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) + fprintf (stderr, "%s ", yytname[yyrhs[i]]); + fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); } #endif + switch (yyn) { case 2: -#line 154 "../../inetutils/ftpd/ftpcmd.y" +#line 154 "ftpcmd.y" { if (fromname != NULL) free (fromname); fromname = (char *) 0; restart_point = (off_t) 0; - } - break; + ; + break;} case 4: -#line 165 "../../inetutils/ftpd/ftpcmd.y" +#line 165 "ftpcmd.y" { user(yyvsp[-1].s); free(yyvsp[-1].s); - } - break; + ; + break;} case 5: -#line 170 "../../inetutils/ftpd/ftpcmd.y" +#line 170 "ftpcmd.y" { pass(yyvsp[-1].s); memset (yyvsp[-1].s, 0, strlen (yyvsp[-1].s)); free(yyvsp[-1].s); - } - break; + ; + break;} case 6: -#line 176 "../../inetutils/ftpd/ftpcmd.y" +#line 176 "ftpcmd.y" { usedefault = 0; if (pdata >= 0) { @@ -1193,17 +1005,17 @@ reply(500, "Illegal PORT Command"); } } - } - break; + ; + break;} case 7: -#line 198 "../../inetutils/ftpd/ftpcmd.y" +#line 198 "ftpcmd.y" { if (yyvsp[-1].i) passive(); - } - break; + ; + break;} case 8: -#line 203 "../../inetutils/ftpd/ftpcmd.y" +#line 203 "ftpcmd.y" { switch (cmd_type) { @@ -1237,10 +1049,10 @@ UNIMPLEMENTED for NBBY != 8 #endif /* NBBY == 8 */ } - } - break; + ; + break;} case 9: -#line 238 "../../inetutils/ftpd/ftpcmd.y" +#line 238 "ftpcmd.y" { switch (yyvsp[-1].i) { @@ -1251,10 +1063,10 @@ default: reply(504, "Unimplemented STRU type."); } - } - break; + ; + break;} case 10: -#line 250 "../../inetutils/ftpd/ftpcmd.y" +#line 250 "ftpcmd.y" { switch (yyvsp[-1].i) { @@ -1265,105 +1077,105 @@ default: reply(502, "Unimplemented MODE type."); } - } - break; + ; + break;} case 11: -#line 262 "../../inetutils/ftpd/ftpcmd.y" +#line 262 "ftpcmd.y" { reply(202, "ALLO command ignored."); - } - break; + ; + break;} case 12: -#line 266 "../../inetutils/ftpd/ftpcmd.y" +#line 266 "ftpcmd.y" { reply(202, "ALLO command ignored."); - } - break; + ; + break;} case 13: -#line 270 "../../inetutils/ftpd/ftpcmd.y" +#line 270 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) retrieve((char *) 0, yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 14: -#line 277 "../../inetutils/ftpd/ftpcmd.y" +#line 277 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) store(yyvsp[-1].s, "w", 0); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 15: -#line 284 "../../inetutils/ftpd/ftpcmd.y" +#line 284 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) store(yyvsp[-1].s, "a", 0); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 16: -#line 291 "../../inetutils/ftpd/ftpcmd.y" +#line 291 "ftpcmd.y" { if (yyvsp[-1].i) send_file_list("."); - } - break; + ; + break;} case 17: -#line 296 "../../inetutils/ftpd/ftpcmd.y" +#line 296 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) send_file_list(yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 18: -#line 303 "../../inetutils/ftpd/ftpcmd.y" +#line 303 "ftpcmd.y" { if (yyvsp[-1].i) retrieve("/bin/ls -lgA", ""); - } - break; + ; + break;} case 19: -#line 308 "../../inetutils/ftpd/ftpcmd.y" +#line 308 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) retrieve("/bin/ls -lgA %s", yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 20: -#line 315 "../../inetutils/ftpd/ftpcmd.y" +#line 315 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) statfilecmd(yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 21: -#line 322 "../../inetutils/ftpd/ftpcmd.y" +#line 322 "ftpcmd.y" { statcmd(); - } - break; + ; + break;} case 22: -#line 326 "../../inetutils/ftpd/ftpcmd.y" +#line 326 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) delete(yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 23: -#line 333 "../../inetutils/ftpd/ftpcmd.y" +#line 333 "ftpcmd.y" { if (yyvsp[-3].i) { if (fromname) { @@ -1375,38 +1187,38 @@ } } free (yyvsp[-1].s); - } - break; + ; + break;} case 24: -#line 346 "../../inetutils/ftpd/ftpcmd.y" +#line 346 "ftpcmd.y" { reply(225, "ABOR command successful."); - } - break; + ; + break;} case 25: -#line 350 "../../inetutils/ftpd/ftpcmd.y" +#line 350 "ftpcmd.y" { if (yyvsp[-1].i) cwd(cred.homedir); - } - break; + ; + break;} case 26: -#line 355 "../../inetutils/ftpd/ftpcmd.y" +#line 355 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) cwd(yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 27: -#line 362 "../../inetutils/ftpd/ftpcmd.y" +#line 362 "ftpcmd.y" { help(cmdtab, (char *) 0); - } - break; + ; + break;} case 28: -#line 366 "../../inetutils/ftpd/ftpcmd.y" +#line 366 "ftpcmd.y" { char *cp = yyvsp[-1].s; @@ -1422,62 +1234,62 @@ help(cmdtab, yyvsp[-1].s); if (yyvsp[-1].s != NULL) free (yyvsp[-1].s); - } - break; + ; + break;} case 29: -#line 383 "../../inetutils/ftpd/ftpcmd.y" +#line 383 "ftpcmd.y" { reply(200, "NOOP command successful."); - } - break; + ; + break;} case 30: -#line 387 "../../inetutils/ftpd/ftpcmd.y" +#line 387 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) makedir(yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 31: -#line 394 "../../inetutils/ftpd/ftpcmd.y" +#line 394 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) removedir(yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 32: -#line 401 "../../inetutils/ftpd/ftpcmd.y" +#line 401 "ftpcmd.y" { if (yyvsp[-1].i) pwd(); - } - break; + ; + break;} case 33: -#line 406 "../../inetutils/ftpd/ftpcmd.y" +#line 406 "ftpcmd.y" { if (yyvsp[-1].i) cwd(".."); - } - break; + ; + break;} case 34: -#line 411 "../../inetutils/ftpd/ftpcmd.y" +#line 411 "ftpcmd.y" { help(sitetab, (char *) 0); - } - break; + ; + break;} case 35: -#line 415 "../../inetutils/ftpd/ftpcmd.y" +#line 415 "ftpcmd.y" { help(sitetab, yyvsp[-1].s); if (yyvsp[-1].s != NULL) free (yyvsp[-1].s); - } - break; + ; + break;} case 36: -#line 421 "../../inetutils/ftpd/ftpcmd.y" +#line 421 "ftpcmd.y" { int oldmask; @@ -1486,10 +1298,10 @@ (void) umask(oldmask); reply(200, "Current UMASK is %03o", oldmask); } - } - break; + ; + break;} case 37: -#line 431 "../../inetutils/ftpd/ftpcmd.y" +#line 431 "ftpcmd.y" { int oldmask; @@ -1503,10 +1315,10 @@ yyvsp[-1].i, oldmask); } } - } - break; + ; + break;} case 38: -#line 446 "../../inetutils/ftpd/ftpcmd.y" +#line 446 "ftpcmd.y" { if (yyvsp[-5].i && (yyvsp[-1].s != NULL)) { if (yyvsp[-3].i > 0777) @@ -1519,18 +1331,18 @@ } if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 39: -#line 460 "../../inetutils/ftpd/ftpcmd.y" +#line 460 "ftpcmd.y" { reply(200, "Current IDLE time limit is %d seconds; max %d", timeout, maxtimeout); - } - break; + ; + break;} case 40: -#line 466 "../../inetutils/ftpd/ftpcmd.y" +#line 466 "ftpcmd.y" { if (yyvsp[-4].i) { if (yyvsp[-1].i < 30 || yyvsp[-1].i > maxtimeout) { @@ -1545,19 +1357,19 @@ timeout); } } - } - break; + ; + break;} case 41: -#line 482 "../../inetutils/ftpd/ftpcmd.y" +#line 482 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) store(yyvsp[-1].s, "w", 1); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 42: -#line 489 "../../inetutils/ftpd/ftpcmd.y" +#line 489 "ftpcmd.y" { const char *sys_type; /* Official rfc-defined os type. */ char *version = 0; /* A more specific type. */ @@ -1594,19 +1406,19 @@ if (version) free (version); #endif - } - break; + ; + break;} case 43: -#line 535 "../../inetutils/ftpd/ftpcmd.y" +#line 535 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) sizecmd(yyvsp[-1].s); if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 44: -#line 552 "../../inetutils/ftpd/ftpcmd.y" +#line 552 "ftpcmd.y" { if (yyvsp[-3].i && yyvsp[-1].s != NULL) { struct stat stbuf; @@ -1627,23 +1439,23 @@ } if (yyvsp[-1].s != NULL) free(yyvsp[-1].s); - } - break; + ; + break;} case 45: -#line 574 "../../inetutils/ftpd/ftpcmd.y" +#line 574 "ftpcmd.y" { reply(221, "Goodbye."); dologout(0); - } - break; + ; + break;} case 46: -#line 579 "../../inetutils/ftpd/ftpcmd.y" +#line 579 "ftpcmd.y" { yyerrok; - } - break; + ; + break;} case 47: -#line 585 "../../inetutils/ftpd/ftpcmd.y" +#line 585 "ftpcmd.y" { restart_point = (off_t) 0; if (yyvsp[-3].i && yyvsp[-1].s) { @@ -1653,10 +1465,10 @@ } if (fromname == (char *) 0 && yyvsp[-1].s) free(yyvsp[-1].s); - } - break; + ; + break;} case 48: -#line 596 "../../inetutils/ftpd/ftpcmd.y" +#line 596 "ftpcmd.y" { if (fromname != NULL) free (fromname); @@ -1667,16 +1479,16 @@ ? "Restarting at %qd. %s" : "Restarting at %ld. %s"), restart_point, "Send STORE or RETRIEVE to initiate transfer."); - } - break; + ; + break;} case 50: -#line 615 "../../inetutils/ftpd/ftpcmd.y" +#line 615 "ftpcmd.y" { yyval.s = (char *)calloc(1, sizeof(char)); - } - break; + ; + break;} case 53: -#line 628 "../../inetutils/ftpd/ftpcmd.y" +#line 628 "ftpcmd.y" { char *a, *p; @@ -1685,119 +1497,119 @@ p = (char *)&data_dest.sin_port; p[0] = yyvsp[-2].i; p[1] = yyvsp[0].i; data_dest.sin_family = AF_INET; - } - break; + ; + break;} case 54: -#line 641 "../../inetutils/ftpd/ftpcmd.y" +#line 641 "ftpcmd.y" { yyval.i = FORM_N; - } - break; + ; + break;} case 55: -#line 645 "../../inetutils/ftpd/ftpcmd.y" +#line 645 "ftpcmd.y" { yyval.i = FORM_T; - } - break; + ; + break;} case 56: -#line 649 "../../inetutils/ftpd/ftpcmd.y" +#line 649 "ftpcmd.y" { yyval.i = FORM_C; - } - break; + ; + break;} case 57: -#line 656 "../../inetutils/ftpd/ftpcmd.y" +#line 656 "ftpcmd.y" { cmd_type = TYPE_A; cmd_form = FORM_N; - } - break; + ; + break;} case 58: -#line 661 "../../inetutils/ftpd/ftpcmd.y" +#line 661 "ftpcmd.y" { cmd_type = TYPE_A; cmd_form = yyvsp[0].i; - } - break; + ; + break;} case 59: -#line 666 "../../inetutils/ftpd/ftpcmd.y" +#line 666 "ftpcmd.y" { cmd_type = TYPE_E; cmd_form = FORM_N; - } - break; + ; + break;} case 60: -#line 671 "../../inetutils/ftpd/ftpcmd.y" +#line 671 "ftpcmd.y" { cmd_type = TYPE_E; cmd_form = yyvsp[0].i; - } - break; + ; + break;} case 61: -#line 676 "../../inetutils/ftpd/ftpcmd.y" +#line 676 "ftpcmd.y" { cmd_type = TYPE_I; - } - break; + ; + break;} case 62: -#line 680 "../../inetutils/ftpd/ftpcmd.y" +#line 680 "ftpcmd.y" { cmd_type = TYPE_L; cmd_bytesz = NBBY; - } - break; + ; + break;} case 63: -#line 685 "../../inetutils/ftpd/ftpcmd.y" +#line 685 "ftpcmd.y" { cmd_type = TYPE_L; cmd_bytesz = yyvsp[0].i; - } - break; + ; + break;} case 64: -#line 691 "../../inetutils/ftpd/ftpcmd.y" +#line 691 "ftpcmd.y" { cmd_type = TYPE_L; cmd_bytesz = yyvsp[0].i; - } - break; + ; + break;} case 65: -#line 699 "../../inetutils/ftpd/ftpcmd.y" +#line 699 "ftpcmd.y" { yyval.i = STRU_F; - } - break; + ; + break;} case 66: -#line 703 "../../inetutils/ftpd/ftpcmd.y" +#line 703 "ftpcmd.y" { yyval.i = STRU_R; - } - break; + ; + break;} case 67: -#line 707 "../../inetutils/ftpd/ftpcmd.y" +#line 707 "ftpcmd.y" { yyval.i = STRU_P; - } - break; + ; + break;} case 68: -#line 714 "../../inetutils/ftpd/ftpcmd.y" +#line 714 "ftpcmd.y" { yyval.i = MODE_S; - } - break; + ; + break;} case 69: -#line 718 "../../inetutils/ftpd/ftpcmd.y" +#line 718 "ftpcmd.y" { yyval.i = MODE_B; - } - break; + ; + break;} case 70: -#line 722 "../../inetutils/ftpd/ftpcmd.y" +#line 722 "ftpcmd.y" { yyval.i = MODE_C; - } - break; + ; + break;} case 71: -#line 729 "../../inetutils/ftpd/ftpcmd.y" +#line 729 "ftpcmd.y" { /* * Problem: this production is used for all pathname @@ -1830,10 +1642,10 @@ free(yyvsp[0].s); } else yyval.s = yyvsp[0].s; - } - break; + ; + break;} case 73: -#line 770 "../../inetutils/ftpd/ftpcmd.y" +#line 770 "ftpcmd.y" { int ret, dec, multby, digit; @@ -1855,10 +1667,10 @@ dec /= 10; } yyval.i = ret; - } - break; + ; + break;} case 74: -#line 797 "../../inetutils/ftpd/ftpcmd.y" +#line 797 "ftpcmd.y" { if (cred.logged_in) yyval.i = 1; @@ -1866,38 +1678,52 @@ reply(530, "Please login with USER and PASS."); yyval.i = 0; } - } - break; + ; + break;} } - -#line 705 "/usr/share/bison/bison.simple" - + /* the action file gets copied in in place of this dollarsign */ +#line 543 "/usr/share/bison/bison.simple" yyvsp -= yylen; yyssp -= yylen; -#if YYLSP_NEEDED +#ifdef YYLSP_NEEDED yylsp -= yylen; #endif -#if YYDEBUG +#if YYDEBUG != 0 if (yydebug) { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); + short *ssp1 = yyss - 1; + fprintf (stderr, "state stack now"); + while (ssp1 != yyssp) + fprintf (stderr, " %d", *++ssp1); + fprintf (stderr, "\n"); } #endif *++yyvsp = yyval; -#if YYLSP_NEEDED - *++yylsp = yyloc; + +#ifdef YYLSP_NEEDED + yylsp++; + if (yylen == 0) + { + yylsp->first_line = yylloc.first_line; + yylsp->first_column = yylloc.first_column; + yylsp->last_line = (yylsp-1)->last_line; + yylsp->last_column = (yylsp-1)->last_column; + yylsp->text = 0; + } + else + { + yylsp->last_line = (yylsp+yylen-1)->last_line; + yylsp->last_column = (yylsp+yylen-1)->last_column; + } #endif - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ + /* Now "shift" the result of the reduction. + Determine what state that goes to, + based on the state we popped back to + and the rule number reduced by. */ yyn = yyr1[yyn]; @@ -1909,13 +1735,10 @@ goto yynewstate; +yyerrlab: /* here on detecting error */ -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) + if (! yyerrstatus) + /* If not already recovering from an error, report this error. */ { ++yynerrs; @@ -1924,121 +1747,102 @@ if (yyn > YYFLAG && yyn < YYLAST) { - YYSIZE_T yysize = 0; - char *yymsg; - int yyx, yycount; - - yycount = 0; - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) - if (yycheck[yyx + yyn] == yyx) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("parse error, unexpected ") + 1; - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) + int size = 0; + char *msg; + int x, count; + + count = 0; + /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ + for (x = (yyn < 0 ? -yyn : 0); + x < (sizeof(yytname) / sizeof(char *)); x++) + if (yycheck[x + yyn] == x) + size += strlen(yytname[x]) + 15, count++; + msg = (char *) malloc(size + 15); + if (msg != 0) { - char *yyp = yystpcpy (yymsg, "parse error, unexpected "); - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); + strcpy(msg, "parse error"); - if (yycount < 5) + if (count < 5) { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) - if (yycheck[yyx + yyn] == yyx) + count = 0; + for (x = (yyn < 0 ? -yyn : 0); + x < (sizeof(yytname) / sizeof(char *)); x++) + if (yycheck[x + yyn] == x) { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); - yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; + strcat(msg, count == 0 ? ", expecting `" : " or `"); + strcat(msg, yytname[x]); + strcat(msg, "'"); + count++; } } - yyerror (yymsg); - YYSTACK_FREE (yymsg); + yyerror(msg); + free(msg); } else - yyerror ("parse error; also virtual memory exhausted"); + yyerror ("parse error; also virtual memory exceeded"); } else -#endif /* defined (YYERROR_VERBOSE) */ - yyerror ("parse error"); +#endif /* YYERROR_VERBOSE */ + yyerror("parse error"); } - goto yyerrlab1; + goto yyerrlab1; +yyerrlab1: /* here on error raised explicitly by an action */ -/*--------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action | -`--------------------------------------------------*/ -yyerrlab1: if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + /* if just tried and failed to reuse lookahead token after an error, discard it. */ /* return failure if at end of input */ if (yychar == YYEOF) YYABORT; - YYDPRINTF ((stderr, "Discarding token %d (%s).\n", - yychar, yytname[yychar1])); + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); +#endif + yychar = YYEMPTY; } - /* Else will try to reuse lookahead token after shifting the error - token. */ + /* Else will try to reuse lookahead token + after shifting the error token. */ yyerrstatus = 3; /* Each real token shifted decrements this */ goto yyerrhandle; +yyerrdefault: /* current state does not do anything special for the error token. */ -/*-------------------------------------------------------------------. -| yyerrdefault -- current state does not do anything special for the | -| error token. | -`-------------------------------------------------------------------*/ -yyerrdefault: #if 0 /* This is wrong; only states that explicitly want error tokens should shift them. */ - - /* If its default is to accept any token, ok. Otherwise pop it. */ - yyn = yydefact[yystate]; - if (yyn) - goto yydefault; + yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ + if (yyn) goto yydefault; #endif +yyerrpop: /* pop the current state because it cannot handle the error token */ -/*---------------------------------------------------------------. -| yyerrpop -- pop the current state because it cannot handle the | -| error token | -`---------------------------------------------------------------*/ -yyerrpop: - if (yyssp == yyss) - YYABORT; + if (yyssp == yyss) YYABORT; yyvsp--; yystate = *--yyssp; -#if YYLSP_NEEDED +#ifdef YYLSP_NEEDED yylsp--; #endif -#if YYDEBUG +#if YYDEBUG != 0 if (yydebug) { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); + short *ssp1 = yyss - 1; + fprintf (stderr, "Error: state stack now"); + while (ssp1 != yyssp) + fprintf (stderr, " %d", *++ssp1); + fprintf (stderr, "\n"); } #endif -/*--------------. -| yyerrhandle. | -`--------------*/ yyerrhandle: + yyn = yypact[yystate]; if (yyn == YYFLAG) goto yyerrdefault; @@ -2061,47 +1865,44 @@ if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Shifting error token, "); +#endif *++yyvsp = yylval; -#if YYLSP_NEEDED +#ifdef YYLSP_NEEDED *++yylsp = yylloc; #endif yystate = yyn; goto yynewstate; + yyacceptlab: + /* YYACCEPT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 0; -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -/*---------------------------------------------. -| yyoverflowab -- parser overflow comes here. | -`---------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); - yyresult = 2; - /* Fall through. */ - -yyreturn: -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); + yyabortlab: + /* YYABORT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); #endif - return yyresult; + } + return 1; } -#line 807 "../../inetutils/ftpd/ftpcmd.y" +#line 807 "ftpcmd.y" #define CMD 0 /* beginning of command */ diff -ruN inetutils-1.4.0/glob/Makefile.in inetutils-1.4.1/glob/Makefile.in --- inetutils-1.4.0/glob/Makefile.in Wed Jul 31 17:58:24 2002 +++ inetutils-1.4.1/glob/Makefile.in Mon Sep 2 19:02:22 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff -ruN inetutils-1.4.0/gwhois/Makefile.in inetutils-1.4.1/gwhois/Makefile.in --- inetutils-1.4.0/gwhois/Makefile.in Wed Jul 31 17:58:24 2002 +++ inetutils-1.4.1/gwhois/Makefile.in Mon Sep 2 19:03:19 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -174,8 +174,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -184,8 +183,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/headers/Makefile.in inetutils-1.4.1/headers/Makefile.in --- inetutils-1.4.0/headers/Makefile.in Wed Jul 31 17:58:24 2002 +++ inetutils-1.4.1/headers/Makefile.in Mon Sep 2 19:02:12 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff -ruN inetutils-1.4.0/inetd/Makefile.in inetutils-1.4.1/inetd/Makefile.in --- inetutils-1.4.0/inetd/Makefile.in Wed Jul 31 17:58:24 2002 +++ inetutils-1.4.1/inetd/Makefile.in Mon Sep 2 19:02:25 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -150,7 +150,7 @@ NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = ChangeLog Makefile.am Makefile.in +DIST_COMMON = ChangeLog Makefile.am Makefile.in TODO SOURCES = $(inetd_SOURCES) all: all-am @@ -170,8 +170,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -180,8 +179,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/inetd/TODO inetutils-1.4.1/inetd/TODO --- inetutils-1.4.0/inetd/TODO Wed Dec 31 19:00:00 1969 +++ inetutils-1.4.1/inetd/TODO Mon Sep 2 09:53:11 2002 @@ -0,0 +1,12 @@ +Parse config file /etc/inetd.conf +Parse config files /etc/inetd.d/* + +Maybe have additional config file: /etc/inetdrc for controlling behaviour + +Create pidfile /var/run/inetd.pid + +Reread config file on HUP signal + +Write echo, chargen, discard, daytime, time + + diff -ruN inetutils-1.4.0/install-sh inetutils-1.4.1/install-sh --- inetutils-1.4.0/install-sh Tue Jun 18 00:00:10 2002 +++ inetutils-1.4.1/install-sh Sun Aug 4 02:04:46 2002 @@ -128,7 +128,7 @@ # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f $src -o -d $src ] + if [ -f "$src" ] || [ -d "$src" ] then : else diff -ruN inetutils-1.4.0/libicmp/Makefile.in inetutils-1.4.1/libicmp/Makefile.in --- inetutils-1.4.0/libicmp/Makefile.in Wed Jul 31 17:58:25 2002 +++ inetutils-1.4.1/libicmp/Makefile.in Mon Sep 2 19:03:25 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff -ruN inetutils-1.4.0/libinetutils/Makefile.in inetutils-1.4.1/libinetutils/Makefile.in --- inetutils-1.4.0/libinetutils/Makefile.in Wed Jul 31 17:58:25 2002 +++ inetutils-1.4.1/libinetutils/Makefile.in Mon Sep 2 19:02:15 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff -ruN inetutils-1.4.0/libls/Makefile.in inetutils-1.4.1/libls/Makefile.in --- inetutils-1.4.0/libls/Makefile.in Wed Jul 31 17:58:25 2002 +++ inetutils-1.4.1/libls/Makefile.in Mon Sep 2 19:02:31 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff -ruN inetutils-1.4.0/libtelnet/Makefile.in inetutils-1.4.1/libtelnet/Makefile.in --- inetutils-1.4.0/libtelnet/Makefile.in Wed Jul 31 17:58:25 2002 +++ inetutils-1.4.1/libtelnet/Makefile.in Mon Sep 2 19:02:19 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff -ruN inetutils-1.4.0/logger/Makefile.in inetutils-1.4.1/logger/Makefile.in --- inetutils-1.4.0/logger/Makefile.in Wed Jul 31 17:58:26 2002 +++ inetutils-1.4.1/logger/Makefile.in Mon Sep 2 19:03:17 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -169,8 +169,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -179,8 +178,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/mkinstalldirs inetutils-1.4.1/mkinstalldirs --- inetutils-1.4.0/mkinstalldirs Tue Jun 18 00:00:10 2002 +++ inetutils-1.4.1/mkinstalldirs Sun Aug 4 02:04:46 2002 @@ -4,8 +4,6 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ - errstatus=0 dirmode="" diff -ruN inetutils-1.4.0/ping/ChangeLog inetutils-1.4.1/ping/ChangeLog --- inetutils-1.4.0/ping/ChangeLog Mon Jun 24 13:03:40 2002 +++ inetutils-1.4.1/ping/ChangeLog Wed Aug 21 21:35:08 2002 @@ -1,3 +1,7 @@ +2002-08-09 Sergey Poznyakoff + + * ping.c (main): Restored ping startup to its right place. + 2002-06-24 Alfred M. Szmidt * ping.c (main): Moved ping startup code to after the parsing diff -ruN inetutils-1.4.0/ping/Makefile.in inetutils-1.4.1/ping/Makefile.in --- inetutils-1.4.0/ping/Makefile.in Wed Jul 31 17:58:26 2002 +++ inetutils-1.4.1/ping/Makefile.in Mon Sep 2 19:03:28 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -181,8 +181,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -191,8 +190,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/ping/ping.c inetutils-1.4.1/ping/ping.c --- inetutils-1.4.0/ping/ping.c Mon Jun 24 13:03:26 2002 +++ inetutils-1.4.1/ping/ping.c Wed Aug 21 21:35:08 2002 @@ -112,6 +112,16 @@ u_char *patptr = NULL; int is_root = getuid () == 0; + if ((ping = ping_init (ICMP_ECHO, getpid ())) == NULL) + { + fprintf (stderr, "can't init ping: %s\n", strerror (errno)); + exit (1); + } + ping_set_sockopt (ping, SO_BROADCAST, (char *)&one, sizeof (one)); + + /* Reset root privileges */ + setuid (getuid ()); + /* Parse command line */ while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF) diff -ruN inetutils-1.4.0/rcp/ChangeLog inetutils-1.4.1/rcp/ChangeLog --- inetutils-1.4.0/rcp/ChangeLog Tue May 14 11:27:05 2002 +++ inetutils-1.4.1/rcp/ChangeLog Mon Sep 2 10:15:18 2002 @@ -1,3 +1,8 @@ +2002-09-02 Jeff Bailey + + * rcp.c: Add support for rcp -V, Thanks to Chris Ulherr + for reporting this. + 2002-05-14 Sergey Poznyakoff * rcp.c: Checks for HAVE_DECL variables must read diff -ruN inetutils-1.4.0/rcp/Makefile.in inetutils-1.4.1/rcp/Makefile.in --- inetutils-1.4.0/rcp/Makefile.in Wed Jul 31 17:58:26 2002 +++ inetutils-1.4.1/rcp/Makefile.in Mon Sep 2 19:03:07 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -175,8 +175,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -185,8 +184,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/rcp/rcp.c inetutils-1.4.1/rcp/rcp.c --- inetutils-1.4.0/rcp/rcp.c Tue May 14 11:25:29 2002 +++ inetutils-1.4.1/rcp/rcp.c Mon Sep 2 10:14:39 2002 @@ -99,12 +99,12 @@ # ifdef CRYPT int doencrypt = 0; -# define OPTIONS "dfKk:prtx" +# define OPTIONS "dfKk:prtxV" # else -# define OPTIONS "dfKk:prt" +# define OPTIONS "dfKk:prtV" # endif #else -# define OPTIONS "dfprt" +# define OPTIONS "dfprtV" #endif /* KERBEROS */ #if !defined (S_ISTXT) && defined (S_ISVTX) diff -ruN inetutils-1.4.0/rexecd/Makefile.in inetutils-1.4.1/rexecd/Makefile.in --- inetutils-1.4.0/rexecd/Makefile.in Wed Jul 31 17:58:26 2002 +++ inetutils-1.4.1/rexecd/Makefile.in Mon Sep 2 19:02:46 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -171,8 +171,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -181,8 +180,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/rlogin/Makefile.in inetutils-1.4.1/rlogin/Makefile.in --- inetutils-1.4.0/rlogin/Makefile.in Wed Jul 31 17:58:27 2002 +++ inetutils-1.4.1/rlogin/Makefile.in Mon Sep 2 19:03:10 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -171,8 +171,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -181,8 +180,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/rlogind/Makefile.in inetutils-1.4.1/rlogind/Makefile.in --- inetutils-1.4.0/rlogind/Makefile.in Wed Jul 31 17:58:27 2002 +++ inetutils-1.4.1/rlogind/Makefile.in Mon Sep 2 19:02:40 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -171,8 +171,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -181,8 +180,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/rsh/Makefile.in inetutils-1.4.1/rsh/Makefile.in --- inetutils-1.4.0/rsh/Makefile.in Wed Jul 31 17:58:27 2002 +++ inetutils-1.4.1/rsh/Makefile.in Mon Sep 2 19:03:05 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -171,8 +171,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -181,8 +180,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/rshd/ChangeLog inetutils-1.4.1/rshd/ChangeLog --- inetutils-1.4.0/rshd/ChangeLog Mon Apr 29 17:27:05 2002 +++ inetutils-1.4.1/rshd/ChangeLog Mon Sep 2 10:16:20 2002 @@ -1,3 +1,9 @@ +2002-09-02 Jeff Bailey + + * rshd.c: We must not seteuid before we setuid. If we do, we + don't have priviledges to complete the second operation. Thanks + to Chris Ulherr for reporting this. + 2002-04-29 Alfred M. Szmidt * rshd.c : Include removed. diff -ruN inetutils-1.4.0/rshd/Makefile.in inetutils-1.4.1/rshd/Makefile.in --- inetutils-1.4.0/rshd/Makefile.in Wed Jul 31 17:58:27 2002 +++ inetutils-1.4.1/rshd/Makefile.in Mon Sep 2 19:02:38 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -170,8 +170,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -180,8 +179,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/rshd/rshd.c inetutils-1.4.1/rshd/rshd.c --- inetutils-1.4.0/rshd/rshd.c Mon Apr 29 17:16:53 2002 +++ inetutils-1.4.1/rshd/rshd.c Mon Sep 2 10:13:37 2002 @@ -861,7 +861,10 @@ #ifdef HAVE_INITGROUPS initgroups (pwd->pw_name, pwd->pw_gid); /* BSD groups */ #endif - seteuid ((uid_t)pwd->pw_uid); + /* It's not obvious that this is right, however, it was reported + * as a real bug, and this conforms to what the glibc manual says + * setuid should handle the seteuid as well. + * seteuid ((uid_t)pwd->pw_uid); */ setuid ((uid_t)pwd->pw_uid); /* Set up an initial environment for the shell that we exec() */ diff -ruN inetutils-1.4.0/syslogd/ChangeLog inetutils-1.4.1/syslogd/ChangeLog --- inetutils-1.4.0/syslogd/ChangeLog Mon Apr 29 17:27:05 2002 +++ inetutils-1.4.1/syslogd/ChangeLog Mon Sep 2 18:58:26 2002 @@ -1,3 +1,15 @@ +2002-09-02 Sergey Poznyakoff + + * syslogd.c: '**' extension (Michael Deutschmann + allows to catch all facilities + not specified explicitely in the configuration file. + +2002-08-21 Sergey Poznyakoff + + * syslogd.c (main): Fixed memory overrun when writing long + data blocks from /proc/kmsg. Thanks to Michael Deutschmann + + 2002-04-29 Alfred M. Szmidt * syslogd.c : Include removed. diff -ruN inetutils-1.4.0/syslogd/Makefile.in inetutils-1.4.1/syslogd/Makefile.in --- inetutils-1.4.0/syslogd/Makefile.in Wed Jul 31 17:58:28 2002 +++ inetutils-1.4.1/syslogd/Makefile.in Mon Sep 2 19:02:49 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -172,8 +172,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -182,8 +181,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/syslogd/syslogd.c inetutils-1.4.1/syslogd/syslogd.c --- inetutils-1.4.0/syslogd/syslogd.c Mon Apr 29 17:18:10 2002 +++ inetutils-1.4.1/syslogd/syslogd.c Mon Sep 2 18:58:26 2002 @@ -135,6 +135,14 @@ # include #endif +/* A mask of all facilities mentioned explicitly in the configuration file + * + * This is used to support a virtual facility "**" that covers all the rest, + * so that messages to unexpected facilities won't be lost when "*" is + * not logged to a file. + */ +int facilities_seen; + const char *ConfFile = PATH_LOGCONF; /* Default Configuration file. */ const char *PidFile = PATH_LOGPID; /* Default path to tuck pid. */ char ctty[] = PATH_CONSOLE; /* Default console to send message info. */ @@ -334,7 +342,7 @@ exit (err); } -static const char *short_options = "a:dhf:l:m:np:rs:VS"; +static const char *short_options = "a:dhf:Kl:m:np:rs:VS"; static struct option long_options[] = { { "debug", no_argument, 0, 'd' }, @@ -613,7 +621,7 @@ dbg_printf ("off & running....\n"); - (void) signal (SIGHUP, trigger_restart); + signal (SIGHUP, trigger_restart); if (Debug) { @@ -710,19 +718,19 @@ if (log_kline) { - char *eol; + char *bol, *eol; kline[kline_len] = '\0'; - while ((eol = strchr (kline, '\n'))) + for (bol = kline, eol = strchr (kline, '\n'); eol; + bol = eol, eol = strchr (bol, '\n')) { *(eol++) = '\0'; - printsys (kline); - kline_len -= (eol - kline); - memmove (kline, eol, kline_len); + kline_len -= (eol - bol); + printsys (bol); } - if (kline_len == sizeof (kline) - 1) + if (*bol) /* Log the beginning of a partial line. */ - printsys (kline); + printsys (bol); } } else if (fdarray[i].fd == finet) @@ -982,7 +990,7 @@ char *lp, *q, line[MAXLINE + 1]; const char *p; - (void) strcpy (line, "vmunix: "); + strcpy (line, "vmunix: "); lp = line + strlen (line); for (p = msg; *p != '\0'; ) { @@ -1639,6 +1647,8 @@ Files = NULL; nextp = &Files; + facilities_seen = 0; + /* Open the configuration file. */ cf = fopen (ConfFile, "r"); if (cf == NULL) @@ -1869,12 +1879,19 @@ if (*buf == '*') for (i = 0; i <= LOG_NFACILITIES; i++) { + /* make "**" act as a wildcard only for facilities not + * specified elsewhere + */ + if (buf[1] == '*' && ((1 << i) & facilities_seen)) + continue; f->f_pmask[i] &= ~pri_clear; f->f_pmask[i] |= pri_set; } else { i = decode (buf, facilitynames); + facilities_seen |= (1 << LOG_FAC(i)); + if (i < 0) { snprintf (ebuf, sizeof (ebuf), diff -ruN inetutils-1.4.0/talk/Makefile.in inetutils-1.4.1/talk/Makefile.in --- inetutils-1.4.0/talk/Makefile.in Wed Jul 31 17:58:28 2002 +++ inetutils-1.4.1/talk/Makefile.in Mon Sep 2 19:03:22 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -182,8 +182,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -192,8 +191,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/talkd/Makefile.in inetutils-1.4.1/talkd/Makefile.in --- inetutils-1.4.0/talkd/Makefile.in Wed Jul 31 17:58:28 2002 +++ inetutils-1.4.1/talkd/Makefile.in Mon Sep 2 19:02:55 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -182,8 +182,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -192,8 +191,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/telnet/Makefile.in inetutils-1.4.1/telnet/Makefile.in --- inetutils-1.4.0/telnet/Makefile.in Wed Jul 31 17:58:28 2002 +++ inetutils-1.4.1/telnet/Makefile.in Mon Sep 2 19:02:59 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -186,8 +186,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -196,8 +195,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/telnetd/ChangeLog inetutils-1.4.1/telnetd/ChangeLog --- inetutils-1.4.0/telnetd/ChangeLog Mon Apr 29 17:27:05 2002 +++ inetutils-1.4.1/telnetd/ChangeLog Wed Aug 21 21:35:08 2002 @@ -1,3 +1,7 @@ +2002-08-04 Sergey Poznyakoff + + * telnetd/Makefile.am (PATHDEF_DEV): Added to INCLUDES. + 2002-04-29 Alfred M. Szmidt * telnetd.c : Include removed. diff -ruN inetutils-1.4.0/telnetd/Makefile.am inetutils-1.4.1/telnetd/Makefile.am --- inetutils-1.4.0/telnetd/Makefile.am Sun Apr 28 13:30:03 2002 +++ inetutils-1.4.1/telnetd/Makefile.am Wed Aug 21 21:35:08 2002 @@ -14,7 +14,7 @@ @PATHDEFS_MAKE@ -INCLUDES = $(PATHDEF_TTY) $(PATHDEF_LOGIN) -I$(top_builddir)/include \ +INCLUDES = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN) -I$(top_builddir)/include \ -I$(top_srcdir) @INCAUTH@ LIBTERMCAP = @LIBTERMCAP@ diff -ruN inetutils-1.4.0/telnetd/Makefile.in inetutils-1.4.1/telnetd/Makefile.in --- inetutils-1.4.0/telnetd/Makefile.in Wed Jul 31 17:58:29 2002 +++ inetutils-1.4.1/telnetd/Makefile.in Mon Sep 2 19:02:28 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -118,7 +118,7 @@ man_MANS = telnetd.8 -INCLUDES = $(PATHDEF_TTY) $(PATHDEF_LOGIN) -I$(top_builddir)/include \ +INCLUDES = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN) -I$(top_builddir)/include \ -I$(top_srcdir) @INCAUTH@ @@ -185,8 +185,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -195,8 +194,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/tftp/Makefile.in inetutils-1.4.1/tftp/Makefile.in --- inetutils-1.4.0/tftp/Makefile.in Wed Jul 31 17:58:29 2002 +++ inetutils-1.4.1/tftp/Makefile.in Mon Sep 2 19:03:13 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -173,8 +173,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -183,8 +182,7 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff -ruN inetutils-1.4.0/tftpd/Makefile.in inetutils-1.4.1/tftpd/Makefile.in --- inetutils-1.4.0/tftpd/Makefile.in Wed Jul 31 17:58:29 2002 +++ inetutils-1.4.1/tftpd/Makefile.in Mon Sep 2 19:02:52 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -170,8 +170,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -180,8 +179,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done diff -ruN inetutils-1.4.0/uucpd/Makefile.in inetutils-1.4.1/uucpd/Makefile.in --- inetutils-1.4.0/uucpd/Makefile.in Wed Jul 31 17:58:29 2002 +++ inetutils-1.4.1/uucpd/Makefile.in Mon Sep 2 19:02:43 2002 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -164,8 +164,7 @@ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(inetdaemonPROGRAMS_INSTALL) $$p $(DESTDIR)$(inetdaemondir)/$$f; \ else :; fi; \ @@ -174,8 +173,7 @@ uninstall-inetdaemonPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(inetdaemon_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(inetdaemondir)/$$f"; \ rm -f $(DESTDIR)$(inetdaemondir)/$$f; \ done