From 3bf623add9d175d972e27237a27bc0ac306b950b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 31 May 2003 19:06:46 +0000 Subject: [PATCH] See kes-1.31 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@557 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/configure.in | 4 +- bacula/configure | 827 +++++++++++++++++--------------- bacula/kernstodo | 8 +- bacula/scripts/mtx-changer.in | 69 +++ bacula/src/baconfig.h | 3 +- bacula/src/bacula.h | 2 + bacula/src/dird/backup.c | 22 +- bacula/src/dird/protos.h | 2 + bacula/src/dird/restore.c | 73 ++- bacula/src/dird/sql_cmds.c | 6 +- bacula/src/filed/job.c | 13 +- bacula/src/filed/restore.c | 2 + bacula/src/stored/acquire.c | 33 +- bacula/src/stored/autochanger.c | 8 +- bacula/src/stored/dev.c | 15 + bacula/src/stored/dev.h | 90 ++-- bacula/src/stored/device.c | 194 ++++---- bacula/src/stored/dircmd.c | 8 +- bacula/src/stored/mount.c | 21 +- bacula/src/stored/protos.h | 1 + bacula/src/tools/dbcheck.c | 70 ++- 21 files changed, 778 insertions(+), 693 deletions(-) create mode 100644 bacula/scripts/mtx-changer.in diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index e18b410735..0ec8bb7e4d 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -61,6 +61,7 @@ AC_PATH_PROG(TBL, tbl, tbl) AC_PATH_PROG(AR, ar, ar) AC_PATH_PROG(RANLIB, ranlib, ranlib) AC_PATH_PROG(OPENSSL, openssl, none) +AC_PATH_PROG(MTX, mtx, mtx) test -n "$ARFLAG" || ARFLAGS="cr" AC_SUBST(ARFLAGS) @@ -1402,6 +1403,7 @@ AC_OUTPUT([autoconf/Make.common \ scripts/logrotate \ scripts/bacula.desktop.gnome1 \ scripts/bacula.desktop.gnome2 \ + scripts/mtx-changer \ doc/Makefile \ src/Makefile \ src/console/Makefile \ @@ -1445,7 +1447,7 @@ AC_OUTPUT([autoconf/Make.common \ cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer -chmod 755 console gconsole +chmod 755 console gconsole mtx-changer cd .. chmod 755 src/cats/make_mysql_tables src/cats/drop_mysql_tables chmod 755 src/cats/make_test_tables src/cats/drop_test_tables diff --git a/bacula/configure b/bacula/configure index 5ca1a4f5e5..93bd1b22ed 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1833,6 +1833,42 @@ else echo "$ac_t""no" 1>&6 fi +# Extract the first word of "mtx", so it can be a program name with args. +set dummy mtx; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1840: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_MTX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$MTX" in + /*) + ac_cv_path_MTX="$MTX" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_MTX="$MTX" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_MTX="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MTX" && ac_cv_path_MTX="mtx" + ;; +esac +fi +MTX="$ac_cv_path_MTX" +if test -n "$MTX"; then + echo "$ac_t""$MTX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + test -n "$ARFLAG" || ARFLAGS="cr" @@ -1848,14 +1884,14 @@ MAKE_SHELL=/bin/sh echo $ac_n "checking for Operating System""... $ac_c" 1>&6 -echo "configure:1852: checking for Operating System" >&5 +echo "configure:1888: checking for Operating System" >&5 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1854: checking for Cygwin environment" >&5 +echo "configure:1890: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+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:1906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2212,7 +2248,7 @@ echo "$ac_t""" "" 1>&6 # ----------------------------------------------------------- # ---------------------------------------------------------- echo $ac_n "checking for Operating System Distribution""... $ac_c" 1>&6 -echo "configure:2216: checking for Operating System Distribution" >&5 +echo "configure:2252: checking for Operating System Distribution" >&5 if test "x$DISTNAME" != "x" then echo "distname set to $DISTNAME" @@ -2341,7 +2377,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2345: checking for $ac_word" >&5 +echo "configure:2381: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2472,7 +2508,7 @@ fi # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2476: checking for $ac_word" >&5 +echo "configure:2512: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2509,7 +2545,7 @@ fi no_gnome_config="yes" else echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 -echo "configure:2513: checking if $GNOME_CONFIG works" >&5 +echo "configure:2549: checking if $GNOME_CONFIG works" >&5 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 @@ -2517,7 +2553,7 @@ echo "configure:2513: checking if $GNOME_CONFIG works" >&5 # Extract the first word of "orbit-config", so it can be a program name with args. set dummy orbit-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2521: checking for $ac_word" >&5 +echo "configure:2557: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2553,7 +2589,7 @@ fi # Extract the first word of "orbit-idl", so it can be a program name with args. set dummy orbit-idl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2557: checking for $ac_word" >&5 +echo "configure:2593: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_IDL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2587,7 +2623,7 @@ else fi echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6 -echo "configure:2591: checking for working ORBit environment" >&5 +echo "configure:2627: checking for working ORBit environment" >&5 if eval "test \"`echo '$''{'gnome_cv_orbit_found'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2623,7 +2659,7 @@ fi fi echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6 -echo "configure:2627: checking for gnorba libraries" >&5 +echo "configure:2663: checking for gnorba libraries" >&5 if eval "test \"`echo '$''{'gnome_cv_gnorba_found'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2687,7 +2723,7 @@ fi if test "$no_gnome_config" = "yes"; then echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 -echo "configure:2691: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo "configure:2727: checking for gnomeConf.sh file in $gnome_prefix" >&5 if test -f $gnome_prefix/gnomeConf.sh; then echo "$ac_t""found" 1>&6 echo "loading gnome configuration from" \ @@ -2707,7 +2743,7 @@ echo "configure:2691: checking for gnomeConf.sh file in $gnome_prefix" >&5 n="" for i in $n; do echo $ac_n "checking extra library \"$i\"""... $ac_c" 1>&6 -echo "configure:2711: checking extra library \"$i\"" >&5 +echo "configure:2747: checking extra library \"$i\"" >&5 case $i in applets) @@ -2893,17 +2929,17 @@ if test "${with_readline+set}" = set; then fi ac_safe=`echo "${with_readline}/readline.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${with_readline}/readline.h""... $ac_c" 1>&6 -echo "configure:2897: checking for ${with_readline}/readline.h" >&5 +echo "configure:2933: checking for ${with_readline}/readline.h" >&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:2907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2943: \"$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* @@ -2941,17 +2977,17 @@ else # check for standard readline library ac_safe=`echo "/usr/include/readline/readline.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for /usr/include/readline/readline.h""... $ac_c" 1>&6 -echo "configure:2945: checking for /usr/include/readline/readline.h" >&5 +echo "configure:2981: checking for /usr/include/readline/readline.h" >&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:2955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2991: \"$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* @@ -2981,17 +3017,17 @@ else # Did not find standard library, so try Bacula's default ac_safe=`echo "${TOP_DIR}/depkgs/readline/readline.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${TOP_DIR}/depkgs/readline/readline.h""... $ac_c" 1>&6 -echo "configure:2985: checking for ${TOP_DIR}/depkgs/readline/readline.h" >&5 +echo "configure:3021: checking for ${TOP_DIR}/depkgs/readline/readline.h" >&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:2995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3031: \"$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* @@ -3043,12 +3079,12 @@ MAKE_SHELL=/bin/sh echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:3047: checking whether stat file-mode macros are broken" >&5 +echo "configure:3083: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3103,12 +3139,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3107: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3143: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3116,7 +3152,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3141,7 +3177,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3145: checking for opendir in -ldir" >&5 +echo "configure:3181: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3149,7 +3185,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3200: \"$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 @@ -3182,7 +3218,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3186: checking for opendir in -lx" >&5 +echo "configure:3222: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3190,7 +3226,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3241: \"$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 @@ -3227,12 +3263,12 @@ fi for ac_func in strcasecmp select setenv putenv tcgetattr setlocale lstat lchown do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3231: checking for $ac_func" >&5 +echo "configure:3267: 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:3295: \"$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 @@ -3282,12 +3318,12 @@ done for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3286: checking for $ac_func" >&5 +echo "configure:3322: 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:3350: \"$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 @@ -3340,12 +3376,12 @@ done # EXTRAOBJ="$EXTRAOBJ lib/getopt.o lib/getopt1.o"]) echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3344: checking for getopt_long" >&5 +echo "configure:3380: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+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:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getopt_long=yes" else @@ -3393,7 +3429,7 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:3397: checking for working strcoll" >&5 +echo "configure:3433: checking for working strcoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3401,7 +3437,7 @@ else ac_cv_func_strcoll_works=no else cat > conftest.$ac_ext < main () @@ -3411,7 +3447,7 @@ main () strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:3415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_strcoll_works=yes else @@ -3439,17 +3475,17 @@ for ac_hdr in varargs.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3443: checking for $ac_hdr" >&5 +echo "configure:3479: 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:3453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3489: \"$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* @@ -3614,9 +3650,9 @@ if test "${with_tcp_wrappers+set}" = set; then saved_LIBS="$LIBS" LIBS="$LIBS -lwrap -lnsl" echo $ac_n "checking for libwrap""... $ac_c" 1>&6 -echo "configure:3618: checking for libwrap" >&5 +echo "configure:3654: checking for libwrap" >&5 cat > conftest.$ac_ext < int deny_severity = 0; @@ -3626,7 +3662,7 @@ int main() { hosts_access(req); ; return 0; } EOF -if { (eval echo configure:3630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -3898,7 +3934,7 @@ fi db_found=no echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 -echo "configure:3902: checking for MySQL support" >&5 +echo "configure:3938: checking for MySQL support" >&5 # Check whether --with-mysql or --without-mysql was given. if test "${with_mysql+set}" = set; then withval="$with_mysql" @@ -4055,7 +4091,7 @@ fi db_found=no echo $ac_n "checking for SQLite support""... $ac_c" 1>&6 -echo "configure:4059: checking for SQLite support" >&5 +echo "configure:4095: checking for SQLite support" >&5 # Check whether --with-sqlite or --without-sqlite was given. if test "${with_sqlite+set}" = set; then withval="$with_sqlite" @@ -4131,19 +4167,19 @@ fi echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:4135: checking for mingw32 environment" >&5 +echo "configure:4171: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+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:4183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -4162,7 +4198,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:4166: checking for executable suffix" >&5 +echo "configure:4202: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4172,7 +4208,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:4176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:4212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -4195,7 +4231,7 @@ ac_exeext=$EXEEXT largefile_support="no" echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:4199: checking build system type" >&5 +echo "configure:4235: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -4229,7 +4265,7 @@ fi # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. set dummy ${ac_tool_prefix}getconf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4233: checking for $ac_word" >&5 +echo "configure:4269: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GETCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4259,7 +4295,7 @@ fi echo $ac_n "checking for CFLAGS value to request large file support""... $ac_c" 1>&6 -echo "configure:4263: checking for CFLAGS value to request large file support" >&5 +echo "configure:4299: checking for CFLAGS value to request large file support" >&5 if eval "test \"`echo '$''{'ac_cv_sys_largefile_CFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4274,14 +4310,14 @@ else ac_save_CC="$CC" CC="$CC $ac_cv_sys_largefile_CFLAGS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -4297,7 +4333,7 @@ fi echo "$ac_t""$ac_cv_sys_largefile_CFLAGS" 1>&6 echo $ac_n "checking for LDFLAGS value to request large file support""... $ac_c" 1>&6 -echo "configure:4301: checking for LDFLAGS value to request large file support" >&5 +echo "configure:4337: checking for LDFLAGS value to request large file support" >&5 if eval "test \"`echo '$''{'ac_cv_sys_largefile_LDFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4309,7 +4345,7 @@ fi echo "$ac_t""$ac_cv_sys_largefile_LDFLAGS" 1>&6 echo $ac_n "checking for LIBS value to request large file support""... $ac_c" 1>&6 -echo "configure:4313: checking for LIBS value to request large file support" >&5 +echo "configure:4349: checking for LIBS value to request large file support" >&5 if eval "test \"`echo '$''{'ac_cv_sys_largefile_LIBS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4364,7 +4400,7 @@ echo "$ac_t""$ac_cv_sys_largefile_LIBS" 1>&6 esac ;; esac echo $ac_n "checking for _FILE_OFFSET_BITS""... $ac_c" 1>&6 -echo "configure:4368: checking for _FILE_OFFSET_BITS" >&5 +echo "configure:4404: checking for _FILE_OFFSET_BITS" >&5 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4393,7 +4429,7 @@ EOF fi echo $ac_n "checking for _LARGEFILE_SOURCE""... $ac_c" 1>&6 -echo "configure:4397: checking for _LARGEFILE_SOURCE" >&5 +echo "configure:4433: checking for _LARGEFILE_SOURCE" >&5 if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4422,7 +4458,7 @@ EOF fi echo $ac_n "checking for _LARGE_FILES""... $ac_c" 1>&6 -echo "configure:4426: checking for _LARGE_FILES" >&5 +echo "configure:4462: checking for _LARGE_FILES" >&5 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4459,7 +4495,7 @@ EOF # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:4463: checking for X" >&5 +echo "configure:4499: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4521,12 +4557,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4566: \"$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* @@ -4595,14 +4631,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4708,17 +4744,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4712: checking whether -R must be followed by a space" >&5 +echo "configure:4748: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4734,14 +4770,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4773,7 +4809,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4777: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4813: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4781,7 +4817,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4832: \"$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 @@ -4814,7 +4850,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4818: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4854: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4822,7 +4858,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4873: \"$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 @@ -4862,12 +4898,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4866: checking for gethostbyname" >&5 +echo "configure:4902: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+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:4930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4911,7 +4947,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4915: checking for gethostbyname in -lnsl" >&5 +echo "configure:4951: 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 @@ -4919,7 +4955,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:4970: \"$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 @@ -4960,12 +4996,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4964: checking for connect" >&5 +echo "configure:5000: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+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:5028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5009,7 +5045,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:5013: checking for connect in -lsocket" >&5 +echo "configure:5049: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5017,7 +5053,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5068: \"$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 @@ -5052,12 +5088,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:5056: checking for remove" >&5 +echo "configure:5092: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+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:5120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -5101,7 +5137,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:5105: checking for remove in -lposix" >&5 +echo "configure:5141: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5109,7 +5145,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5160: \"$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 @@ -5144,12 +5180,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:5148: checking for shmat" >&5 +echo "configure:5184: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+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:5212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -5193,7 +5229,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:5197: checking for shmat in -lipc" >&5 +echo "configure:5233: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5201,7 +5237,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5252: \"$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 @@ -5245,7 +5281,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:5249: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:5285: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5253,7 +5289,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5304: \"$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 @@ -5316,17 +5352,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5320: checking for $ac_hdr" >&5 +echo "configure:5356: 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:5330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5366: \"$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* @@ -5353,12 +5389,12 @@ fi done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5357: checking for ANSI C header files" >&5 +echo "configure:5393: 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 @@ -5366,7 +5402,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5406: \"$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* @@ -5383,7 +5419,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 @@ -5401,7 +5437,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 @@ -5422,7 +5458,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5433,7 +5469,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5457,19 +5493,19 @@ EOF fi echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 -echo "configure:5461: checking whether sys/types.h defines makedev" >&5 +echo "configure:5497: checking whether sys/types.h defines makedev" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return makedev(0, 0); ; return 0; } EOF -if { (eval echo configure:5473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_sys_types_h_makedev=yes else @@ -5487,17 +5523,17 @@ echo "$ac_t""$ac_cv_header_sys_types_h_makedev" 1>&6 if test $ac_cv_header_sys_types_h_makedev = no; then ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6 -echo "configure:5491: checking for sys/mkdev.h" >&5 +echo "configure:5527: checking for sys/mkdev.h" >&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:5501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5537: \"$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* @@ -5525,17 +5561,17 @@ fi if test $ac_cv_header_sys_mkdev_h = no; then ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6 -echo "configure:5529: checking for sys/sysmacros.h" >&5 +echo "configure:5565: checking for sys/sysmacros.h" >&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:5539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5575: \"$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* @@ -5567,12 +5603,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:5571: checking for $ac_hdr that defines DIR" >&5 +echo "configure:5607: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -5580,7 +5616,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:5584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -5605,7 +5641,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:5609: checking for opendir in -ldir" >&5 +echo "configure:5645: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5613,7 +5649,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5664: \"$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 @@ -5646,7 +5682,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:5650: checking for opendir in -lx" >&5 +echo "configure:5686: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5654,7 +5690,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5705: \"$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 @@ -5688,12 +5724,12 @@ fi fi echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:5692: checking whether stat file-mode macros are broken" >&5 +echo "configure:5728: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5744,12 +5780,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:5748: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:5784: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5765,7 +5801,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:5769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -5786,12 +5822,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:5790: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:5826: 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 @@ -5800,7 +5836,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:5804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -5821,12 +5857,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:5825: checking for st_blksize in struct stat" >&5 +echo "configure:5861: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5834,7 +5870,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:5838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -5855,12 +5891,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:5859: checking for st_blocks in struct stat" >&5 +echo "configure:5895: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5868,7 +5904,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:5872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -5891,12 +5927,12 @@ else fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5895: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5931: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5904,7 +5940,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5925,12 +5961,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5929: checking for tm_zone in struct tm" >&5 +echo "configure:5965: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -5938,7 +5974,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5958,12 +5994,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5962: checking for tzname" >&5 +echo "configure:5998: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -5973,7 +6009,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5996,12 +6032,12 @@ fi echo $ac_n "checking for utime.h""... $ac_c" 1>&6 -echo "configure:6000: checking for utime.h" >&5 +echo "configure:6036: checking for utime.h" >&5 if eval "test \"`echo '$''{'ba_cv_header_utime_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6010,7 +6046,7 @@ int main() { struct utimbuf foo ; return 0; } EOF -if { (eval echo configure:6014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ba_cv_header_utime_h=yes else @@ -6029,12 +6065,12 @@ EOF echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:6033: checking for socklen_t" >&5 +echo "configure:6069: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ba_cv_header_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6043,7 +6079,7 @@ int main() { socklen_t x ; return 0; } EOF -if { (eval echo configure:6047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ba_cv_header_socklen_t=yes else @@ -6062,7 +6098,7 @@ EOF echo $ac_n "checking for bigendian""... $ac_c" 1>&6 -echo "configure:6066: checking for bigendian" >&5 +echo "configure:6102: checking for bigendian" >&5 if eval "test \"`echo '$''{'ba_cv_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6070,11 +6106,11 @@ else ba_cv_bigendian=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ba_cv_bigendian=yes else @@ -6096,12 +6132,12 @@ EOF echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6100: checking for working const" >&5 +echo "configure:6136: 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:6190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6173,17 +6209,17 @@ fi echo $ac_n "checking how to get filesystem type""... $ac_c" 1>&6 -echo "configure:6177: checking how to get filesystem type" >&5 +echo "configure:6213: checking how to get filesystem type" >&5 fstype=no # The order of these tests is important. cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6223: \"$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* @@ -6199,13 +6235,13 @@ fi rm -f conftest* if test $fstype = no; then cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6245: \"$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* @@ -6222,13 +6258,13 @@ rm -f conftest* fi if test $fstype = no; then cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6268: \"$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* @@ -6245,12 +6281,12 @@ rm -f conftest* fi if test $fstype = no; then cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6290: \"$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* @@ -6267,7 +6303,7 @@ rm -f conftest* fi if test $fstype = no; then cat > conftest.$ac_ext < EOF @@ -6284,13 +6320,13 @@ rm -f conftest* fi if test $fstype = no; then cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6330: \"$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* @@ -6308,12 +6344,12 @@ fi echo "$ac_t""$fstype" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:6312: checking return type of signal handlers" >&5 +echo "configure:6348: 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 @@ -6330,7 +6366,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:6334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -6350,13 +6386,13 @@ EOF echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6 -echo "configure:6354: checking for type of signal functions" >&5 +echo "configure:6390: checking for type of signal functions" >&5 if eval "test \"`echo '$''{'bash_cv_signal_vintage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -6369,7 +6405,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=posix else @@ -6378,7 +6414,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < int main() { @@ -6388,7 +6424,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=4.2bsd else @@ -6397,7 +6433,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -6410,7 +6446,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=svr3 else @@ -6449,12 +6485,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6453: checking for mode_t" >&5 +echo "configure:6489: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6482,12 +6518,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6486: checking for uid_t in sys/types.h" >&5 +echo "configure:6522: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -6516,12 +6552,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6520: checking for size_t" >&5 +echo "configure:6556: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6549,12 +6585,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6553: checking for pid_t" >&5 +echo "configure:6589: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6582,12 +6618,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6586: checking for off_t" >&5 +echo "configure:6622: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6615,12 +6651,12 @@ EOF fi echo $ac_n "checking for ino_t""... $ac_c" 1>&6 -echo "configure:6619: checking for ino_t" >&5 +echo "configure:6655: checking for ino_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6648,12 +6684,12 @@ EOF fi echo $ac_n "checking for dev_t""... $ac_c" 1>&6 -echo "configure:6652: checking for dev_t" >&5 +echo "configure:6688: checking for dev_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6681,12 +6717,12 @@ EOF fi echo $ac_n "checking for daddr_t""... $ac_c" 1>&6 -echo "configure:6685: checking for daddr_t" >&5 +echo "configure:6721: checking for daddr_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_daddr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6714,12 +6750,12 @@ EOF fi echo $ac_n "checking for major_t""... $ac_c" 1>&6 -echo "configure:6718: checking for major_t" >&5 +echo "configure:6754: checking for major_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_major_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6747,12 +6783,12 @@ EOF fi echo $ac_n "checking for minor_t""... $ac_c" 1>&6 -echo "configure:6751: checking for minor_t" >&5 +echo "configure:6787: checking for minor_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_minor_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6780,12 +6816,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:6784: checking for ssize_t" >&5 +echo "configure:6820: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6813,12 +6849,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:6817: checking for st_blocks in struct stat" >&5 +echo "configure:6853: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6826,7 +6862,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:6830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -6849,12 +6885,12 @@ else fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:6853: checking for st_rdev in struct stat" >&5 +echo "configure:6889: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6862,7 +6898,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:6866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -6883,12 +6919,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:6887: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:6923: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6896,7 +6932,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:6900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -6917,12 +6953,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6921: checking for working const" >&5 +echo "configure:6957: 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:7011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6994,7 +7030,7 @@ fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:6998: checking size of char" >&5 +echo "configure:7034: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7002,7 +7038,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < int main() @@ -7013,7 +7049,7 @@ int main() return(0); } EOF -if { (eval echo configure:7017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -7033,7 +7069,7 @@ EOF echo $ac_n "checking size of short int""... $ac_c" 1>&6 -echo "configure:7037: checking size of short int" >&5 +echo "configure:7073: checking size of short int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7041,7 +7077,7 @@ else ac_cv_sizeof_short_int=2 else cat > conftest.$ac_ext < int main() @@ -7052,7 +7088,7 @@ int main() return(0); } EOF -if { (eval echo configure:7056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short_int=`cat conftestval` else @@ -7072,7 +7108,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:7076: checking size of int" >&5 +echo "configure:7112: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7080,7 +7116,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < int main() @@ -7091,7 +7127,7 @@ int main() return(0); } EOF -if { (eval echo configure:7095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -7111,7 +7147,7 @@ EOF echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:7115: checking size of long int" >&5 +echo "configure:7151: checking size of long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7119,7 +7155,7 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < int main() @@ -7130,7 +7166,7 @@ int main() return(0); } EOF -if { (eval echo configure:7134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_int=`cat conftestval` else @@ -7150,7 +7186,7 @@ EOF echo $ac_n "checking size of long long int""... $ac_c" 1>&6 -echo "configure:7154: checking size of long long int" >&5 +echo "configure:7190: checking size of long long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7158,7 +7194,7 @@ else ac_cv_sizeof_long_long_int=8 else cat > conftest.$ac_ext < int main() @@ -7169,7 +7205,7 @@ int main() return(0); } EOF -if { (eval echo configure:7173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long_int=`cat conftestval` else @@ -7189,7 +7225,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:7193: checking size of int *" >&5 +echo "configure:7229: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7197,7 +7233,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < int main() @@ -7208,7 +7244,7 @@ int main() return(0); } EOF -if { (eval echo configure:7212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -7230,20 +7266,20 @@ EOF # Check for sys/types.h types echo $ac_n "checking for u_int type""... $ac_c" 1>&6 -echo "configure:7234: checking for u_int type" >&5 +echo "configure:7270: checking for u_int type" >&5 if eval "test \"`echo '$''{'ac_cv_have_u_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { u_int a; a = 1; ; return 0; } EOF -if { (eval echo configure:7247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_u_int="yes" else @@ -7267,20 +7303,20 @@ EOF fi echo $ac_n "checking for intmax_t type""... $ac_c" 1>&6 -echo "configure:7271: checking for intmax_t type" >&5 +echo "configure:7307: checking for intmax_t type" >&5 if eval "test \"`echo '$''{'ac_cv_have_intmax_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { intmax_t a; a = 1; ; return 0; } EOF -if { (eval echo configure:7284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_intmax_t="yes" else @@ -7289,14 +7325,14 @@ else rm -rf conftest* cat > conftest.$ac_ext < int main() { intmax_t a; a = 1; ; return 0; } EOF -if { (eval echo configure:7300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_intmax_t="yes" else @@ -7326,20 +7362,20 @@ fi echo $ac_n "checking for u_intmax_t type""... $ac_c" 1>&6 -echo "configure:7330: checking for u_intmax_t type" >&5 +echo "configure:7366: checking for u_intmax_t type" >&5 if eval "test \"`echo '$''{'ac_cv_have_u_intmax_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { u_intmax_t a; a = 1; ; return 0; } EOF -if { (eval echo configure:7343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_u_intmax_t="yes" else @@ -7348,14 +7384,14 @@ else rm -rf conftest* cat > conftest.$ac_ext < int main() { u_intmax_t a; a = 1; ; return 0; } EOF -if { (eval echo configure:7359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_u_intmax_t="yes" else @@ -7384,20 +7420,20 @@ fi echo $ac_n "checking for intXX_t types""... $ac_c" 1>&6 -echo "configure:7388: checking for intXX_t types" >&5 +echo "configure:7424: checking for intXX_t types" >&5 if eval "test \"`echo '$''{'ac_cv_have_intxx_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int8_t a; int16_t b; int32_t c; a = b = c = 1; ; return 0; } EOF -if { (eval echo configure:7401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_intxx_t="yes" else @@ -7421,20 +7457,20 @@ EOF fi echo $ac_n "checking for int64_t type""... $ac_c" 1>&6 -echo "configure:7425: checking for int64_t type" >&5 +echo "configure:7461: checking for int64_t type" >&5 if eval "test \"`echo '$''{'ac_cv_have_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int64_t a; a = 1; ; return 0; } EOF -if { (eval echo configure:7438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_int64_t="yes" else @@ -7458,20 +7494,20 @@ EOF fi echo $ac_n "checking for u_intXX_t types""... $ac_c" 1>&6 -echo "configure:7462: checking for u_intXX_t types" >&5 +echo "configure:7498: checking for u_intXX_t types" >&5 if eval "test \"`echo '$''{'ac_cv_have_u_intxx_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; ; return 0; } EOF -if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_u_intxx_t="yes" else @@ -7495,20 +7531,20 @@ EOF fi echo $ac_n "checking for u_int64_t types""... $ac_c" 1>&6 -echo "configure:7499: checking for u_int64_t types" >&5 +echo "configure:7535: checking for u_int64_t types" >&5 if eval "test \"`echo '$''{'ac_cv_have_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { u_int64_t a; a = 1; ; return 0; } EOF -if { (eval echo configure:7512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_u_int64_t="yes" else @@ -7535,9 +7571,9 @@ if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ test "x$ac_cv_header_sys_bitypes_h" = "xyes") then echo $ac_n "checking for intXX_t and u_intXX_t types in sys/bitypes.h""... $ac_c" 1>&6 -echo "configure:7539: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 +echo "configure:7575: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 cat > conftest.$ac_ext < int main() { @@ -7546,7 +7582,7 @@ int main() { a = b = c = e = f = g = 1; ; return 0; } EOF -if { (eval echo configure:7550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_U_INTXX_T 1 @@ -7573,13 +7609,13 @@ fi if test -z "$have_u_intxx_t" ; then echo $ac_n "checking for uintXX_t types""... $ac_c" 1>&6 -echo "configure:7577: checking for uintXX_t types" >&5 +echo "configure:7613: checking for uintXX_t types" >&5 if eval "test \"`echo '$''{'ac_cv_have_uintxx_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -7587,7 +7623,7 @@ int main() { uint32_t c; a = b = c = 1; ; return 0; } EOF -if { (eval echo configure:7591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uintxx_t="yes" else @@ -7628,12 +7664,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7632: checking for $ac_func" >&5 +echo "configure:7668: 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:7696: \"$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 @@ -7686,12 +7722,12 @@ done for ac_func in fchdir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7690: checking for $ac_func" >&5 +echo "configure:7726: 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:7754: \"$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 @@ -7744,12 +7780,12 @@ done for ac_func in strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7748: checking for $ac_func" >&5 +echo "configure:7784: 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:7812: \"$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 @@ -7803,12 +7839,12 @@ done for ac_func in chflags do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7807: checking for $ac_func" >&5 +echo "configure:7843: 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:7871: \"$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 @@ -7859,12 +7895,12 @@ done for ac_func in snprintf vsnprintf gethostid getdomainname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7863: checking for $ac_func" >&5 +echo "configure:7899: 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:7927: \"$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 @@ -7915,12 +7951,12 @@ done for ac_func in localtime_r readdir_r strerror_r gethostbyname_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7919: checking for $ac_func" >&5 +echo "configure:7955: 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:7983: \"$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 @@ -7970,12 +8006,12 @@ done # If resolver functions are not in libc check for -lnsl or -lresolv. echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:7974: checking for gethostbyname_r" >&5 +echo "configure:8010: checking for gethostbyname_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+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:8038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname_r=yes" else @@ -8016,7 +8052,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname_r in -lnsl""... $ac_c" 1>&6 -echo "configure:8020: checking for gethostbyname_r in -lnsl" >&5 +echo "configure:8056: checking for gethostbyname_r in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8024,7 +8060,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:8075: \"$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 @@ -8063,7 +8099,7 @@ else fi echo $ac_n "checking for gethostbyname_r in -lresolv""... $ac_c" 1>&6 -echo "configure:8067: checking for gethostbyname_r in -lresolv" >&5 +echo "configure:8103: checking for gethostbyname_r in -lresolv" >&5 ac_lib_var=`echo resolv'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8071,7 +8107,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8122: \"$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 @@ -8115,12 +8151,12 @@ fi # Find where sockets are (especially for Solaris) echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:8119: checking for socket" >&5 +echo "configure:8155: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+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:8183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -8161,7 +8197,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lxnet""... $ac_c" 1>&6 -echo "configure:8165: checking for socket in -lxnet" >&5 +echo "configure:8201: checking for socket in -lxnet" >&5 ac_lib_var=`echo xnet'_'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 @@ -8169,7 +8205,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8220: \"$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 @@ -8208,7 +8244,7 @@ else fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8212: checking for socket in -lsocket" >&5 +echo "configure:8248: 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 @@ -8216,7 +8252,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:8267: \"$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 @@ -8255,7 +8291,7 @@ else fi echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 -echo "configure:8259: checking for socket in -linet" >&5 +echo "configure:8295: checking for socket in -linet" >&5 ac_lib_var=`echo inet'_'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 @@ -8263,7 +8299,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8314: \"$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 @@ -8307,12 +8343,12 @@ fi for ac_func in inet_pton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8311: checking for $ac_func" >&5 +echo "configure:8347: 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:8375: \"$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 @@ -8364,12 +8400,12 @@ done echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:8368: checking for strftime" >&5 +echo "configure:8404: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+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:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -8414,7 +8450,7 @@ else echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:8418: checking for strftime in -lintl" >&5 +echo "configure:8454: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8422,7 +8458,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8473: \"$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 @@ -8460,12 +8496,12 @@ fi fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:8464: checking for vprintf" >&5 +echo "configure:8500: 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:8528: \"$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 @@ -8512,12 +8548,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:8516: checking for _doprnt" >&5 +echo "configure:8552: 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:8580: \"$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 @@ -8567,19 +8603,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:8571: checking for working alloca.h" >&5 +echo "configure:8607: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:8583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -8600,12 +8636,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:8604: checking for alloca" >&5 +echo "configure:8640: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+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:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -8665,12 +8701,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:8669: checking whether alloca needs Cray hooks" >&5 +echo "configure:8705: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8699: checking for $ac_func" >&5 +echo "configure:8735: 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:8763: \"$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 @@ -8750,7 +8786,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:8754: checking stack direction for C alloca" >&5 +echo "configure:8790: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8758,7 +8794,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -8800,7 +8836,7 @@ fi # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware. echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6 -echo "configure:8804: checking for getmntent in -lsun" >&5 +echo "configure:8840: checking for getmntent in -lsun" >&5 ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8808,7 +8844,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8859: \"$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 @@ -8838,7 +8874,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6 -echo "configure:8842: checking for getmntent in -lseq" >&5 +echo "configure:8878: checking for getmntent in -lseq" >&5 ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8846,7 +8882,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lseq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8897: \"$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 @@ -8876,7 +8912,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6 -echo "configure:8880: checking for getmntent in -lgen" >&5 +echo "configure:8916: checking for getmntent in -lgen" >&5 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8884,7 +8920,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8935: \"$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 @@ -8920,12 +8956,12 @@ fi fi echo $ac_n "checking for getmntent""... $ac_c" 1>&6 -echo "configure:8924: checking for getmntent" >&5 +echo "configure:8960: checking for getmntent" >&5 if eval "test \"`echo '$''{'ac_cv_func_getmntent'+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:8988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getmntent=yes" else @@ -8971,7 +9007,7 @@ else fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:8975: checking whether closedir returns void" >&5 +echo "configure:9011: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8979,13 +9015,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:8989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -9008,7 +9044,7 @@ EOF fi echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:9012: checking whether setpgrp takes no argument" >&5 +echo "configure:9048: checking whether setpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9016,7 +9052,7 @@ else { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setpgrp_void=no else @@ -9059,7 +9095,7 @@ EOF fi echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -echo "configure:9063: checking for working fnmatch" >&5 +echo "configure:9099: checking for working fnmatch" >&5 if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9070,11 +9106,11 @@ if test "$cross_compiling" = yes; then ac_cv_func_fnmatch_works=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_fnmatch_works=yes else @@ -9099,7 +9135,7 @@ fi echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:9103: checking for setlocale in -lxpg4" >&5 +echo "configure:9139: checking for setlocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9107,7 +9143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9158: \"$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 @@ -9141,7 +9177,7 @@ fi echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6 -echo "configure:9145: checking for getpwnam in -lsun" >&5 +echo "configure:9181: checking for getpwnam in -lsun" >&5 ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9149,7 +9185,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9200: \"$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 @@ -9192,17 +9228,17 @@ for ac_hdr in zlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9196: checking for $ac_hdr" >&5 +echo "configure:9232: 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:9206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9242: \"$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* @@ -9229,7 +9265,7 @@ fi done echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:9233: checking for deflate in -lz" >&5 +echo "configure:9269: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9237,7 +9273,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9288: \"$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 @@ -9279,7 +9315,7 @@ fi PTHREAD_LIB="" echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9283: checking for pthread_create in -lpthread" >&5 +echo "configure:9319: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9287,7 +9323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9338: \"$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 @@ -9317,7 +9353,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:9321: checking for pthread_create in -lpthreads" >&5 +echo "configure:9357: checking for pthread_create in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9325,7 +9361,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9376: \"$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 @@ -9355,7 +9391,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:9359: checking for pthread_create in -lc_r" >&5 +echo "configure:9395: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9363,7 +9399,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9414: \"$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 @@ -9393,12 +9429,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -echo "configure:9397: checking for pthread_create" >&5 +echo "configure:9433: checking for pthread_create" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_create'+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:9461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_create=yes" else @@ -9843,6 +9879,7 @@ trap 'rm -fr `echo "autoconf/Make.common \ scripts/logrotate \ scripts/bacula.desktop.gnome1 \ scripts/bacula.desktop.gnome2 \ + scripts/mtx-changer \ doc/Makefile \ src/Makefile \ src/console/Makefile \ @@ -9940,6 +9977,7 @@ s%@CMP@%$CMP%g s%@TBL@%$TBL%g s%@AR@%$AR%g s%@OPENSSL@%$OPENSSL%g +s%@MTX@%$MTX%g s%@ARFLAGS@%$ARFLAGS%g s%@MAKE_SHELL@%$MAKE_SHELL%g s%@LOCAL_LIBS@%$LOCAL_LIBS%g @@ -10113,6 +10151,7 @@ CONFIG_FILES=\${CONFIG_FILES-"autoconf/Make.common \ scripts/logrotate \ scripts/bacula.desktop.gnome1 \ scripts/bacula.desktop.gnome2 \ + scripts/mtx-changer \ doc/Makefile \ src/Makefile \ src/console/Makefile \ @@ -10332,7 +10371,7 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer -chmod 755 console gconsole +chmod 755 console gconsole mtx-changer cd .. chmod 755 src/cats/make_mysql_tables src/cats/drop_mysql_tables chmod 755 src/cats/make_test_tables src/cats/drop_test_tables diff --git a/bacula/kernstodo b/bacula/kernstodo index 48a7507f33..332e04e12a 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -1,5 +1,5 @@ Kern's ToDo List - 30 May 2003 + 31 May 2003 Documentation to do: (any release a little bit at a time) - Document running a test version. @@ -40,8 +40,6 @@ For 1.31 release: - Unsaved Flag in Job record. - Base Flag in Job record. - Implement UnsavedFiles DB record. -- The "List last 20 Jobs run" doesnt work correctly. - It doesnt show the last 20 jobs , but some older ones. - The bsr for Dan's job has file indexes covering the whole range rather than only the range contained on the volume. Constrain FileIndex to be within range for Volume. @@ -914,3 +912,7 @@ Done: (see kernsdone for more) - No READLINE_SRC if found in alternate directory. - If ./btape is called without /dev, assume argument is a Storage resource name. - Find general solution for sscanf size problems (as well as sprintf. Do at run time? +- Bytes restored is wrong. +- The "List last 20 Jobs run" doesnt work correctly in restore. + It doesnt show the last 20 jobs , but some older ones. + diff --git a/bacula/scripts/mtx-changer.in b/bacula/scripts/mtx-changer.in new file mode 100644 index 0000000000..9d046ddbd2 --- /dev/null +++ b/bacula/scripts/mtx-changer.in @@ -0,0 +1,69 @@ +#!/bin/sh +# +# Bacula interface to mtx autoloader +# +# $Id$ +# +# If you set in your Device resource +# +# Changer Command = "path-to-this-script/mtx-changer" %c %o %S %a +# you will have the following input to this script: +# +# mtx-changer "changer-device" "command" "slot" "archive-device" +# +# for example: +# +# mtx-changer /dev/sg0 load 1 /dev/nst0 (on a Linux system) +# +# If you need to to an offline, refer to the drive as $4 +# e.g. mt -f $f offline +# +# Many changers need an offline after the unload. Also many +# changers need a sleep 60 after the mtx load. +# +# N.B. If you change the script, take care to return either +# the mtx exit code or a 0. If the script exits with a non-zero +# exit code, Bacula will assume the request failed. +# + +MTX=@MTX@ + +case "$2" in + unload) +# echo "Doing mtx -f $1 unload" +# +# enable the following line if you need to eject the cartridge +# mt -f $4 offline + ${MTX} -f $1 unload + ;; + + load) +# echo "Doing mtx -f $1 load $3" + ${MTX} -f $1 load $3 + rtn=$? +# +# Increase the sleep time if you have a slow device + sleep 15 + exit $rtn + ;; + + list) +# echo "Requested list" + ${MTX} -f $1 status | grep " *Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//" + ;; + + loaded) +# echo "Request loaded" + ${MTX} -f $1 status >/tmp/mtx.$$ + rtn=$? + cat /tmp/mtx.$$ | grep "^Data Transfer Element 0:Full" | awk "{print \$7}" + cat /tmp/mtx.$$ | grep "^Data Transfer Element 0:Empty" | awk "{print 0}" + rm -f /tmp/mtx.$$ + exit $rtn + ;; + + slots) +# echo "Request slots" + ${MTX} -f $1 status | grep " *Storage Changer" | awk "{print \$5}" + ;; +esac diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h index 94652b6dd8..d6c3b3cb25 100644 --- a/bacula/src/baconfig.h +++ b/bacula/src/baconfig.h @@ -62,7 +62,8 @@ #else #define _(s) (s) #define N_(s) (s) -#define textdomain(x) +#define textdomain(d) +#define bindtextdomain(p, d) #endif diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h index cd47608b88..d8ed8df41a 100644 --- a/bacula/src/bacula.h +++ b/bacula/src/bacula.h @@ -79,7 +79,9 @@ #include #endif #include +#ifdef HAVE_SYS_SOCKET_H #include +#endif #include #include #if HAVE_SYS_WAIT_H diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index ea8782c279..6afcd79950 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -44,16 +44,15 @@ static char storaddr[] = "storage address=%s port=%d ssl=%d\n"; static char levelcmd[] = "level = %s%s\n"; /* Responses received from File daemon */ -static char OKbackup[] = "2000 OK backup\n"; -static char OKstore[] = "2000 OK storage\n"; -static char OKlevel[] = "2000 OK level\n"; -static char EndBackup[] = "2801 End Backup Job TermCode=%d JobFiles=%u " - "ReadBytes=%" lld " JobBytes=%" lld " Errors=%u\n"; +static char OKbackup[] = "2000 OK backup\n"; +static char OKstore[] = "2000 OK storage\n"; +static char OKlevel[] = "2000 OK level\n"; +static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u " + "ReadBytes=%" lld " JobBytes=%" lld " Errors=%u\n"; /* Forward referenced functions */ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr); -static int wait_for_job_termination(JCR *jcr); /* External functions */ @@ -101,7 +100,7 @@ int do_backup(JCR *jcr) } jcr->jr.FileSetId = fsr.FileSetId; if (fsr.created) { - Jmsg(jcr, M_INFO, 0, _("Created new FileSet record \"%s\" at %s\n"), + Jmsg(jcr, M_INFO, 0, _("Created new FileSet record \"%s\" %s\n"), fsr.FileSet, fsr.cCreateTime); } Dmsg2(119, "Created FileSet %s record %u\n", jcr->fileset->hdr.name, @@ -272,8 +271,9 @@ bail_out: * Here we wait for the File daemon to signal termination, * then we wait for the Storage daemon. When both * are done, we return the job status. + * Also used by restore.c */ -static int wait_for_job_termination(JCR *jcr) +int wait_for_job_termination(JCR *jcr) { int32_t n = 0; BSOCK *fd = jcr->file_bsock; @@ -282,7 +282,7 @@ static int wait_for_job_termination(JCR *jcr) set_jcr_job_status(jcr, JS_Running); /* Wait for Client to terminate */ while ((n = bget_dirmsg(fd)) >= 0) { - if (sscanf(fd->msg, EndBackup, &jcr->FDJobStatus, &jcr->JobFiles, + if (sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &jcr->JobFiles, &jcr->ReadBytes, &jcr->JobBytes, &jcr->Errors) == 5) { fd_ok = TRUE; set_jcr_job_status(jcr, jcr->FDJobStatus); @@ -296,8 +296,8 @@ static int wait_for_job_termination(JCR *jcr) } } if (is_bnet_error(fd)) { - Jmsg(jcr, M_FATAL, 0, _("Network error with FD during BACKUP: ERR=%s\n"), - bnet_strerror(fd)); + Jmsg(jcr, M_FATAL, 0, _("Network error with FD during %s: ERR=%s\n"), + job_type_to_str(jcr->JobType), bnet_strerror(fd)); } bnet_sig(fd, BNET_TERMINATE); /* tell Client we are terminating */ diff --git a/bacula/src/dird/protos.h b/bacula/src/dird/protos.h index 8a4fcd1dc1..0bc68b9939 100644 --- a/bacula/src/dird/protos.h +++ b/bacula/src/dird/protos.h @@ -38,6 +38,8 @@ void free_ua_context(UAContext *ua); extern int recycle_oldest_purged_volume(JCR *jcr, MEDIA_DBR *mr); extern int find_recycled_volume(JCR *jcr, MEDIA_DBR *mr); +/* backup.c */ +extern int wait_for_job_termination(JCR *jcr); /* catreq.c */ extern void catalog_request(JCR *jcr, BSOCK *bs, char *buf); diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c index a866320387..7a448a3e2f 100644 --- a/bacula/src/dird/restore.c +++ b/bacula/src/dird/restore.c @@ -52,7 +52,6 @@ static char OKrestore[] = "2000 OK restore\n"; static char OKstore[] = "2000 OK storage\n"; static char OKsession[] = "2000 OK session\n"; static char OKbootstrap[] = "2000 OK bootstrap\n"; -static char EndRestore[] = "2800 End Job TermCode=%d JobFiles=%u JobBytes=%" lld " Errors=%u\n"; /* Forward referenced functions */ static void restore_cleanup(JCR *jcr, int status); @@ -70,8 +69,6 @@ int do_restore(JCR *jcr) { BSOCK *fd; JOB_DBR rjr; /* restore job record */ - int ok = FALSE; - if (!get_or_create_client_record(jcr)) { restore_cleanup(jcr, JS_ErrorTerminated); @@ -252,23 +249,8 @@ int do_restore(JCR *jcr) } /* Wait for Job Termination */ - Dmsg0(20, "wait for job termination\n"); - while (bget_dirmsg(fd) >= 0) { - Dmsg1(100, "dirdmsg); - if (sscanf(fd->msg, EndRestore, &jcr->FDJobStatus, &jcr->JobFiles, - &jcr->JobBytes, &jcr->Errors) == 4) { - ok = TRUE; - } - } - - if (is_bnet_error(fd)) { - Jmsg(jcr, M_FATAL, 0, _("Network error during RESTORE command. ERR=%s\n"), - bnet_strerror(fd)); - } - bnet_sig(fd, BNET_TERMINATE); /* tell Client we are terminating */ - - - restore_cleanup(jcr, ok?jcr->FDJobStatus:JS_ErrorTerminated); + int stat = wait_for_job_termination(jcr); + restore_cleanup(jcr, stat); return 1; } @@ -281,7 +263,7 @@ static void restore_cleanup(JCR *jcr, int TermCode) { char sdt[MAX_TIME_LENGTH], edt[MAX_TIME_LENGTH]; char ec1[30], ec2[30]; - char term_code[100], fd_term_msg[100]; + char term_code[100], fd_term_msg[100], sd_term_msg[100]; char *term_msg; int msg_type; double kbps; @@ -293,29 +275,29 @@ static void restore_cleanup(JCR *jcr, int TermCode) msg_type = M_INFO; /* by default INFO message */ switch (TermCode) { - case JS_Terminated: - term_msg = _("Restore OK"); - break; - case JS_FatalError: - case JS_ErrorTerminated: - term_msg = _("*** Restore Error ***"); - msg_type = M_ERROR; /* Generate error message */ - if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); - pthread_cancel(jcr->SD_msg_chan); - } - break; - case JS_Canceled: - term_msg = _("Restore Canceled"); - if (jcr->store_bsock) { - bnet_sig(jcr->store_bsock, BNET_TERMINATE); - pthread_cancel(jcr->SD_msg_chan); - } - break; - default: - term_msg = term_code; - sprintf(term_code, _("Inappropriate term code: %c\n"), TermCode); - break; + case JS_Terminated: + term_msg = _("Restore OK"); + break; + case JS_FatalError: + case JS_ErrorTerminated: + term_msg = _("*** Restore Error ***"); + msg_type = M_ERROR; /* Generate error message */ + if (jcr->store_bsock) { + bnet_sig(jcr->store_bsock, BNET_TERMINATE); + pthread_cancel(jcr->SD_msg_chan); + } + break; + case JS_Canceled: + term_msg = _("Restore Canceled"); + if (jcr->store_bsock) { + bnet_sig(jcr->store_bsock, BNET_TERMINATE); + pthread_cancel(jcr->SD_msg_chan); + } + break; + default: + term_msg = term_code; + sprintf(term_code, _("Inappropriate term code: %c\n"), TermCode); + break; } bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime); bstrftime(edt, sizeof(edt), jcr->jr.EndTime); @@ -329,6 +311,7 @@ static void restore_cleanup(JCR *jcr, int TermCode) } jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); + jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n\ JobId: %d\n\ @@ -341,6 +324,7 @@ Bytes Restored: %s\n\ Rate: %.1f KB/s\n\ Non-fatal FD Errors: %d\n\ FD termination status: %s\n\ +SD termination status: %s\n\ Termination: %s\n\n"), edt, jcr->jr.JobId, @@ -353,6 +337,7 @@ Termination: %s\n\n"), (float)kbps, jcr->Errors, fd_term_msg, + sd_term_msg, term_msg); Dmsg0(20, "Leaving restore_cleanup\n"); diff --git a/bacula/src/dird/sql_cmds.c b/bacula/src/dird/sql_cmds.c index 1e4d0a2e7c..44e1d43850 100644 --- a/bacula/src/dird/sql_cmds.c +++ b/bacula/src/dird/sql_cmds.c @@ -132,10 +132,10 @@ char *select_restore_del = /* List last 20 Jobs */ char *uar_list_jobs = - "SELECT JobId,Client.Name as Client,StartTime,Type as " - "JobType,JobFiles,JobBytes " + "SELECT JobId,Client.Name as Client,StartTime,Level as " + "JobLevel,JobFiles,JobBytes " "FROM Client,Job WHERE Client.ClientId=Job.ClientId AND JobStatus='T' " - "AND Type='B' LIMIT 20"; + "AND Type='B' ORDER BY StartTime LIMIT 20"; #ifdef HAVE_MYSQL /* MYSQL IS NOT STANDARD SQL !!!!! */ diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 155dc19ad6..45cbdeca61 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -110,8 +110,7 @@ static char OKstore[] = "2000 OK storage\n"; static char OKjob[] = "2000 OK Job " FDHOST "," DISTNAME "," DISTVER; static char OKsetdebug[] = "2000 OK setdebug=%d\n"; static char BADjob[] = "2901 Bad Job\n"; -static char EndRestore[] = "2800 End Job TermCode=%d JobFiles=%u JobBytes=%s Errors=%u\n"; -static char EndBackup[] = "2801 End Backup Job TermCode=%d JobFiles=%u ReadBytes=%s JobBytes=%s Errors=%u\n"; +static char EndJob[] = "2800 End Job TermCode=%d JobFiles=%u ReadBytes=%s JobBytes=%s Errors=%u\n"; /* Responses received from Storage Daemon */ static char OK_end[] = "3000 OK end\n"; @@ -624,7 +623,7 @@ static int backup_cmd(JCR *jcr) cleanup: - bnet_fsend(dir, EndBackup, jcr->JobStatus, jcr->JobFiles, + bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles, edit_uint64(jcr->ReadBytes, ed1), edit_uint64(jcr->JobBytes, ed2), jcr->Errors); @@ -707,7 +706,7 @@ static int restore_cmd(JCR *jcr) BSOCK *sd = jcr->store_bsock; POOLMEM *where; char replace; - char ed1[50]; + char ed1[50], ed2[50]; /* * Scan WHERE (base directory for restore) from command @@ -771,9 +770,11 @@ static int restore_cmd(JCR *jcr) bnet_sig(sd, BNET_TERMINATE); bail_out: + /* Send termination status back to Dir */ - bnet_fsend(dir, EndRestore, jcr->JobStatus, jcr->num_files_examined, - edit_uint64(jcr->JobBytes, ed1), jcr->Errors); + bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles, + edit_uint64(jcr->ReadBytes, ed1), + edit_uint64(jcr->JobBytes, ed2), jcr->Errors); /* Inform Director that we are done */ bnet_sig(dir, BNET_TERMINATE); diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c index 1ec68dad02..766dd74e81 100644 --- a/bacula/src/filed/restore.c +++ b/bacula/src/filed/restore.c @@ -339,6 +339,7 @@ void do_restore(JCR *jcr) } total += wsize; jcr->JobBytes += wsize; + jcr->ReadBytes += wsize; fileAddr += wsize; } @@ -394,6 +395,7 @@ void do_restore(JCR *jcr) } total += compress_len; jcr->JobBytes += compress_len; + jcr->ReadBytes += wsize; fileAddr += compress_len; } #else diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c index 42ae4747ea..cbcc30d144 100644 --- a/bacula/src/stored/acquire.c +++ b/bacula/src/stored/acquire.c @@ -137,6 +137,8 @@ default_path: dev->state |= ST_READ; attach_jcr_to_device(dev, jcr); /* attach jcr to device */ + Jmsg(jcr, M_INFO, 0, _("Ready to read from volume \"%s\" on device %s.\n"), + jcr->VolumeName, dev_name(dev)); if ((dev->state & ST_TAPE) && vol->start_file > 0) { Dmsg1(200, "====== Got start_file = %d\n", vol->start_file); Jmsg(jcr, M_INFO, 0, _("Forward spacing to file %d.\n"), vol->start_file); @@ -265,9 +267,7 @@ int release_device(JCR *jcr, DEVICE *dev) if (dev->state & ST_READ) { dev->state &= ~ST_READ; /* clear read bit */ if (!dev_is_tape(dev) || !dev_cap(dev, CAP_ALWAYSOPEN)) { - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - } + offline_or_rewind_dev(dev); close_dev(dev); } /******FIXME**** send read volume usage statistics to director */ @@ -284,24 +284,25 @@ int release_device(JCR *jcr, DEVICE *dev) } Dmsg1(100, "There are %d writers in release_device\n", dev->num_writers); if (dev->num_writers == 0) { - Dmsg0(100, "dir_create_jobmedia_record. Release\n"); - dir_create_jobmedia_record(jcr); - if (dev_can_write(dev)) { - weof_dev(dev, 1); + /* If we have fully acquired the tape */ + if (dev->state & ST_LABEL) { + Dmsg0(100, "dir_create_jobmedia_record. Release\n"); + dir_create_jobmedia_record(jcr); + if (dev_can_write(dev)) { + weof_dev(dev, 1); + } + dev->VolCatInfo.VolCatFiles = dev->file; /* set number of files */ + dev->VolCatInfo.VolCatJobs++; /* increment number of jobs */ + /* Note! do volume update before close, which zaps VolCatInfo */ + Dmsg0(200, "dir_update_vol_info. Release0\n"); + dir_update_volume_info(jcr, &dev->VolCatInfo, 0); /* send Volume info to Director */ } - dev->VolCatInfo.VolCatFiles = dev->file; /* set number of files */ - dev->VolCatInfo.VolCatJobs++; /* increment number of jobs */ - /* Note! do volume update before close, which zaps VolCatInfo */ - Dmsg0(200, "dir_update_vol_info. Release0\n"); - dir_update_volume_info(jcr, &dev->VolCatInfo, 0); /* send Volume info to Director */ if (!dev_is_tape(dev) || !dev_cap(dev, CAP_ALWAYSOPEN)) { - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - } + offline_or_rewind_dev(dev); close_dev(dev); } - } else { + } else if (dev->state & ST_LABEL) { Dmsg0(100, "dir_create_jobmedia_record. Release\n"); dir_create_jobmedia_record(jcr); Dmsg0(200, "dir_update_vol_info. Release1\n"); diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c index 7f3bea26f3..46922205b2 100644 --- a/bacula/src/stored/autochanger.c +++ b/bacula/src/stored/autochanger.c @@ -89,9 +89,7 @@ int autoload_device(JCR *jcr, DEVICE *dev, int writing, BSOCK *dir) /* If bad status or tape we want is not loaded, load it. */ if (status != 0 || loaded != slot) { - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - } + offline_or_rewind_dev(dev); /* We are going to load a new tape, so close the device */ force_close_dev(dev); if (loaded != 0) { /* must unload drive */ @@ -159,9 +157,7 @@ int autochanger_list(JCR *jcr, DEVICE *dev, BSOCK *dir) } changer = get_pool_memory(PM_FNAME); - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - } + offline_or_rewind_dev(dev); /* We are going to load a new tape, so close the device */ force_close_dev(dev); diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c index eeb8a84dd0..6080f2671c 100644 --- a/bacula/src/stored/dev.c +++ b/bacula/src/stored/dev.c @@ -670,6 +670,21 @@ int offline_dev(DEVICE *dev) return 1; } +int offline_or_rewind_dev(DEVICE *dev) +{ + if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { + return offline_dev(dev); + } else { + /* + * Note, this rewind probably should not be here (it wasn't + * in prior versions of Bacula), but on FreeBSD, this is + * needed in the case the tape was "frozen" due to an error + * such as backspacing after writing and EOF. If it is not + * done, all future references to the drive get and I/O error. + */ + return rewind_dev(dev); + } +} /* * Foward space a file diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h index a2b8dd631c..fb3e3c9ade 100644 --- a/bacula/src/stored/dev.h +++ b/bacula/src/stored/dev.h @@ -43,64 +43,64 @@ #define return_device_lock(d, p) _return_device_lock(__FILE__, __LINE__, (d), (p)) /* Arguments to open_dev() */ -#define READ_WRITE 0 -#define READ_ONLY 1 -#define OPEN_READ_WRITE 0 -#define OPEN_READ_ONLY 1 -#define OPEN_WRITE_ONLY 2 +#define READ_WRITE 0 +#define READ_ONLY 1 +#define OPEN_READ_WRITE 0 +#define OPEN_READ_ONLY 1 +#define OPEN_WRITE_ONLY 2 /* Generic status bits returned from status_dev() */ -#define BMT_TAPE (1<<0) /* is tape device */ -#define BMT_EOF (1<<1) /* just read EOF */ -#define BMT_BOT (1<<2) /* at beginning of tape */ -#define BMT_EOT (1<<3) /* end of tape reached */ -#define BMT_SM (1<<4) /* DDS setmark */ -#define BMT_EOD (1<<5) /* DDS at end of data */ -#define BMT_WR_PROT (1<<6) /* tape write protected */ -#define BMT_ONLINE (1<<7) /* tape online */ -#define BMT_DR_OPEN (1<<8) /* tape door open */ -#define BMT_IM_REP_EN (1<<9) /* immediate report enabled */ +#define BMT_TAPE (1<<0) /* is tape device */ +#define BMT_EOF (1<<1) /* just read EOF */ +#define BMT_BOT (1<<2) /* at beginning of tape */ +#define BMT_EOT (1<<3) /* end of tape reached */ +#define BMT_SM (1<<4) /* DDS setmark */ +#define BMT_EOD (1<<5) /* DDS at end of data */ +#define BMT_WR_PROT (1<<6) /* tape write protected */ +#define BMT_ONLINE (1<<7) /* tape online */ +#define BMT_DR_OPEN (1<<8) /* tape door open */ +#define BMT_IM_REP_EN (1<<9) /* immediate report enabled */ /* Test capabilities */ #define dev_cap(dev, cap) ((dev)->capabilities & (cap)) /* Bits for device capabilities */ -#define CAP_EOF 0x0001 /* has MTWEOF */ -#define CAP_BSR 0x0002 /* has MTBSR */ -#define CAP_BSF 0x0004 /* has MTBSF */ -#define CAP_FSR 0x0008 /* has MTFSR */ -#define CAP_FSF 0x0010 /* has MTFSF */ -#define CAP_EOM 0x0020 /* has MTEOM */ -#define CAP_REM 0x0040 /* is removable media */ -#define CAP_RACCESS 0x0080 /* is random access device */ -#define CAP_AUTOMOUNT 0x0100 /* Read device at start to see what is there */ -#define CAP_LABEL 0x0200 /* Label blank tapes */ -#define CAP_ANONVOLS 0x0400 /* Mount without knowing volume name */ -#define CAP_ALWAYSOPEN 0x0800 /* always keep device open */ -#define CAP_AUTOCHANGER 0x1000 /* AutoChanger */ -#define CAP_OFFLINEUNMOUNT 0x2000 /* Offline before unmount */ -#define CAP_STREAM 0x4000 /* Stream device */ -#define CAP_BSFATEOM 0x8000 /* Backspace file at EOM */ +#define CAP_EOF (1<<0) /* has MTWEOF */ +#define CAP_BSR (1<<1) /* has MTBSR */ +#define CAP_BSF (1<<2) /* has MTBSF */ +#define CAP_FSR (1<<3) /* has MTFSR */ +#define CAP_FSF (1<<4) /* has MTFSF */ +#define CAP_EOM (1<<5) /* has MTEOM */ +#define CAP_REM (1<<6) /* is removable media */ +#define CAP_RACCESS (1<<7) /* is random access device */ +#define CAP_AUTOMOUNT (1<<8) /* Read device at start to see what is there */ +#define CAP_LABEL (1<<9) /* Label blank tapes */ +#define CAP_ANONVOLS (1<<10) /* Mount without knowing volume name */ +#define CAP_ALWAYSOPEN (1<<11) /* always keep device open */ +#define CAP_AUTOCHANGER (1<<12) /* AutoChanger */ +#define CAP_OFFLINEUNMOUNT (1<<13) /* Offline before unmount */ +#define CAP_STREAM (1<<14) /* Stream device */ +#define CAP_BSFATEOM (1<<15) /* Backspace file at EOM */ /* Test state */ #define dev_state(dev, state) ((dev)->state & (state)) /* Device state bits */ -#define ST_OPENED 0x0001 /* set when device opened */ -#define ST_TAPE 0x0002 /* is a tape device */ -#define ST_FILE 0x0004 /* is a file device */ -#define ST_FIFO 0x0008 /* is a fifo device */ -#define ST_PROG 0x0010 /* is a program device */ -#define ST_LABEL 0x0020 /* label found */ -#define ST_MALLOC 0x0040 /* dev packet malloc'ed in init_dev() */ -#define ST_APPEND 0x0080 /* ready for Bacula append */ -#define ST_READ 0x0100 /* ready for Bacula read */ -#define ST_EOT 0x0200 /* at end of tape */ -#define ST_WEOT 0x0400 /* Got EOT on write */ -#define ST_EOF 0x0800 /* Read EOF i.e. zero bytes */ -#define ST_NEXTVOL 0x1000 /* Start writing on next volume */ -#define ST_SHORT 0x2000 /* Short block read */ +#define ST_OPENED (1<<0) /* set when device opened */ +#define ST_TAPE (1<<1) /* is a tape device */ +#define ST_FILE (1<<2) /* is a file device */ +#define ST_FIFO (1<<3) /* is a fifo device */ +#define ST_PROG (1<<4) /* is a program device */ +#define ST_LABEL (1<<5) /* label found */ +#define ST_MALLOC (1<<6) /* dev packet malloc'ed in init_dev() */ +#define ST_APPEND (1<<7) /* ready for Bacula append */ +#define ST_READ (1<<8) /* ready for Bacula read */ +#define ST_EOT (1<<9) /* at end of tape */ +#define ST_WEOT (1<<10) /* Got EOT on write */ +#define ST_EOF (1<<11) /* Read EOF i.e. zero bytes */ +#define ST_NEXTVOL (1<<12) /* Start writing on next volume */ +#define ST_SHORT (1<<13) /* Short block read */ /* dev_blocked states (mutually exclusive) */ #define BST_NOT_BLOCKED 0 /* not blocked */ diff --git a/bacula/src/stored/device.c b/bacula/src/stored/device.c index 939e052a0c..b98d0091c9 100644 --- a/bacula/src/stored/device.c +++ b/bacula/src/stored/device.c @@ -73,124 +73,124 @@ int fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) { uint32_t stat = 0; char PrevVolName[MAX_NAME_LENGTH]; - DEV_BLOCK *label_blk = NULL; + DEV_BLOCK *label_blk; char b1[30], b2[30]; time_t wait_time; wait_time = time(NULL); status_dev(dev, &stat); - if (stat & BMT_EOD) { - Dmsg0(100, "======= Got EOD ========\n"); + if (!(stat & BMT_EOD)) { + return 0; /* this really shouldn't happen */ + } - block_device(dev, BST_DOING_ACQUIRE); - /* Unlock, but leave BLOCKED */ - unlock_device(dev); + Dmsg0(100, "======= Got EOD ========\n"); - /* - * Walk through all attached jcrs creating a jobmedia_record() - */ - Dmsg1(100, "Walk attached jcrs. Volume=%s\n", dev->VolCatInfo.VolCatName); - for (JCR *mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) { - if (mjcr->JobId == 0) { - continue; /* ignore console */ - } - Dmsg1(100, "create JobMedia for Job %s\n", mjcr->Job); - if (dev->state & ST_TAPE) { - mjcr->EndBlock = dev->EndBlock; - mjcr->EndFile = dev->EndFile; - Dmsg2(200, "Fixup EndFile=%u EndBlock=%u\n", mjcr->EndFile, mjcr->EndBlock); - } else { - mjcr->EndBlock = (uint32_t)dev->file_addr; - mjcr->EndFile = (uint32_t)(dev->file_addr >> 32); - } - if (!dir_create_jobmedia_record(mjcr)) { - Jmsg(mjcr, M_ERROR, 0, _("Could not create JobMedia record for Volume=%s Job=%s\n"), - dev->VolCatInfo.VolCatName, mjcr->Job); - P(dev->mutex); - unblock_device(dev); - return 0; - } - mjcr->VolFirstIndex = 0; /* prevent writing jobmedia second time */ - } + block_device(dev, BST_DOING_ACQUIRE); + /* Unlock, but leave BLOCKED */ + unlock_device(dev); - strcpy(dev->VolCatInfo.VolCatStatus, "Full"); - Dmsg2(200, "Call update_vol_info Stat=%s Vol=%s\n", - dev->VolCatInfo.VolCatStatus, dev->VolCatInfo.VolCatName); - if (!dir_update_volume_info(jcr, &dev->VolCatInfo, 0)) { /* send Volume info to Director */ + /* + * Walk through all attached jcrs creating a jobmedia_record() + */ + Dmsg1(100, "Walk attached jcrs. Volume=%s\n", dev->VolCatInfo.VolCatName); + for (JCR *mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) { + if (mjcr->JobId == 0) { + continue; /* ignore console */ + } + Dmsg1(100, "create JobMedia for Job %s\n", mjcr->Job); + if (dev->state & ST_TAPE) { + mjcr->EndBlock = dev->EndBlock; + mjcr->EndFile = dev->EndFile; + Dmsg2(200, "Fixup EndFile=%u EndBlock=%u\n", mjcr->EndFile, mjcr->EndBlock); + } else { + mjcr->EndBlock = (uint32_t)dev->file_addr; + mjcr->EndFile = (uint32_t)(dev->file_addr >> 32); + } + if (!dir_create_jobmedia_record(mjcr)) { + Jmsg(mjcr, M_ERROR, 0, _("Could not create JobMedia record for Volume=%s Job=%s\n"), + dev->VolCatInfo.VolCatName, mjcr->Job); P(dev->mutex); unblock_device(dev); - return 0; /* device locked */ + return 0; } - Dmsg0(100, "Back from update_vol_info\n"); - - bstrncpy(PrevVolName, dev->VolCatInfo.VolCatName, sizeof(PrevVolName)); - bstrncpy(dev->VolHdr.PrevVolName, PrevVolName, sizeof(dev->VolHdr.PrevVolName)); + mjcr->VolFirstIndex = 0; /* prevent writing jobmedia second time */ + } - label_blk = new_block(dev); + strcpy(dev->VolCatInfo.VolCatStatus, "Full"); + Dmsg2(200, "Call update_vol_info Stat=%s Vol=%s\n", + dev->VolCatInfo.VolCatStatus, dev->VolCatInfo.VolCatName); + if (!dir_update_volume_info(jcr, &dev->VolCatInfo, 0)) { /* send Volume info to Director */ + P(dev->mutex); + unblock_device(dev); + return 0; /* device locked */ + } + Dmsg0(100, "Back from update_vol_info\n"); - /* Inform User about end of medium */ - Jmsg(jcr, M_INFO, 0, _("End of medium on Volume \"%s\" Bytes=%s Blocks=%s.\n"), - PrevVolName, edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, b1), - edit_uint64_with_commas(dev->VolCatInfo.VolCatBlocks, b2)); + bstrncpy(PrevVolName, dev->VolCatInfo.VolCatName, sizeof(PrevVolName)); + bstrncpy(dev->VolHdr.PrevVolName, PrevVolName, sizeof(dev->VolHdr.PrevVolName)); - if (!mount_next_write_volume(jcr, dev, label_blk, 1)) { - P(dev->mutex); - unblock_device(dev); - return 0; /* device locked */ - } - P(dev->mutex); /* lock again */ - - Jmsg(jcr, M_INFO, 0, _("New volume \"%s\" mounted on device %s\n"), - jcr->VolumeName, dev_name(dev)); - - /* - * If this is a new tape, the label_blk will contain the - * label, so write it now. If this is a previously - * used tape, mount_next_write_volume() will return an - * empty label_blk, and nothing will be written. - */ - Dmsg0(190, "write label block to dev\n"); - if (!write_block_to_dev(jcr, dev, label_blk)) { - Pmsg1(0, "write_block_to_device Volume label failed. ERR=%s", - strerror_dev(dev)); - free_block(label_blk); - unblock_device(dev); - return 0; /* device locked */ - } + label_blk = new_block(dev); - /* Write overflow block to tape */ - Dmsg0(190, "Write overflow block to dev\n"); - if (!write_block_to_dev(jcr, dev, block)) { - Pmsg1(0, "write_block_to_device overflow block failed. ERR=%s", - strerror_dev(dev)); - free_block(label_blk); - unblock_device(dev); - return 0; /* device locked */ - } + /* Inform User about end of medium */ + Jmsg(jcr, M_INFO, 0, _("End of medium on Volume \"%s\" Bytes=%s Blocks=%s.\n"), + PrevVolName, edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, b1), + edit_uint64_with_commas(dev->VolCatInfo.VolCatBlocks, b2)); - jcr->NumVolumes++; - Dmsg0(190, "Wake up any waiting threads.\n"); + if (!mount_next_write_volume(jcr, dev, label_blk, 1)) { free_block(label_blk); - for (JCR *mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) { - /* Set new start/end positions */ - if (dev->state & ST_TAPE) { - mjcr->StartBlock = dev->block_num; - mjcr->StartFile = dev->file; - } else { - mjcr->StartBlock = (uint32_t)dev->file_addr; - mjcr->StartFile = (uint32_t)(dev->file_addr >> 32); - } - /* Set first FirstIndex for new Volume */ - mjcr->VolFirstIndex = mjcr->JobFiles; - mjcr->run_time += time(NULL) - wait_time; /* correct run time */ - } + P(dev->mutex); unblock_device(dev); - return 1; /* device locked */ + return 0; /* device locked */ } - if (label_blk) { + P(dev->mutex); /* lock again */ + + Jmsg(jcr, M_INFO, 0, _("New volume \"%s\" mounted on device %s\n"), + jcr->VolumeName, dev_name(dev)); + + /* + * If this is a new tape, the label_blk will contain the + * label, so write it now. If this is a previously + * used tape, mount_next_write_volume() will return an + * empty label_blk, and nothing will be written. + */ + Dmsg0(190, "write label block to dev\n"); + if (!write_block_to_dev(jcr, dev, label_blk)) { + Pmsg1(0, "write_block_to_device Volume label failed. ERR=%s", + strerror_dev(dev)); free_block(label_blk); + unblock_device(dev); + return 0; /* device locked */ + } + free_block(label_blk); + + + /* Update start block/file for overflow block */ + jcr->NumVolumes++; + for (JCR *mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) { + /* Set new start/end positions */ + if (dev->state & ST_TAPE) { + mjcr->StartBlock = dev->block_num; + mjcr->StartFile = dev->file; + } else { + mjcr->StartBlock = (uint32_t)dev->file_addr; + mjcr->StartFile = (uint32_t)(dev->file_addr >> 32); + } + /* Set first FirstIndex for new Volume */ + mjcr->VolFirstIndex = mjcr->JobFiles; + mjcr->run_time += time(NULL) - wait_time; /* correct run time */ } - return 0; /* device locked */ + + /* Write overflow block to tape */ + Dmsg0(190, "Write overflow block to dev\n"); + if (!write_block_to_dev(jcr, dev, block)) { + Pmsg1(0, "write_block_to_device overflow block failed. ERR=%s", + strerror_dev(dev)); + unblock_device(dev); + return 0; /* device locked */ + } + + unblock_device(dev); + return 1; /* device locked */ } diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c index 03c260a0f3..26c8664f60 100644 --- a/bacula/src/stored/dircmd.c +++ b/bacula/src/stored/dircmd.c @@ -616,9 +616,7 @@ static int unmount_cmd(JCR *jcr) } else if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) { Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting, dev->dev_blocked); - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - } + offline_or_rewind_dev(dev); force_close_dev(dev); dev->dev_blocked = BST_UNMOUNTED_WAITING_FOR_SYSOP; bnet_fsend(dir, _("3001 Device %s unmounted.\n"), dev_name(dev)); @@ -645,9 +643,7 @@ static int unmount_cmd(JCR *jcr) } else { /* device not being used */ Dmsg0(90, "Device not in use, unmounting\n"); block_device(dev, BST_UNMOUNTED); - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - } + offline_or_rewind_dev(dev); force_close_dev(dev); bnet_fsend(dir, _("3002 Device %s unmounted.\n"), dev_name(dev)); } diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c index 1ebf5ed269..f47f53c347 100644 --- a/bacula/src/stored/mount.c +++ b/bacula/src/stored/mount.c @@ -75,30 +75,13 @@ mount_next_vol: jcr->VolumeName[0] = 0; if (!dev_is_tape(dev) || !dev_cap(dev, CAP_ALWAYSOPEN)) { - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - /* - * Note, this rewind probably should not be here (it wasn't - * in prior versions of Bacula), but on FreeBSD, this is - * needed in the case the tape was "frozen" due to an error - * such as backspacing after writing and EOF. If it is not - * done, all future references to the drive get and I/O error. - */ - } else if (!rewind_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - } + offline_or_rewind_dev(dev); close_dev(dev); } /* If we have not closed the device, then at least rewind the tape */ if (dev->state & ST_OPENED) { - if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); - } else if (!rewind_dev(dev)) { - Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"), - dev_name(dev), strerror_dev(dev)); - } + offline_or_rewind_dev(dev); } ask = 1; /* ask operator to mount tape */ } diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h index 1b0adc6c3f..e649afb20a 100644 --- a/bacula/src/stored/protos.h +++ b/bacula/src/stored/protos.h @@ -96,6 +96,7 @@ void attach_jcr_to_device(DEVICE *dev, JCR *jcr); void detach_jcr_from_device(DEVICE *dev, JCR *jcr); JCR *next_attached_jcr(DEVICE *dev, JCR *jcr); int dev_can_write(DEVICE *dev); +int offline_or_rewind_dev(DEVICE *dev); /* Get info about device */ diff --git a/bacula/src/tools/dbcheck.c b/bacula/src/tools/dbcheck.c index 35c06a9ad2..eaa0eb5529 100644 --- a/bacula/src/tools/dbcheck.c +++ b/bacula/src/tools/dbcheck.c @@ -103,28 +103,27 @@ int main (int argc, char *argv[]) while ((ch = getopt(argc, argv, "bd:fv?")) != -1) { switch (ch) { - case 'b': /* batch */ - batch = TRUE; - break; - - case 'd': /* debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) - debug_level = 1; - break; - - case 'f': /* fix inconsistencies */ - fix = TRUE; - break; - - case 'v': - verbose++; - break; - - case '?': - default: - usage(); - + case 'b': /* batch */ + batch = TRUE; + break; + + case 'd': /* debug level */ + debug_level = atoi(optarg); + if (debug_level <= 0) + debug_level = 1; + break; + + case 'f': /* fix inconsistencies */ + fix = TRUE; + break; + + case 'v': + verbose++; + break; + + case '?': + default: + usage(); } } argc -= optind; @@ -348,9 +347,7 @@ static int make_id_list(char *query, ID_LIST *id_list) */ static int delete_id_list(char *query, ID_LIST *id_list) { - int i; - - for (i=0; i < id_list->num_ids; i++) { + for (int i=0; i < id_list->num_ids; i++) { sprintf(buf, query, id_list->Id[i]); if (verbose) { printf("Deleting: %s\n", buf); @@ -405,9 +402,7 @@ static int make_name_list(char *query, NAME_LIST *name_list) */ static void print_name_list(NAME_LIST *name_list) { - int i; - - for (i=0; i < name_list->num_ids; i++) { + for (int i=0; i < name_list->num_ids; i++) { printf("%s\n", name_list->name[i]); } } @@ -418,9 +413,7 @@ static void print_name_list(NAME_LIST *name_list) */ static void free_name_list(NAME_LIST *name_list) { - int i; - - for (i=0; i < name_list->num_ids; i++) { + for (int i=0; i < name_list->num_ids; i++) { free(name_list->name[i]); } name_list->num_ids = 0; @@ -529,8 +522,7 @@ static void eliminate_orphaned_jobmedia_records() } printf("Found %d orphaned JobMedia records.\n", id_list.num_ids); if (id_list.num_ids && verbose && yes_no("Print them? (yes/no): ")) { - int i; - for (i=0; i < id_list.num_ids; i++) { + for (int i=0; i < id_list.num_ids; i++) { sprintf(buf, "SELECT JobMedia.JobMediaId,JobMedia.JobId,Media.VolumeName FROM JobMedia,Media " "WHERE JobMedia.JobMediaId=%u AND Media.MediaId=JobMedia.MediaId", id_list.Id[i]); @@ -559,8 +551,7 @@ static void eliminate_orphaned_file_records() } printf("Found %d orphaned File records.\n", id_list.num_ids); if (name_list.num_ids && verbose && yes_no("Print them? (yes/no): ")) { - int i; - for (i=0; i < id_list.num_ids; i++) { + for (int i=0; i < id_list.num_ids; i++) { sprintf(buf, "SELECT File.FileId,File.JobId,Filename.Name FROM File,Filename " "WHERE File.FileId=%u AND File.FilenameId=Filename.FilenameId", id_list.Id[i]); @@ -589,8 +580,7 @@ static void eliminate_orphaned_path_records() } printf("Found %d orphaned Path records.\n", id_list.num_ids); if (id_list.num_ids && verbose && yes_no("Print them? (yes/no): ")) { - int i; - for (i=0; i < id_list.num_ids; i++) { + for (int i=0; i < id_list.num_ids; i++) { sprintf(buf, "SELECT Path FROM Path WHERE PathId=%u", id_list.Id[i]); db_sql_query(db, buf, print_name_handler, NULL); } @@ -616,8 +606,7 @@ static void eliminate_orphaned_filename_records() } printf("Found %d orphaned Filename records.\n", id_list.num_ids); if (id_list.num_ids && verbose && yes_no("Print them? (yes/no): ")) { - int i; - for (i=0; i < id_list.num_ids; i++) { + for (int i=0; i < id_list.num_ids; i++) { sprintf(buf, "SELECT Name FROM Filename WHERE FilenameId=%u", id_list.Id[i]); db_sql_query(db, buf, print_name_handler, NULL); } @@ -642,8 +631,7 @@ static void eliminate_orphaned_fileset_records() } printf("Found %d orphaned FileSet records.\n", id_list.num_ids); if (id_list.num_ids && verbose && yes_no("Print them? (yes/no): ")) { - int i; - for (i=0; i < id_list.num_ids; i++) { + for (int i=0; i < id_list.num_ids; i++) { sprintf(buf, "SELECT FileSetId,FileSet,MD5 FROM FileSet " "WHERE FileSetId=%u", id_list.Id[i]); if (!db_sql_query(db, buf, print_fileset_handler, NULL)) { -- 2.39.5