summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2013-08-18 01:59:52 -0600
committerEduardo Chappa <chappa@washington.edu>2013-08-18 01:59:52 -0600
commitdd9bd7bac749b3908a406d78ce02fb7a39ef81c8 (patch)
treebcd3c72674a0e59ff76d2aa70451fff87de17ece /web
parentc7f649c87f18773b00b955858992783e4d34e168 (diff)
downloadalpine-dd9bd7bac749b3908a406d78ce02fb7a39ef81c8.tar.xz
* Opening a folder updates recent count in maildrops.
* Fixes to configure script so that it will not require PAM for every system. * Fix to configure script so that it will use CPPFLAGS instead of CPPCFLAGS, and so the --with-ssl-include-dir option take effect during the build. Fix by Ulf-Dietrich Braumann. * Fix in WebAlpine: do not use deprecated dereference in pointer, needs to use tcl_getstringresult() instead. Reported by Ulf-Dietrich Braumann. * Fix in configure script to detect location of tcl library; add /usr/local in FreeBSD and fix a bug in configure script that used $alpine_TCLINC instead of $alpine_TCLINC/tcl.h. Reported and fixed by Werner Scheinast. * Move SSL configurations from UW-IMAP to configure script.
Diffstat (limited to 'web')
-rw-r--r--web/src/Makefile.in4
-rw-r--r--web/src/alpined.d/Makefile.in4
-rw-r--r--web/src/alpined.d/alpined.c14
-rw-r--r--web/src/pubcookie/Makefile.in4
-rw-r--r--web/src/pubcookie/wp_tclsh.c2
5 files changed, 14 insertions, 14 deletions
diff --git a/web/src/Makefile.in b/web/src/Makefile.in
index 7991d64b..fe434471 100644
--- a/web/src/Makefile.in
+++ b/web/src/Makefile.in
@@ -113,6 +113,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
ISPELLPROG = @ISPELLPROG@
+Includedir = @Includedir@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -203,7 +204,6 @@ host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
-includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
@@ -213,7 +213,7 @@ localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
+oldIncludedir = @oldIncludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
diff --git a/web/src/alpined.d/Makefile.in b/web/src/alpined.d/Makefile.in
index ddea2204..4625101d 100644
--- a/web/src/alpined.d/Makefile.in
+++ b/web/src/alpined.d/Makefile.in
@@ -184,6 +184,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
ISPELLPROG = @ISPELLPROG@
+Includedir = @Includedir@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -274,7 +275,6 @@ host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
-includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
@@ -284,7 +284,7 @@ localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
+oldIncludedir = @oldIncludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
diff --git a/web/src/alpined.d/alpined.c b/web/src/alpined.d/alpined.c
index e35ba9e6..2132f95d 100644
--- a/web/src/alpined.d/alpined.c
+++ b/web/src/alpined.d/alpined.c
@@ -334,7 +334,7 @@ char tmp_20k_buf[20480];
/* Internal prototypes */
-void peReturn(int, char *, char *);
+void peReturn(int, char *, const char *);
int peWrite(int, char *);
char *peCreateUserContext(Tcl_Interp *, char *, char *, char *);
void peDestroyUserContext(struct pine **);
@@ -760,10 +760,10 @@ main(int argc, char *argv[])
}
switch(Tcl_Eval(interp, &buf[co])){
- case TCL_OK : peReturn(cs, "OK", interp->result); break;
- case TCL_ERROR : peReturn(cs, "ERROR", interp->result); break;
- case TCL_BREAK : peReturn(cs, "BREAK", interp->result); break;
- case TCL_RETURN : peReturn(cs, "RETURN", interp->result); break;
+ case TCL_OK : peReturn(cs, "OK", Tcl_GetStringResult(interp)); break;
+ case TCL_ERROR : peReturn(cs, "ERROR", Tcl_GetStringResult(interp)); break;
+ case TCL_BREAK : peReturn(cs, "BREAK", Tcl_GetStringResult(interp)); break;
+ case TCL_RETURN : peReturn(cs, "RETURN", Tcl_GetStringResult(interp)); break;
default : peReturn(cs, "BOGUS", "eval returned unexpected value"); break;
}
}
@@ -808,11 +808,11 @@ main(int argc, char *argv[])
* peReturn - common routine to return TCL result
*/
void
-peReturn(int sock, char *status, char *result)
+peReturn(int sock, char *status, const char *result)
{
if(peWrite(sock, status))
if(peWrite(sock, "\n"))
- peWrite(sock, result);
+ peWrite(sock, (char *) result);
}
/*
diff --git a/web/src/pubcookie/Makefile.in b/web/src/pubcookie/Makefile.in
index dc56338e..4cc2524b 100644
--- a/web/src/pubcookie/Makefile.in
+++ b/web/src/pubcookie/Makefile.in
@@ -159,6 +159,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
ISPELLPROG = @ISPELLPROG@
+Includedir = @Includedir@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -249,7 +250,6 @@ host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
-includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
@@ -259,7 +259,7 @@ localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
+oldIncludedir = @oldIncludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
diff --git a/web/src/pubcookie/wp_tclsh.c b/web/src/pubcookie/wp_tclsh.c
index e7fe14a7..de9acac4 100644
--- a/web/src/pubcookie/wp_tclsh.c
+++ b/web/src/pubcookie/wp_tclsh.c
@@ -124,7 +124,7 @@ main(argc, argv)
*
* Results:
* Returns a standard Tcl completion code, and leaves an error
- * message in interp->result if an error occurs.
+ * message in Tcl_GetStringResult(interp) if an error occurs.
*
* Side effects:
* Depends on the startup script.