diff --git a/SRC/INSTALL b/SRC/INSTALL index ca296af..97014ae 100644 --- a/SRC/INSTALL +++ b/SRC/INSTALL @@ -1,16 +1,17 @@ echoping appears to compile and run at least on Tru64 (ex-Digital Unix, ex-OSF/1), Solaris, Linux, SunOS, FreeBSD, NetBSD, IRIX and -Ultrix. You do not have to be root to install it. +AI/X. You do not have to be root to install it. -Just type "./configure", then "make", and then (as root if necessary), -"make install". +Just type "./configure", then "make", "make test" if you wish (some +tests depend on local servers and/or Internet access, interpret with +care) and then (as root if necessary), "make install". "configure" has some options: --disable-http (suppress the HTTP support) --disable-smtp (suppress the SMTP support) --enable-icp (add the ICP support, to monitor Web proxies like Squid) ---with-ssl (add the SSL support, you will need the OpenSSL library - ) +--with-ssl[=/where/is/ssl] (add the SSL support, you will need + the OpenSSL library ) --disable-ttcp (suppress the T/TCP support which is enabled only if your system supports it - FreeBSD does. See ) @@ -18,6 +19,12 @@ Just type "./configure", then "make", and then (as root if necessary), Standard "autoconf/configure" options are supported such as --prefix to set the installation root directory. +If you get messages about va_start like: +error.c:29: macro `va_start' used with just one arg +it is a bug in echoping (triggered by C's inability to do modular +programming). Email the author and, in the meantime, configure +--without-ssl. + If 'echoping -h' replies with a "404" error while the file really exists, check first that you use the FQDN of the server on the command line (this is a consequence of the HTTP 1.1 protocol, not a bug in echoping diff --git a/SRC/configure b/SRC/configure index 401b4f1..626d997 100755 --- a/SRC/configure +++ b/SRC/configure @@ -1076,9 +1076,6 @@ else fi fi -if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall" -fi # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1091,7 +1088,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1095: checking for a BSD compatible install" >&5 +echo "configure:1092: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1146,7 +1143,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1150: checking how to run the C preprocessor" >&5 +echo "configure:1147: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1161,13 +1158,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1178,13 +1175,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1195,13 +1192,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1226,12 +1223,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1230: checking for ANSI C header files" >&5 +echo "configure:1227: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1239,7 +1236,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1256,7 +1253,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1274,7 +1271,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1295,7 +1292,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1306,7 +1303,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1333,17 +1330,17 @@ for ac_hdr in sys/time.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1337: checking for $ac_hdr" >&5 +echo "configure:1334: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1374,13 +1371,13 @@ for cf_name in sys_nerr sys_errlist do echo $ac_n "checking if external $cf_name is declared""... $ac_c" 1>&6 -echo "configure:1378: checking if external $cf_name is declared" >&5 +echo "configure:1375: checking if external $cf_name is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'$cf_name'=yes' else @@ -1423,13 +1420,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external $cf_name exists""... $ac_c" 1>&6 -echo "configure:1427: checking if external $cf_name exists" >&5 +echo "configure:1424: checking if external $cf_name exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'$cf_name'=yes' else @@ -1472,12 +1469,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1476: checking for working const" >&5 +echo "configure:1473: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1547,12 +1544,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1551: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1548: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1561,7 +1558,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1584,7 +1581,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1588: checking for socket in -lsocket" >&5 +echo "configure:1585: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1592,7 +1589,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1620,9 +1617,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking if libsocket is mandatory""... $ac_c" 1>&6 -echo "configure:1624: checking if libsocket is mandatory" >&5 +echo "configure:1621: checking if libsocket is mandatory" >&5 cat > conftest.$ac_ext < #include @@ -1638,7 +1635,7 @@ int main() { socket (AF_INET, SOCK_STREAM, 0) ; return 0; } EOF -if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1656,7 +1653,7 @@ fi echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1660: checking for gethostbyname in -lnsl" >&5 +echo "configure:1657: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1664,7 +1661,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1692,9 +1689,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking if libnsl is mandatory""... $ac_c" 1>&6 -echo "configure:1696: checking if libnsl is mandatory" >&5 +echo "configure:1693: checking if libnsl is mandatory" >&5 cat > conftest.$ac_ext < #include @@ -1703,7 +1700,7 @@ int main() { gethostbyname(domain) ; return 0; } EOF -if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1720,12 +1717,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1724: checking return type of signal handlers" >&5 +echo "configure:1721: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1742,7 +1739,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1761,12 +1758,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1765: checking for vprintf" >&5 +echo "configure:1762: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1813,12 +1810,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1817: checking for _doprnt" >&5 +echo "configure:1814: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1868,12 +1865,12 @@ fi for ac_func in gettimeofday socket gethostbyname sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1872: checking for $ac_func" >&5 +echo "configure:1869: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1925,7 +1922,7 @@ done if test "$OPENSSL" = "1"; then echo $ac_n "checking for SSL_CTX_new in -lssl""... $ac_c" 1>&6 -echo "configure:1929: checking for SSL_CTX_new in -lssl" >&5 +echo "configure:1926: checking for SSL_CTX_new in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1934,7 +1931,7 @@ else LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1969,9 +1966,9 @@ fi fi echo $ac_n "checking T/TCP""... $ac_c" 1>&6 -echo "configure:1973: checking T/TCP" >&5 +echo "configure:1970: checking T/TCP" >&5 cat > conftest.$ac_ext < #include @@ -1980,7 +1977,7 @@ int main() { int foobar = MSG_EOF; ; return 0; } EOF -if { (eval echo configure:1984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define TTCP 1 @@ -2021,6 +2018,10 @@ fi +if test "$GCC" = yes; then + CFLAGS="$CFLAGS -Wall" +fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2395,7 +2396,7 @@ echo "Configuration of echoping:" echo $ac_n "checking HTTP""... $ac_c" 1>&6 -echo "configure:2399: checking HTTP" >&5 +echo "configure:2400: checking HTTP" >&5 if eval 'test "$HTTP" = "1"' > /dev/null; then echo "$ac_t""enabled" 1>&6 else @@ -2404,7 +2405,7 @@ fi echo $ac_n "checking ICP""... $ac_c" 1>&6 -echo "configure:2408: checking ICP" >&5 +echo "configure:2409: checking ICP" >&5 if eval 'test "$ICP" = "1"' > /dev/null; then echo "$ac_t""enabled" 1>&6 else @@ -2413,7 +2414,7 @@ fi echo $ac_n "checking OPENSSL""... $ac_c" 1>&6 -echo "configure:2417: checking OPENSSL" >&5 +echo "configure:2418: checking OPENSSL" >&5 if eval 'test "$OPENSSL" = "1"' > /dev/null; then echo "$ac_t""enabled" 1>&6 else @@ -2422,7 +2423,7 @@ fi echo $ac_n "checking SMTP""... $ac_c" 1>&6 -echo "configure:2426: checking SMTP" >&5 +echo "configure:2427: checking SMTP" >&5 if eval 'test "$SMTP" = "1"' > /dev/null; then echo "$ac_t""enabled" 1>&6 else @@ -2431,7 +2432,7 @@ fi echo $ac_n "checking TTCP""... $ac_c" 1>&6 -echo "configure:2435: checking TTCP" >&5 +echo "configure:2436: checking TTCP" >&5 if eval 'test "$TTCP" = "1"' > /dev/null; then echo "$ac_t""enabled" 1>&6 else diff --git a/SRC/configure.in b/SRC/configure.in index 687f99e..76ed3d8 100644 --- a/SRC/configure.in +++ b/SRC/configure.in @@ -49,9 +49,6 @@ dnl See T/TCP later dnl Checks for programs. AC_PROG_CC -if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall" -fi AC_PROG_INSTALL dnl Checks for libraries. @@ -107,6 +104,10 @@ dnl if test "$ICP" = "1"; then dnl CF_CHECK_SERVICES dnl fi +if test "$GCC" = yes; then + CFLAGS="$CFLAGS -Wall" +fi + AC_OUTPUT(Makefile) diff --git a/SRC/echoping.h b/SRC/echoping.h index 9c1f130..06f3bed 100644 --- a/SRC/echoping.h +++ b/SRC/echoping.h @@ -1,4 +1,4 @@ -/* $Id* */ +/* $Id$ */ /* Settings you should not change -- see below for changeable ones */ diff --git a/SRC/error.c b/SRC/error.c index 1c3051c..cfca507 100644 --- a/SRC/error.c +++ b/SRC/error.c @@ -26,7 +26,9 @@ err_ret (va_alist) va_list args; char *fmt; - va_start (args); + va_start (args); /* TODO: use stdarg, otherwise, on *some* + platforms: "macro `va_start' used with just one arg" because OpenSSL + includes stdarg. */ fmt = va_arg (args, char *); vfprintf (stderr, fmt, args); va_end (args);