Eric Andersen | 7129da0 | 2003-01-18 21:27:22 +0000 | [diff] [blame] | 1 | --- netkit-telnet-0.17/configure Thu Apr 11 10:40:58 2002 |
| 2 | +++ FIXEDnetkittelnet/configure Thu Apr 11 10:39:59 2002 |
| 3 | @@ -78,7 +78,6 @@ |
| 4 | for TRY in egcs gcc g++ CC c++ cc; do |
| 5 | ( |
| 6 | $TRY __conftest.c -o __conftest || exit 1; |
| 7 | - ./__conftest || exit 1; |
| 8 | ) >/dev/null 2>&1 || continue; |
| 9 | CC=$TRY |
| 10 | break; |
| 11 | @@ -94,7 +93,6 @@ |
| 12 | echo -n 'Checking if C compiler works... ' |
| 13 | if ( |
| 14 | $CC __conftest.c -o __conftest || exit 1 |
| 15 | - ./__conftest || exit 1 |
| 16 | ) >/dev/null 2>&1; then |
| 17 | echo 'yes' |
| 18 | else |
| 19 | @@ -125,7 +123,6 @@ |
| 20 | for TRY in egcs gcc g++ CC c++ cc; do |
| 21 | ( |
| 22 | $TRY __conftest.cc -o __conftest || exit 1; |
| 23 | - ./__conftest || exit 1; |
| 24 | ) >/dev/null 2>&1 || continue; |
| 25 | CXX=$TRY |
| 26 | break; |
Daniel Mentz | 46f041c | 2014-12-01 20:23:47 -0800 | [diff] [blame] | 27 | @@ -138,18 +135,5 @@ |
| 28 | fi |
| 29 | echo "$CXX" |
| 30 | -else |
| 31 | - echo -n 'Checking if C++ compiler works... ' |
| 32 | - if ( |
| 33 | - $CXX __conftest.cc -o __conftest || exit 1 |
Eric Andersen | 7129da0 | 2003-01-18 21:27:22 +0000 | [diff] [blame] | 34 | - ./__conftest || exit 1 |
Daniel Mentz | 46f041c | 2014-12-01 20:23:47 -0800 | [diff] [blame] | 35 | - ) >/dev/null 2>&1; then |
| 36 | - echo 'yes' |
| 37 | - else |
| 38 | - echo 'no' |
| 39 | - echo 'Compiler '"$CXX"' does not exist or cannot compile C++; try another.' |
| 40 | - rm -f __conftest* |
| 41 | - exit |
| 42 | - fi |
| 43 | fi |
| 44 | |
| 45 | echo -n "Checking if $CXX accepts gcc warnings... " |
Eric Andersen | 7129da0 | 2003-01-18 21:27:22 +0000 | [diff] [blame] | 46 | @@ -278,13 +274,11 @@ |
| 47 | EOF |
| 48 | if ( |
| 49 | $CXX $CXXFLAGS __conftest.cc -o __conftest || exit 1 |
| 50 | - ./__conftest || exit 1 |
| 51 | ) >/dev/null 2>&1; then |
| 52 | echo 'yes' |
| 53 | else |
| 54 | if ( |
| 55 | $CXX $CXXFLAGS -D__USE_BSD_SIGNAL __conftest.cc -o __conftest || exit 1 |
| 56 | - ./__conftest || exit 1 |
| 57 | ) >/dev/null 2>&1; then |
| 58 | echo '-D__USE_BSD_SIGNAL' |
| 59 | CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL" |
| 60 | @@ -292,6 +286,7 @@ |
| 61 | else |
| 62 | echo 'no' |
| 63 | echo 'This package needs BSD signal semantics to run.' |
| 64 | + echo "$CXX $CXXFLAGS -D__USE_BSD_SIGNAL __conftest.cc -o __conftest failed" |
| 65 | rm -f __conftest* |
| 66 | exit |
| 67 | fi |
| 68 | @@ -330,31 +325,6 @@ |
| 69 | echo 'no' |
| 70 | fi |
| 71 | fi |
| 72 | - |
| 73 | -if [ x$NCURSES != x ]; then |
| 74 | - LIBTERMCAP=-lncurses |
| 75 | -else |
| 76 | - echo -n 'Checking for traditional termcap... ' |
| 77 | -cat <<EOF >__conftest.cc |
| 78 | -#include <stdio.h> |
| 79 | -#include <termcap.h> |
Daniel Mentz | 46f041c | 2014-12-01 20:23:47 -0800 | [diff] [blame] | 80 | -int main() { |
Eric Andersen | 7129da0 | 2003-01-18 21:27:22 +0000 | [diff] [blame] | 81 | - tgetent(NULL, NULL); return 0; |
| 82 | -} |
| 83 | - |
| 84 | -EOF |
| 85 | - if ( |
| 86 | - $CXX $CXXFLAGS __conftest.cc -ltermcap -o __conftest || exit 1 |
| 87 | - ) >/dev/null 2>&1; then |
| 88 | - echo '-ltermcap' |
| 89 | - LIBTERMCAP=-ltermcap |
| 90 | - else |
| 91 | - echo 'not found' |
| 92 | - echo 'This package needs termcap to run.' |
| 93 | - rm -f __conftest* |
| 94 | - exit |
| 95 | - fi |
| 96 | -fi |
| 97 | rm -f __conftest* |
| 98 | |
| 99 | ################################################## |
| 100 | @@ -468,7 +438,6 @@ |
| 101 | else |
| 102 | if ( |
| 103 | $CXX $CXXFLAGS -D_GNU_SOURCE __conftest.cc -o __conftest || exit 1 |
| 104 | - ./__conftest || exit 1 |
| 105 | ) >/dev/null 2>&1; then |
| 106 | echo '-D_GNU_SOURCE' |
| 107 | CFLAGS="$CFLAGS -D_GNU_SOURCE" |
| 108 | @@ -501,20 +470,17 @@ |
| 109 | EOF |
| 110 | if ( |
| 111 | $CXX $CXXFLAGS __conftest.cc $LIBBSD -o __conftest || exit 1 |
| 112 | - ./__conftest || exit 1 |
| 113 | ) >/dev/null 2>&1; then |
| 114 | echo 'ok' |
| 115 | else |
| 116 | if ( |
| 117 | $CXX $CXXFLAGS __conftest.cc -lsnprintf $LIBBSD -o __conftest || exit 1 |
| 118 | - ./__conftest || exit 1 |
| 119 | ) >/dev/null 2>&1; then |
| 120 | echo '-lsnprintf' |
| 121 | LIBS="$LIBS -lsnprintf" |
| 122 | else |
| 123 | if ( |
| 124 | $CXX $CXXFLAGS __conftest.cc -ldb $LIBBSD -o __conftest || exit 1 |
| 125 | - ./__conftest || exit 1 |
| 126 | ) >/dev/null 2>&1; then |
| 127 | echo '-ldb' |
| 128 | LIBS="$LIBS -ldb" |
Eric Andersen | 9fe57b8 | 2003-07-24 05:52:03 +0000 | [diff] [blame] | 129 | diff -urN netkit-telnet-0.17/telnetd/state.c netkit-telnet-0.17-dm/telnetd/state.c |
| 130 | --- netkit-telnet-0.17/telnetd/state.c 1999-12-12 11:41:44.000000000 -0800 |
| 131 | +++ netkit-telnet-0.17-dm/telnetd/state.c 2003-07-23 19:20:38.000000000 -0700 |
| 132 | @@ -43,10 +43,10 @@ |
| 133 | |
| 134 | static int envvarok(char *varp); |
| 135 | |
| 136 | -static unsigned char doopt[] = { IAC, DO, '%', 'c', 0 }; |
| 137 | -static unsigned char dont[] = { IAC, DONT, '%', 'c', 0 }; |
| 138 | -unsigned char will[] = { IAC, WILL, '%', 'c', 0 }; |
| 139 | -unsigned char wont[] = { IAC, WONT, '%', 'c', 0 }; |
| 140 | +//static unsigned char doopt[] = { IAC, DO, '%', 'c', 0 }; |
| 141 | +//static unsigned char dont[] = { IAC, DONT, '%', 'c', 0 }; |
| 142 | +//unsigned char will[] = { IAC, WILL, '%', 'c', 0 }; |
| 143 | +//unsigned char wont[] = { IAC, WONT, '%', 'c', 0 }; |
| 144 | |
| 145 | /* |
| 146 | * Buffer for sub-options, and macros |
| 147 | @@ -422,7 +422,7 @@ |
| 148 | set_his_want_state_will(option); |
| 149 | do_dont_resp[option]++; |
| 150 | } |
| 151 | - netoprintf((char *)doopt, option); |
| 152 | + netoprintf( "%c%c%c", IAC, DO, option ); |
| 153 | |
| 154 | DIAG(TD_OPTIONS, printoption("td: send do", option)); |
| 155 | } |
| 156 | @@ -632,7 +632,7 @@ |
| 157 | set_his_want_state_wont(option); |
| 158 | do_dont_resp[option]++; |
| 159 | } |
| 160 | - netoprintf((char *) dont, option); |
| 161 | + netoprintf ( "%c%c%c", IAC, DONT, option ); |
| 162 | |
| 163 | DIAG(TD_OPTIONS, printoption("td: send dont", option)); |
| 164 | } |
| 165 | @@ -769,7 +769,7 @@ |
| 166 | set_my_want_state_will(option); |
| 167 | will_wont_resp[option]++; |
| 168 | } |
| 169 | - netoprintf((char *) will, option); |
| 170 | + netoprintf( "%c%c%c", IAC, WILL, option); |
| 171 | |
| 172 | DIAG(TD_OPTIONS, printoption("td: send will", option)); |
| 173 | } |
| 174 | @@ -917,7 +917,7 @@ |
| 175 | set_my_want_state_wont(option); |
| 176 | will_wont_resp[option]++; |
| 177 | } |
| 178 | - netoprintf((char *)wont, option); |
| 179 | + netoprintf( "%c%c%c", IAC, WONT, option); |
| 180 | |
| 181 | DIAG(TD_OPTIONS, printoption("td: send wont", option)); |
| 182 | } |