mturk 2005/06/06 09:15:20
Modified: jni/native Makefile.in configure.in
jni/native/build tcnative.m4
jni/native/src sslutils.c
Log:
Remove all curses/conio dependencies because we can not use them
in service/daemon type of applications.
Revision Changes Path
1.8 +1 -1 jakarta-tomcat-connectors/jni/native/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 6 Jun 2005 14:44:58 -0000 1.7
+++ Makefile.in 6 Jun 2005 16:15:20 -0000 1.8
@@ -9,7 +9,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
-INCLUDES = @CURSES_CFLAGS@ @SSL_CFLAGS@ @TCNATIVE_INCLUDES@
@TCNATIVE_PRIV_INCLUDES@ @APR_INCLUDES@
+INCLUDES = @SSL_CFLAGS@ @TCNATIVE_INCLUDES@ @TCNATIVE_PRIV_INCLUDES@
@APR_INCLUDES@
TCNATIVE_LDFLAGS = @TCNATIVE_LDFLAGS@
TCNATIVE_LIBS = @TCNATIVE_LIBS@
1.4 +0 -5 jakarta-tomcat-connectors/jni/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 6 Jun 2005 09:52:12 -0000 1.3
+++ configure.in 6 Jun 2005 16:15:20 -0000 1.4
@@ -103,11 +103,6 @@
dnl
TCN_CHECK_SSL_TOOLKIT
-dnl
-dnl check curses
-dnl
-TCN_FIND_CURSES
-
so_ext=$APR_SO_EXT
lib_target=$APR_LIB_TARGET
AC_SUBST(so_ext)
1.7 +0 -28 jakarta-tomcat-connectors/jni/native/build/tcnative.m4
Index: tcnative.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/tcnative.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tcnative.m4 6 Jun 2005 09:52:12 -0000 1.6
+++ tcnative.m4 6 Jun 2005 16:15:20 -0000 1.7
@@ -327,31 +327,3 @@
AC_SUBST(SSL_LIBS)
AC_SUBST(SSL_CFLAGS)
])
-
-dnl
-dnl TCN_FIND_CURSES: figure out how to use curses.
-dnl
-AC_DEFUN(
- [TCN_FIND_CURSES],
- [
- AC_MSG_CHECKING([for curses (please wait)])
- AC_ARG_WITH(curses,
- [ --with-curses path to the installed curses library],
- [
- if test "$withval" = "yes"; then
- APR_ADDTO(TCNATIVE_LIBS, [-lcurses])
- APR_ADDTO(CURSES_CFLAGS, [-DHAVE_CURSES])
- elif test "$withval" != "no"; then
- if test ! -d "${withval}"; then
- AC_MSG_ERROR(Not a directory: ${withval})
- fi
- APR_ADDTO(TCNATIVE_LIBS, [-L${withval}/lib -lcurses])
- APR_ADDTO(CURSES_CFLAGS, [-DHAVE_CURSES -I${withval}/include])
- fi
- ],
- [
- AC_MSG_RESULT("no curses")
- ])
-
- AC_SUBST(CURSES_CFLAGS)
- ])
1.15 +2 -34 jakarta-tomcat-connectors/jni/native/src/sslutils.c
Index: sslutils.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslutils.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sslutils.c 6 Jun 2005 09:52:12 -0000 1.14
+++ sslutils.c 6 Jun 2005 16:15:20 -0000 1.15
@@ -31,14 +31,6 @@
#ifdef HAVE_OPENSSL
#include "ssl_private.h"
-#ifdef WIN32
-#include <conio.h> /* getch() */
-#else
-#ifdef HAVE_CURSES
-#include <curses.h> /* getch() */
-#endif
-#endif
-
/* _________________________________________________________________
**
** Additional High-Level Functions for OpenSSL
@@ -108,36 +100,13 @@
return APR_SUCCESS;
}
-#if defined(WIN32) || defined(HAVE_CURSES)
-static void password_prompt(const char *prompt, char *buf, size_t len)
-{
- size_t i;
- int ch;
-
- fputs(prompt, stderr);
- for (i = 0; i < (len - 1); i++) {
- ch = getch();
- if (ch == 0)
- ch = getch();
- if (ch == '\n' || ch == '\r')
- break;
- else if (ch == '\b') {
- i--;
- if (i > 0)
- i--;
- }
- else
- buf[i] = ch;
- }
- buf[i] = '\0';
-}
-#else
static void password_prompt(const char *prompt, char *buf, size_t len)
{
size_t i=0;
int ch;
fprintf(stderr, prompt);
+ fflush(stderr);
for (i = 0; i < (len - 1); i++) {
ch = getchar();
if (ch == EOF)
@@ -154,7 +123,6 @@
}
buf[i] = '\0';
}
-#endif
#define PROMPT_STRING "Enter password: "
/* Simple echo password prompting */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
