CircleMUD Server-side Compression Support These comments do not need to be removed first, patch is (or at least, is in Unix) smart enough to ignore them. See the comments in the code below to see which clients this is currently known to work with. And, obviously, this patch was made against CircleMUD 3.0 bpl14. If you don't have patch, look in ftp://ftp.circlemud.org/pub/CircleMUD/contrib/server/ for a pre-patched version. Please report problems to George Greer diff -uprN circle30bpl14-stk/configure circle30bpl14/configure --- circle30bpl14-stk/configure Tue Jun 30 16:58:00 1998 +++ circle30bpl14/configure Fri Mar 5 10:57:01 1999 @@ -748,7 +748,7 @@ else #include "confdefs.h" #include int main() { - int i; char c; + int i; char c = '0'; i = isascii(c); i = isdigit(c); i = isprint(c); @@ -1189,9 +1189,8 @@ fi fi - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1195: checking how to run the C preprocessor" >&5 +echo "configure:1194: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1206,13 +1205,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1223,13 +1222,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1252,12 +1251,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1256: checking for ANSI C header files" >&5 +echo "configure:1255: 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 @@ -1265,7 +1264,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1282,7 +1281,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 @@ -1300,7 +1299,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 @@ -1321,7 +1320,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1332,7 +1331,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1356,12 +1355,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1360: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1359: 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 @@ -1377,7 +1376,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1401,17 +1400,17 @@ for ac_hdr in fcntl.h sys/fcntl.h errno. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1405: checking for $ac_hdr" >&5 +echo "configure:1404: 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:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1441,17 +1440,17 @@ for ac_hdr in limits.h sys/time.h sys/se do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1445: checking for $ac_hdr" >&5 +echo "configure:1444: 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:1455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1481,17 +1480,17 @@ for ac_hdr in memory.h crypt.h assert.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1485: checking for $ac_hdr" >&5 +echo "configure:1484: 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:1495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1521,17 +1520,17 @@ for ac_hdr in sys/stat.h sys/socket.h sy do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1525: checking for $ac_hdr" >&5 +echo "configure:1524: 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:1535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1561,17 +1560,17 @@ for ac_hdr in signal.h sys/uio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1565: checking for $ac_hdr" >&5 +echo "configure:1564: 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:1575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1598,13 +1597,80 @@ fi done + + echo $ac_n "checking whether crypt needs over 10 characters""... $ac_c" 1>&6 +echo "configure:1603: checking whether crypt needs over 10 characters" >&5 +if eval "test \"`echo '$''{'ac_cv_unsafe_crypt'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + if test ${ac_cv_header_crypt_h-no} = yes; then + use_crypt_header="#include " + fi + if test ${ac_cv_lib_crypt_crypt-no} = yes; then + ORIGLIBS=$LIBS + LIBS="-lcrypt $LIBS" + fi + if test "$cross_compiling" = yes; then + ac_cv_unsafe_crypt=no +else + cat > conftest.$ac_ext < +#include +$use_crypt_header + +int main(void) +{ + char pwd[11], pwd2[11]; + + strncpy(pwd, (char *)crypt("FooBar", "BazQux"), 10); + pwd[10] = '\0'; + strncpy(pwd2, (char *)crypt("xyzzy", "BazQux"), 10); + pwd2[10] = '\0'; + if (strcmp(pwd, pwd2) == 0) + exit(0); + exit(1); +} + + +EOF +if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_unsafe_crypt=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_unsafe_crypt=no +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$ac_cv_unsafe_crypt" 1>&6 +if test $ac_cv_unsafe_crypt = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_UNSAFE_CRYPT 1 +EOF + +fi +if test ${ac_cv_lib_crypt_crypt-no} = yes; then + LIBS=$ORIGLIBS +fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1603: checking for working const" >&5 +echo "configure:1669: 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:1723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1674,12 +1740,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1678: checking for pid_t" >&5 +echo "configure:1744: 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 @@ -1707,12 +1773,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1711: checking for size_t" >&5 +echo "configure:1777: 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 @@ -1740,12 +1806,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:1744: checking for ssize_t" >&5 +echo "configure:1810: 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 @@ -1773,12 +1839,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1777: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1843: 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 @@ -1787,7 +1853,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1808,13 +1874,62 @@ EOF fi +if test $ac_cv_header_netinet_in_h = no; then + ac_cv_struct_in_addr = no +else + if test $ac_cv_header_sys_types_h = yes; then + headers=`cat << EOF +#include +#include +EOF +` + else + headers="#include " + fi + + echo $ac_n "checking for struct in_addr""... $ac_c" 1>&6 +echo "configure:1892: checking for struct in_addr" >&5 +if eval "test \"`echo '$''{'ac_cv_struct_in_addr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_in_addr=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_struct_in_addr=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_struct_in_addr" 1>&6 + + if test $ac_cv_struct_in_addr = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_STRUCT_IN_ADDR 1 +EOF + + fi +fi + + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1813: checking return type of signal handlers" >&5 +echo "configure:1928: 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 @@ -1831,7 +1946,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1855,12 +1970,12 @@ LIBS="$LIBS $NETLIB" for ac_func in inet_addr inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1859: checking for $ac_func" >&5 +echo "configure:1974: 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; then +if { (eval echo configure:2002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1909,19 +2024,61 @@ done LIBS=$ORIGLIBS +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 +echo "configure:6606: checking for zlib.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:6616: \"$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* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + Z_LIBS="-lz"; cat >> confdefs.h <<\EOF +#define HAVE_ZLIB 1 +EOF + LIBS="-lz $LIBS" +else + echo "$ac_t""no" 1>&6 +fi + +else + echo "$ac_t""no" 1>&6 +fi + ac_safe=`echo "accept" | sed 'y%./+-%__p_%'` ac_proto=NEED_`echo accept | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO echo $ac_n "checking if accept is prototyped""... $ac_c" 1>&6 -echo "configure:1919: checking if accept is prototyped" >&5 +echo "configure:2034: checking if accept is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -1967,13 +2124,13 @@ ac_proto=NEED_`echo atoi | sed 's/[^a-zA echo $ac_n "checking if atoi is prototyped""... $ac_c" 1>&6 -echo "configure:1971: checking if atoi is prototyped" >&5 +echo "configure:2086: checking if atoi is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2019,13 +2176,13 @@ ac_proto=NEED_`echo atol | sed 's/[^a-zA echo $ac_n "checking if atol is prototyped""... $ac_c" 1>&6 -echo "configure:2023: checking if atol is prototyped" >&5 +echo "configure:2138: checking if atol is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2071,13 +2228,13 @@ ac_proto=NEED_`echo bind | sed 's/[^a-zA echo $ac_n "checking if bind is prototyped""... $ac_c" 1>&6 -echo "configure:2075: checking if bind is prototyped" >&5 +echo "configure:2190: checking if bind is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2123,13 +2280,13 @@ ac_proto=NEED_`echo bzero | sed 's/[^a-z echo $ac_n "checking if bzero is prototyped""... $ac_c" 1>&6 -echo "configure:2127: checking if bzero is prototyped" >&5 +echo "configure:2242: checking if bzero is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2175,13 +2332,13 @@ ac_proto=NEED_`echo chdir | sed 's/[^a-z echo $ac_n "checking if chdir is prototyped""... $ac_c" 1>&6 -echo "configure:2179: checking if chdir is prototyped" >&5 +echo "configure:2294: checking if chdir is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2227,13 +2384,13 @@ ac_proto=NEED_`echo close | sed 's/[^a-z echo $ac_n "checking if close is prototyped""... $ac_c" 1>&6 -echo "configure:2231: checking if close is prototyped" >&5 +echo "configure:2346: checking if close is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2279,13 +2436,13 @@ ac_proto=NEED_`echo crypt | sed 's/[^a-z echo $ac_n "checking if crypt is prototyped""... $ac_c" 1>&6 -echo "configure:2283: checking if crypt is prototyped" >&5 +echo "configure:2398: checking if crypt is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2331,13 +2488,13 @@ ac_proto=NEED_`echo fclose | sed 's/[^a- echo $ac_n "checking if fclose is prototyped""... $ac_c" 1>&6 -echo "configure:2335: checking if fclose is prototyped" >&5 +echo "configure:2450: checking if fclose is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2383,13 +2540,13 @@ ac_proto=NEED_`echo fcntl | sed 's/[^a-z echo $ac_n "checking if fcntl is prototyped""... $ac_c" 1>&6 -echo "configure:2387: checking if fcntl is prototyped" >&5 +echo "configure:2502: checking if fcntl is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2435,13 +2592,13 @@ ac_proto=NEED_`echo fflush | sed 's/[^a- echo $ac_n "checking if fflush is prototyped""... $ac_c" 1>&6 -echo "configure:2439: checking if fflush is prototyped" >&5 +echo "configure:2554: checking if fflush is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2487,13 +2644,13 @@ ac_proto=NEED_`echo fprintf | sed 's/[^a echo $ac_n "checking if fprintf is prototyped""... $ac_c" 1>&6 -echo "configure:2491: checking if fprintf is prototyped" >&5 +echo "configure:2606: checking if fprintf is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2539,13 +2696,13 @@ ac_proto=NEED_`echo fputc | sed 's/[^a-z echo $ac_n "checking if fputc is prototyped""... $ac_c" 1>&6 -echo "configure:2543: checking if fputc is prototyped" >&5 +echo "configure:2658: checking if fputc is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2591,13 +2748,13 @@ ac_proto=NEED_`echo fputs | sed 's/[^a-z echo $ac_n "checking if fputs is prototyped""... $ac_c" 1>&6 -echo "configure:2595: checking if fputs is prototyped" >&5 +echo "configure:2710: checking if fputs is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2643,13 +2800,13 @@ ac_proto=NEED_`echo fread | sed 's/[^a-z echo $ac_n "checking if fread is prototyped""... $ac_c" 1>&6 -echo "configure:2647: checking if fread is prototyped" >&5 +echo "configure:2762: checking if fread is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2695,13 +2852,13 @@ ac_proto=NEED_`echo fscanf | sed 's/[^a- echo $ac_n "checking if fscanf is prototyped""... $ac_c" 1>&6 -echo "configure:2699: checking if fscanf is prototyped" >&5 +echo "configure:2814: checking if fscanf is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2747,13 +2904,13 @@ ac_proto=NEED_`echo fseek | sed 's/[^a-z echo $ac_n "checking if fseek is prototyped""... $ac_c" 1>&6 -echo "configure:2751: checking if fseek is prototyped" >&5 +echo "configure:2866: checking if fseek is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2799,13 +2956,13 @@ ac_proto=NEED_`echo fwrite | sed 's/[^a- echo $ac_n "checking if fwrite is prototyped""... $ac_c" 1>&6 -echo "configure:2803: checking if fwrite is prototyped" >&5 +echo "configure:2918: checking if fwrite is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2851,13 +3008,13 @@ ac_proto=NEED_`echo getpeername | sed 's echo $ac_n "checking if getpeername is prototyped""... $ac_c" 1>&6 -echo "configure:2855: checking if getpeername is prototyped" >&5 +echo "configure:2970: checking if getpeername is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2903,13 +3060,13 @@ ac_proto=NEED_`echo getpid | sed 's/[^a- echo $ac_n "checking if getpid is prototyped""... $ac_c" 1>&6 -echo "configure:2907: checking if getpid is prototyped" >&5 +echo "configure:3022: checking if getpid is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -2955,13 +3112,13 @@ ac_proto=NEED_`echo getrlimit | sed 's/[ echo $ac_n "checking if getrlimit is prototyped""... $ac_c" 1>&6 -echo "configure:2959: checking if getrlimit is prototyped" >&5 +echo "configure:3074: checking if getrlimit is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3007,13 +3164,13 @@ ac_proto=NEED_`echo getsockname | sed 's echo $ac_n "checking if getsockname is prototyped""... $ac_c" 1>&6 -echo "configure:3011: checking if getsockname is prototyped" >&5 +echo "configure:3126: checking if getsockname is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3059,13 +3216,13 @@ ac_proto=NEED_`echo gettimeofday | sed ' echo $ac_n "checking if gettimeofday is prototyped""... $ac_c" 1>&6 -echo "configure:3063: checking if gettimeofday is prototyped" >&5 +echo "configure:3178: checking if gettimeofday is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3111,13 +3268,13 @@ ac_proto=NEED_`echo htonl | sed 's/[^a-z echo $ac_n "checking if htonl is prototyped""... $ac_c" 1>&6 -echo "configure:3115: checking if htonl is prototyped" >&5 +echo "configure:3230: checking if htonl is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3163,13 +3320,13 @@ ac_proto=NEED_`echo htons | sed 's/[^a-z echo $ac_n "checking if htons is prototyped""... $ac_c" 1>&6 -echo "configure:3167: checking if htons is prototyped" >&5 +echo "configure:3282: checking if htons is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3215,13 +3372,13 @@ ac_proto=NEED_`echo inet_addr | sed 's/[ echo $ac_n "checking if inet_addr is prototyped""... $ac_c" 1>&6 -echo "configure:3219: checking if inet_addr is prototyped" >&5 +echo "configure:3334: checking if inet_addr is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3267,13 +3424,13 @@ ac_proto=NEED_`echo inet_aton | sed 's/[ echo $ac_n "checking if inet_aton is prototyped""... $ac_c" 1>&6 -echo "configure:3271: checking if inet_aton is prototyped" >&5 +echo "configure:3386: checking if inet_aton is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3319,13 +3476,13 @@ ac_proto=NEED_`echo inet_ntoa | sed 's/[ echo $ac_n "checking if inet_ntoa is prototyped""... $ac_c" 1>&6 -echo "configure:3323: checking if inet_ntoa is prototyped" >&5 +echo "configure:3438: checking if inet_ntoa is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3371,13 +3528,13 @@ ac_proto=NEED_`echo listen | sed 's/[^a- echo $ac_n "checking if listen is prototyped""... $ac_c" 1>&6 -echo "configure:3375: checking if listen is prototyped" >&5 +echo "configure:3490: checking if listen is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3423,13 +3580,13 @@ ac_proto=NEED_`echo ntohl | sed 's/[^a-z echo $ac_n "checking if ntohl is prototyped""... $ac_c" 1>&6 -echo "configure:3427: checking if ntohl is prototyped" >&5 +echo "configure:3542: checking if ntohl is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3475,13 +3632,13 @@ ac_proto=NEED_`echo perror | sed 's/[^a- echo $ac_n "checking if perror is prototyped""... $ac_c" 1>&6 -echo "configure:3479: checking if perror is prototyped" >&5 +echo "configure:3594: checking if perror is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3527,13 +3684,13 @@ ac_proto=NEED_`echo printf | sed 's/[^a- echo $ac_n "checking if printf is prototyped""... $ac_c" 1>&6 -echo "configure:3531: checking if printf is prototyped" >&5 +echo "configure:3646: checking if printf is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3579,13 +3736,13 @@ ac_proto=NEED_`echo qsort | sed 's/[^a-z echo $ac_n "checking if qsort is prototyped""... $ac_c" 1>&6 -echo "configure:3583: checking if qsort is prototyped" >&5 +echo "configure:3698: checking if qsort is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3631,13 +3788,13 @@ ac_proto=NEED_`echo read | sed 's/[^a-zA echo $ac_n "checking if read is prototyped""... $ac_c" 1>&6 -echo "configure:3635: checking if read is prototyped" >&5 +echo "configure:3750: checking if read is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_prototype_$ac_safe=no" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_prototype_$ac_safe=yes" +fi +rm -f conftest* + +fi + + +if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + cat >> confdefs.h <&6 +fi + + +ac_safe=`echo "remove" | sed 'y%./+-%__p_%'` +ac_proto=NEED_`echo remove | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO + + +echo $ac_n "checking if remove is prototyped""... $ac_c" 1>&6 +echo "configure:3802: checking if remove is prototyped" >&5 +if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3683,13 +3892,13 @@ ac_proto=NEED_`echo rewind | sed 's/[^a- echo $ac_n "checking if rewind is prototyped""... $ac_c" 1>&6 -echo "configure:3687: checking if rewind is prototyped" >&5 +echo "configure:3854: checking if rewind is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3735,13 +3944,13 @@ ac_proto=NEED_`echo select | sed 's/[^a- echo $ac_n "checking if select is prototyped""... $ac_c" 1>&6 -echo "configure:3739: checking if select is prototyped" >&5 +echo "configure:3906: checking if select is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3787,13 +3996,13 @@ ac_proto=NEED_`echo setitimer | sed 's/[ echo $ac_n "checking if setitimer is prototyped""... $ac_c" 1>&6 -echo "configure:3791: checking if setitimer is prototyped" >&5 +echo "configure:3958: checking if setitimer is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3839,13 +4048,13 @@ ac_proto=NEED_`echo setrlimit | sed 's/[ echo $ac_n "checking if setrlimit is prototyped""... $ac_c" 1>&6 -echo "configure:3843: checking if setrlimit is prototyped" >&5 +echo "configure:4010: checking if setrlimit is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3891,13 +4100,13 @@ ac_proto=NEED_`echo setsockopt | sed 's/ echo $ac_n "checking if setsockopt is prototyped""... $ac_c" 1>&6 -echo "configure:3895: checking if setsockopt is prototyped" >&5 +echo "configure:4062: checking if setsockopt is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3943,13 +4152,13 @@ ac_proto=NEED_`echo socket | sed 's/[^a- echo $ac_n "checking if socket is prototyped""... $ac_c" 1>&6 -echo "configure:3947: checking if socket is prototyped" >&5 +echo "configure:4114: checking if socket is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -3995,13 +4204,13 @@ ac_proto=NEED_`echo sprintf | sed 's/[^a echo $ac_n "checking if sprintf is prototyped""... $ac_c" 1>&6 -echo "configure:3999: checking if sprintf is prototyped" >&5 +echo "configure:4166: checking if sprintf is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -4047,13 +4256,13 @@ ac_proto=NEED_`echo sscanf | sed 's/[^a- echo $ac_n "checking if sscanf is prototyped""... $ac_c" 1>&6 -echo "configure:4051: checking if sscanf is prototyped" >&5 +echo "configure:4218: checking if sscanf is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_prototype_$ac_safe=no" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_prototype_$ac_safe=yes" +fi +rm -f conftest* + +fi + + +if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + cat >> confdefs.h <&6 +fi + + +ac_safe=`echo "strerror" | sed 'y%./+-%__p_%'` +ac_proto=NEED_`echo strerror | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO + + +echo $ac_n "checking if strerror is prototyped""... $ac_c" 1>&6 +echo "configure:4270: checking if strerror is prototyped" >&5 +if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -4099,13 +4360,13 @@ ac_proto=NEED_`echo system | sed 's/[^a- echo $ac_n "checking if system is prototyped""... $ac_c" 1>&6 -echo "configure:4103: checking if system is prototyped" >&5 +echo "configure:4322: checking if system is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -4151,13 +4412,13 @@ ac_proto=NEED_`echo time | sed 's/[^a-zA echo $ac_n "checking if time is prototyped""... $ac_c" 1>&6 -echo "configure:4155: checking if time is prototyped" >&5 +echo "configure:4374: checking if time is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -4203,13 +4464,13 @@ ac_proto=NEED_`echo unlink | sed 's/[^a- echo $ac_n "checking if unlink is prototyped""... $ac_c" 1>&6 -echo "configure:4207: checking if unlink is prototyped" >&5 +echo "configure:4426: checking if unlink is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else @@ -4255,13 +4516,13 @@ ac_proto=NEED_`echo write | sed 's/[^a-z echo $ac_n "checking if write is prototyped""... $ac_c" 1>&6 -echo "configure:4259: checking if write is prototyped" >&5 +echo "configure:4478: checking if write is prototyped" >&5 if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+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:4500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_prototype_$ac_safe=no" else Binary files circle30bpl14-stk/lib/etc/players and circle30bpl14/lib/etc/players differ Binary files circle30bpl14-stk/lib/plrobjs/A-E/azalin.objs and circle30bpl14/lib/plrobjs/A-E/azalin.objs differ Binary files circle30bpl14-stk/lib/plrobjs/F-J/jack.objs and circle30bpl14/lib/plrobjs/F-J/jack.objs differ diff -uprN circle30bpl14-stk/src/act.informative.c circle30bpl14/src/act.informative.c --- circle30bpl14-stk/src/act.informative.c Wed Jun 24 22:16:56 1998 +++ circle30bpl14/src/act.informative.c Fri Mar 5 10:44:22 1999 @@ -1584,6 +1584,8 @@ ACMD(do_toggle) "Auction Channel: %-3s " " Grats Channel: %-3s\r\n" + " Compression: %-3s " + " Auto-Compress: %-3s " " Color Level: %s\r\n", ONOFF(PRF_FLAGGED(ch, PRF_DISPHP)), @@ -1606,7 +1608,14 @@ ACMD(do_toggle) ONOFF(!PRF_FLAGGED(ch, PRF_NOAUCT)), ONOFF(!PRF_FLAGGED(ch, PRF_NOGRATZ)), - ctypes[COLOR_LEV(ch)]); +#if defined(HAVE_ZLIB) + ONOFF(ch->desc->deflate), + YESNO(PRF_FLAGGED(ch, PRF_AUTOZLIB)), +#else + "N/A", "N/A", +#endif + ctypes[COLOR_LEV(ch)] + ); send_to_char(buf, ch); } diff -uprN circle30bpl14-stk/src/act.other.c circle30bpl14/src/act.other.c --- circle30bpl14-stk/src/act.other.c Tue Jun 16 15:08:57 1998 +++ circle30bpl14/src/act.other.c Fri Mar 5 10:44:22 1999 @@ -859,7 +859,11 @@ ACMD(do_gen_tog) {"Nameserver_is_slow changed to NO; IP addresses will now be resolved.\r\n", "Nameserver_is_slow changed to YES; sitenames will no longer be resolved.\r\n"}, {"Autoexits disabled.\r\n", - "Autoexits enabled.\r\n"} + "Autoexits enabled.\r\n"}, + {"Compression support disabled.\r\n", + "Compression support enabled.\r\n"}, + {"Compression support will not be enabled automatically.\r\n", + "Compression support will be automatically enabled if your client supports it.\r\n"} }; @@ -915,6 +919,21 @@ ACMD(do_gen_tog) case SCMD_AUTOEXIT: result = PRF_TOG_CHK(ch, PRF_AUTOEXIT); break; + +#if defined(HAVE_ZLIB) + case SCMD_COMPRESS: + result = toggle_compression(ch->desc); + break; + case SCMD_AUTOZLIB: + result = PRF_TOG_CHK(ch, PRF_AUTOZLIB); + break; +#else + case SCMD_COMPRESS: + case SCMD_AUTOZLIB: + send_to_char("Compression not supported.\r\n", ch); + return; +#endif + default: log("SYSERR: Unknown subcmd %d in do_gen_toggle.", subcmd); return; diff -uprN circle30bpl14-stk/src/comm.c circle30bpl14/src/comm.c --- circle30bpl14-stk/src/comm.c Fri Jul 3 12:07:39 1998 +++ circle30bpl14/src/comm.c Fri Mar 5 14:03:39 1999 @@ -141,6 +141,22 @@ int set_sendbuf(socket_t s); sigfunc *my_signal(int signo, sigfunc * func); #endif +/* + * Compression support. Currently could be used with: + * + * MUD Client for Linux, by Erwin S. Andreasen + * http://www.andreasen.org/mcl/ + * + * mcclient, by Oliver 'Nemon@AR' Jowett + * http://homepages.ihug.co.nz/~icecube/compress/ + * + * Contact them for help with the clients. + */ +#if defined(HAVE_ZLIB) +void *zlib_alloc(void *opaque, unsigned int items, unsigned int size); +void zlib_free(void *opaque, void *address); +#endif + /* extern fcnts */ void reboot_wizlists(void); void boot_world(void); @@ -163,6 +179,26 @@ void weather_and_time(int mode); #define FD_CLR(x, y) #endif +/* + * MUD Client for Linux and mcclient compression support. + * "The COMPRESS option (unofficial and completely arbitary) is + * option 85." -- mcclient documentation as of Dec '98. + * + * [ Compression protocol documentation for reference, from Compress.c ] + * + * Server sends IAC WILL COMPRESS + * We reply with IAC DO COMPRESS + * + * Later the server sends IAC SB COMPRESS WILL SE, and immediately following + * that, begins compressing + * + * Compression ends on a Z_STREAM_END, no other marker is used + */ +#define TELOPT_COMPRESS 85 +static char will_sig[] = { IAC, WILL, TELOPT_COMPRESS, 0 }; +static char do_sig[] = { IAC, DO, TELOPT_COMPRESS, 0 }; +static char on_sig[] = { IAC, SB, TELOPT_COMPRESS, WILL, SE, 0 }; + /*********************************************************************** * main game loop and related stuff * @@ -703,7 +739,7 @@ void game_loop(int mother_desc) /* Print prompts for other descriptors who had no other output */ for (d = descriptor_list; d; d = d->next) { if (!d->has_prompt) { - write_to_descriptor(d->descriptor, make_prompt(d)); + SEND_TO_Q(make_prompt(d), d); d->has_prompt = 1; } } @@ -1024,6 +1060,7 @@ void write_to_output(const char *txt, st t->bufptr += size; return; } + /* * If the text is too big to fit into even a large buffer, chuck the * new text and switch to the overflow state. @@ -1191,7 +1228,7 @@ int new_descriptor(int s) sockets_connected++; if (sockets_connected >= max_players) { - write_to_descriptor(desc, "Sorry, CircleMUD is full right now... please try again later!\r\n"); + SEND_TO_SOCKET("Sorry, CircleMUD is full right now... please try again later!\r\n", desc); CLOSE_SOCKET(desc); return 0; } @@ -1258,19 +1295,72 @@ int new_descriptor(int s) SEND_TO_Q(GREETINGS, newd); + write_to_descriptor(newd->descriptor, will_sig, strlen(will_sig)); + return 0; } +int toggle_compression(struct descriptor_data *t) +{ +#if defined(HAVE_ZLIB) + int derr, turn_on = (t->deflate == NULL); + + if (turn_on && !DESC_FLAGGED(t, DESC_CANZLIB)) + return 0; + + if (turn_on) { + /* Notify client. */ + write_to_descriptor(t->descriptor, on_sig, strlen(on_sig)); + + /* Set up zlib structures. */ + CREATE(t->deflate, z_stream, 1); + t->deflate->zalloc = zlib_alloc; + t->deflate->zfree = zlib_free; + t->deflate->opaque = NULL; + t->deflate->next_in = t->small_outbuf; + t->deflate->next_out = t->small_outbuf; + t->deflate->avail_out = SMALL_BUFSIZE; + t->deflate->avail_in = 0; + + /* Initialize. */ + if ((derr = deflateInit(t->deflate, Z_DEFAULT_COMPRESSION)) != 0) + log("SYSERR: deflateEnd returned %d.", derr); + + return 1; + } + + if (!turn_on) { /* off */ + int pending = t->deflate->avail_out; + + t->deflate->next_out = t->small_outbuf; + + if ((derr = deflate(t->deflate, Z_FINISH)) != Z_STREAM_END) + log("SYSERR: deflate returned %d upon Z_FINISH. (in: %d, out: %d)", derr, t->deflate->avail_in, t->deflate->avail_out); + + pending -= t->deflate->avail_out; + if (pending) + write_to_descriptor(t->descriptor, t->small_outbuf, 6); + + if ((derr = deflateEnd(t->deflate)) != Z_OK) + log("SYSERR: deflateEnd returned %d. (in: %d, out: %d)", derr, t->deflate->avail_in, t->deflate->avail_out); + + free(t->deflate); + t->deflate = NULL; + + return 0; + } +#endif + return 0; +} /* * Send all of the output that we've accumulated for a player out to * the player's descriptor. - * FIXME - This will be rewritten before 3.1, this code is dumb. */ int process_output(struct descriptor_data *t) { char i[MAX_SOCK_BUF]; - int result; + int written = 0, offset, result; /* we may need this \r\n for later -- see below */ strcpy(i, "\r\n"); @@ -1294,9 +1384,50 @@ int process_output(struct descriptor_dat * CRLF, otherwise send the straight output sans CRLF. */ if (t->has_prompt) /* && !t->connected) */ - result = write_to_descriptor(t->descriptor, i); + offset = 0; else - result = write_to_descriptor(t->descriptor, i + 2); + offset = 2; + + /* + * This huge #ifdef could be a function of its own, if desired. -gg 2/27/99 + */ +#if defined(HAVE_ZLIB) + if (t->deflate) { /* Complex case, compression, write it out. */ + /* Keep compiler happy, and MUD, just in case we don't write anything. */ + result = 1; + + /* First we set up our input data. */ + t->deflate->avail_in = strlen(i + offset); + t->deflate->next_in = i + offset; + + do { + int df, prevsize = SMALL_BUFSIZE - t->deflate->avail_out; + + /* If there is input or the output has reset from being previously full, run compression again. */ + if (t->deflate->avail_in || t->deflate->avail_out == SMALL_BUFSIZE) + if ((df = deflate(t->deflate, Z_SYNC_FLUSH)) != 0) + log("SYSERR: process_output: deflate() returned %d.", df); + + /* There should always be something new to write out. */ + result = write_to_descriptor(t->descriptor, t->small_outbuf + prevsize, SMALL_BUFSIZE - t->deflate->avail_out - prevsize); + + /* Wrap the buffer when we've run out of buffer space for the output. */ + if (t->deflate->avail_out == 0) { + t->deflate->avail_out = SMALL_BUFSIZE; + t->deflate->next_out = t->small_outbuf; + } + + /* Oops. This shouldn't happen, I hope. -gg 2/19/99 */ + if (result <= 0) + return -1; + + /* Need to loop while we still have input or when the output buffer was previously full. */ + } while (t->deflate->avail_out == SMALL_BUFSIZE || t->deflate->avail_in); + } else +#endif + result = write_to_descriptor(t->descriptor, i + offset, strlen(i + offset)); + + written = result >= 0 ? result : -result; /* handle snooping: prepend "% " and send to snooper */ if (t->snoop_by) { @@ -1304,6 +1435,7 @@ int process_output(struct descriptor_dat SEND_TO_Q(t->output, t->snoop_by); SEND_TO_Q("%%", t->snoop_by); } + /* * if we were using a large buffer, put the large buffer on the buffer pool * and switch back to the small one @@ -1314,14 +1446,28 @@ int process_output(struct descriptor_dat t->large_outbuf = NULL; t->output = t->small_outbuf; } + /* reset total bufspace back to that of a small buffer */ t->bufspace = SMALL_BUFSIZE - 1; t->bufptr = 0; *(t->output) = '\0'; - return result; -} + /* Error, cut off. */ + if (result == 0) + return (-1); + + /* Normal case, wrote ok. */ + if (result > 0) + return (1); + /* + * We blocked, restore the unwritten output. Known + * bug in that the snooping immortal will see it twice + * but details... + */ + write_to_output(i + written + offset, t); + return (0); +} /* * perform_socket_write: takes a descriptor, a pointer to text, and a @@ -1425,41 +1571,47 @@ ssize_t perform_socket_write(socket_t de * write_to_descriptor takes a descriptor, and text to write to the * descriptor. It keeps calling the system-level write() until all * the text has been delivered to the OS, or until an error is - * encountered. + * encountered. 'written' is updated to add how many bytes were sent + * over the socket successfully prior to the return. It is not zero'd. * * Returns: - * 0 If all is well and good, - * -1 If an error was encountered, so that the player should be cut off + * + All is well and good. + * 0 A fatal or unexpected error was encountered. + * - The socket write would block. */ -int write_to_descriptor(socket_t desc, const char *txt) +int write_to_descriptor(socket_t desc, const char *txt, size_t total) { - size_t total; - ssize_t bytes_written; + ssize_t bytes_written, total_written = 0; - total = strlen(txt); + if (total == 0) { + log("write_to_descriptor: write nothing?!"); + return 0; + } while (total > 0) { bytes_written = perform_socket_write(desc, txt, total); if (bytes_written < 0) { /* Fatal error. Disconnect the player. */ - perror("Write to socket"); - return -1; + perror("SYSERR: write_to_descriptor"); + return (0); } else if (bytes_written == 0) { /* * Temporary failure -- socket buffer full. For now we'll just * cut off the player, but eventually we'll stuff the unsent * text into a buffer and retry the write later. JE 30 June 98. + * Implemented the anti-cut-off code he wanted. GG 13 Jan 99. */ - log("process_output: socket write would block, about to close"); - return -1; + log("WARNING: write_to_descriptor: socket write would block."); + return (-total_written); } else { txt += bytes_written; total -= bytes_written; + total_written += bytes_written; } } - return 0; + return (total_written); } @@ -1534,7 +1686,7 @@ int process_input(struct descriptor_data int buf_length, failed_subst; ssize_t bytes_read; size_t space_left; - char *ptr, *read_point, *write_point, *nl_pos = NULL; + char *ptr, *read_point, *write_point, *nl_pos; char tmp[MAX_INPUT_LENGTH + 8]; /* first, find the point where we left off reading data */ @@ -1557,12 +1709,29 @@ int process_input(struct descriptor_data /* at this point, we know we got some data from the read */ - *(read_point + bytes_read) = '\0'; /* terminate the string */ + read_point[bytes_read] = '\0'; /* terminate the string */ /* search for a newline in the data we just read */ - for (ptr = read_point; *ptr && !nl_pos; ptr++) - if (ISNEWL(*ptr)) + for (ptr = read_point, nl_pos = NULL; *ptr && !nl_pos; ptr++) { + /* + * Search for an "Interpret As Command" marker. Note that we still + * have an ostrich attitude to all other IAC markers. At least now + * they won't show up in the users' input streams. -gg 2/28/99 + */ + if (*(unsigned char *)ptr == IAC) { + if (!strcmp(ptr, do_sig)) + SET_BIT(DESC_FLAGS(t), DESC_CANZLIB); + + /* Convert the IAC string so that it is filtered out. */ + while (*ptr < 0) + *ptr++ = '\0'; + + /* If this was everything, pretend we had nothing. */ + if (ISNEWL(*ptr)) + *ptr++ = '\0'; + } else if (ISNEWL(*ptr)) nl_pos = ptr; + } read_point += bytes_read; space_left -= bytes_read; @@ -1621,8 +1790,7 @@ int process_input(struct descriptor_data char buffer[MAX_INPUT_LENGTH + 64]; sprintf(buffer, "Line too long. Truncated to:\r\n%s\r\n", tmp); - if (write_to_descriptor(t->descriptor, buffer) < 0) - return -1; + SEND_TO_Q(buffer, t); } if (t->snoop_by) { SEND_TO_Q("% ", t->snoop_by); @@ -1798,6 +1966,11 @@ void close_socket(struct descriptor_data if (d->showstr_count) free(d->showstr_vector); + if (d->deflate) { + deflateEnd(d->deflate); + free(d->deflate); + } + free(d); } @@ -2246,3 +2419,19 @@ void sanity_check(void) strlen(buf), strlen(buf1), strlen(buf2), strlen(arg)); #endif } + +#if defined(HAVE_ZLIB) + +/* Compression stuff. */ + +void *zlib_alloc(void *opaque, unsigned int items, unsigned int size) +{ + return calloc(items, size); +} + +void zlib_free(void *opaque, void *address) +{ + free(address); +} + +#endif diff -uprN circle30bpl14-stk/src/comm.h circle30bpl14/src/comm.h --- circle30bpl14-stk/src/comm.h Sun Jun 7 20:38:10 1998 +++ circle30bpl14/src/comm.h Fri Mar 5 10:44:22 1999 @@ -30,12 +30,15 @@ void act(const char *str, int hide_invis #define TO_CHAR 4 #define TO_SLEEP 128 /* to char, even if sleeping */ -int write_to_descriptor(socket_t desc,const char *txt); +int write_to_descriptor(socket_t desc,const char *txt, size_t total); void write_to_q(const char *txt, struct txt_q *queue, int aliased); void write_to_output(const char *txt, struct descriptor_data *d); void page_string(struct descriptor_data *d, char *str, int keep_internal); -#define SEND_TO_Q(messg, desc) write_to_output((messg), desc) +int toggle_compression(struct descriptor_data *d); + +#define SEND_TO_Q(messg, desc) write_to_output((messg), desc) +#define SEND_TO_SOCKET(messg, desc) write_to_descriptor((desc), (messg), strlen(messg)) #define USING_SMALL(d) ((d)->output == (d)->small_outbuf) #define USING_LARGE(d) ((d)->output == (d)->large_outbuf) diff -uprN circle30bpl14-stk/src/conf.h.in circle30bpl14/src/conf.h.in --- circle30bpl14-stk/src/conf.h.in Tue Jun 30 14:57:54 1998 +++ circle30bpl14/src/conf.h.in Sat Feb 27 21:26:11 1999 @@ -21,12 +21,18 @@ /* Define if you can safely include both and . */ #undef TIME_WITH_SYS_TIME +/* Define if you have 'struct in_addr' */ +#undef HAVE_STRUCT_IN_ADDR + /* Define if we're compiling CircleMUD under any type of UNIX system */ #undef CIRCLE_UNIX /* Define if the system is capable of using crypt() to encrypt */ #undef CIRCLE_CRYPT +/* Define if your crypt isn't safe with only 10 characters. */ +#undef HAVE_UNSAFE_CRYPT + /* Define to `int' if doesn't define. */ #undef ssize_t @@ -108,6 +114,9 @@ /* Define if you have the malloc library (-lmalloc). */ #undef HAVE_LIBMALLOC +/* Definie if your system has compression support in zlib. */ +#undef HAVE_ZLIB + /* Define if your compiler does not prototype accept(). */ #undef NEED_ACCEPT_PROTO @@ -210,6 +219,9 @@ /* Define if your compiler does not prototype read(). */ #undef NEED_READ_PROTO +/* Define if your compiler does not prototype remove(). */ +#undef NEED_REMOVE_PROTO + /* Define if your compiler does not prototype rewind(). */ #undef NEED_REWIND_PROTO @@ -233,6 +245,9 @@ /* Define if your compiler does not prototype sscanf(). */ #undef NEED_SSCANF_PROTO + +/* Define if your compiler does not prototype strerror(). */ +#undef NEED_STRERROR_PROTO /* Define if your compiler does not prototype system(). */ #undef NEED_SYSTEM_PROTO diff -uprN circle30bpl14-stk/src/constants.c circle30bpl14/src/constants.c --- circle30bpl14-stk/src/constants.c Wed Jun 24 14:56:58 1998 +++ circle30bpl14/src/constants.c Fri Mar 5 10:44:22 1999 @@ -182,6 +182,7 @@ const char *preference_bits[] = { "!GOS", "!GTZ", "RMFLG", + "ZLIB" "\n" }; diff -uprN circle30bpl14-stk/src/interpreter.c circle30bpl14/src/interpreter.c --- circle30bpl14-stk/src/interpreter.c Tue Jun 16 16:13:04 1998 +++ circle30bpl14/src/interpreter.c Fri Mar 5 12:14:53 1999 @@ -225,6 +225,7 @@ cpp_extern const struct command_info cmd { "assist" , POS_FIGHTING, do_assist , 1, 0 }, { "ask" , POS_RESTING , do_spec_comm, 0, SCMD_ASK }, { "auction" , POS_SLEEPING, do_gen_comm , 0, SCMD_AUCTION }, + { "autocompress", POS_DEAD , do_gen_tog , 0, SCMD_AUTOZLIB }, { "autoexit" , POS_DEAD , do_gen_tog , 0, SCMD_AUTOEXIT }, { "bounce" , POS_STANDING, do_action , 0, 0 }, @@ -254,6 +255,7 @@ cpp_extern const struct command_info cmd { "color" , POS_DEAD , do_color , 0, 0 }, { "comfort" , POS_RESTING , do_action , 0, 0 }, { "comb" , POS_RESTING , do_action , 0, 0 }, + { "compress" , POS_DEAD , do_gen_tog , 0, SCMD_COMPRESS }, { "commands" , POS_DEAD , do_commands , 0, SCMD_COMMANDS }, { "compact" , POS_DEAD , do_gen_tog , 0, SCMD_COMPACT }, { "cough" , POS_RESTING , do_action , 0, 0 }, @@ -1445,6 +1447,9 @@ void nanny(struct descriptor_data *d, ch /* check and make sure no other copies of this player are logged in */ if (perform_dupe_check(d)) return; + + if (PRF_FLAGGED(d->character, PRF_AUTOZLIB)) + toggle_compression(d); if (GET_LEVEL(d->character) >= LVL_IMMORT) SEND_TO_Q(imotd, d); diff -uprN circle30bpl14-stk/src/interpreter.h circle30bpl14/src/interpreter.h --- circle30bpl14-stk/src/interpreter.h Sun Jun 7 20:38:14 1998 +++ circle30bpl14/src/interpreter.h Fri Mar 5 10:44:22 1999 @@ -113,6 +113,8 @@ struct alias { #define SCMD_HOLYLIGHT 13 #define SCMD_SLOWNS 14 #define SCMD_AUTOEXIT 15 +#define SCMD_COMPRESS 16 +#define SCMD_AUTOZLIB 17 /* do_wizutil */ #define SCMD_REROLL 0 diff -uprN circle30bpl14-stk/src/structs.h circle30bpl14/src/structs.h --- circle30bpl14-stk/src/structs.h Tue Jun 16 13:20:56 1998 +++ circle30bpl14/src/structs.h Fri Mar 5 10:44:22 1999 @@ -159,6 +159,8 @@ #define MOB_NOBASH (1 << 16) /* Mob can't be bashed (e.g. trees) */ #define MOB_NOBLIND (1 << 17) /* Mob can't be blinded */ +/* Descriptor flags */ +#define DESC_CANZLIB (1 << 0) /* Client says compression capable. */ /* Preference flags: used by char_data.player_specials.pref */ #define PRF_BRIEF (1 << 0) /* Room descs won't normally be shown */ @@ -183,7 +185,7 @@ #define PRF_NOGOSS (1 << 19) /* Can't hear gossip channel */ #define PRF_NOGRATZ (1 << 20) /* Can't hear grats channel */ #define PRF_ROOMFLAGS (1 << 21) /* Can see room flags (ROOM_x) */ - +#define PRF_AUTOZLIB (1 << 22) /* Automatically do compression. */ /* Affect bits: used in char_data.char_specials.saved.affected_by */ /* WARNING: In the world files, NEVER set the bits marked "R" ("Reserved") */ @@ -914,6 +916,7 @@ struct descriptor_data { char host[HOST_LENGTH+1]; /* hostname */ byte bad_pws; /* number of bad pw attemps this login */ byte idle_tics; /* tics idle at password prompt */ + int options; /* descriptor flags */ int connected; /* mode of 'connectedness' */ int wait; /* wait for how many loops */ int desc_num; /* unique num assigned to desc */ @@ -941,6 +944,9 @@ struct descriptor_data { struct descriptor_data *snooping; /* Who is this char snooping */ struct descriptor_data *snoop_by; /* And who is snooping this char */ struct descriptor_data *next; /* link to next descriptor */ +#if defined(HAVE_ZLIB) + z_stream *deflate; /* compression engine */ +#endif }; diff -uprN circle30bpl14-stk/src/sysdep.h circle30bpl14/src/sysdep.h --- circle30bpl14-stk/src/sysdep.h Fri Jul 3 12:18:29 1998 +++ circle30bpl14/src/sysdep.h Fri Mar 5 10:44:22 1999 @@ -195,6 +195,9 @@ extern void abort (), exit (); #define assert(arg) #endif +#ifdef HAVE_ZLIB +# include +#endif /* Header files only used in comm.c and some of the utils */ diff -uprN circle30bpl14-stk/src/utils.h circle30bpl14/src/utils.h --- circle30bpl14-stk/src/utils.h Sat Jun 20 21:19:07 1998 +++ circle30bpl14/src/utils.h Fri Mar 5 12:18:41 1999 @@ -189,7 +189,7 @@ void update_pos(struct char_data *victim #define PRF_FLAGS(ch) CHECK_PLAYER_SPECIAL((ch), ((ch)->player_specials->saved.pref)) #define AFF_FLAGS(ch) ((ch)->char_specials.saved.affected_by) #define ROOM_FLAGS(loc) (world[(loc)].room_flags) - +#define DESC_FLAGS(d) ((d)->options) #define IS_NPC(ch) (IS_SET(MOB_FLAGS(ch), MOB_ISNPC)) #define IS_MOB(ch) (IS_NPC(ch) && ((ch)->nr >-1)) @@ -202,6 +202,7 @@ void update_pos(struct char_data *victim #define OBJVAL_FLAGGED(obj, flag) (IS_SET(GET_OBJ_VAL((obj), 1), (flag))) #define OBJWEAR_FLAGGED(obj, flag) (IS_SET((obj)->obj_flags.wear_flags, (flag))) #define OBJ_FLAGGED(obj, flag) (IS_SET(GET_OBJ_EXTRA(obj), (flag))) +#define DESC_FLAGGED(d, flag) (IS_SET(DESC_FLAGS(d), (flag))) /* IS_AFFECTED for backwards compatibility */ #define IS_AFFECTED(ch, skill) (AFF_FLAGGED((ch), (skill)))