* fix multiple compiler warnings...

diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c
index 3aef4d2428b6c9a76168179dc11d80a03faf583f..16a76b2413bc0be0f0d9fceadaf0aedd16115cbf 100644 (file)
--- a/webcit/bbsview_renderer.c
+++ b/webcit/bbsview_renderer.c
@@ -55,13 +55,15 @@ long bbsview_get_last_seen(void)
        serv_puts("GTSN");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
+               char *colon_pos;
+               char *comma_pos;
 
-               char *comma_pos = strchr(buf, ',');     /* kill first comma and everything to its right */
+               comma_pos = strchr(buf, ',');   /* kill first comma and everything to its right */
                if (comma_pos) {
                        *comma_pos = 0;
                }
 
-               char *colon_pos = strchr(buf, ':');     /* kill first colon and everything to its left */
+               colon_pos = strchr(buf, ':');   /* kill first colon and everything to its left */
                if (colon_pos) {
                        strcpy(buf, ++colon_pos);
                }
@@ -281,13 +283,15 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
                }
 
                else if ( (seq == 0) || (seq == 2) ) {
+                       int first;
+                       int last;
                        /* Display the selecto-bar with the page numbers */
 
                        wc_printf("<div class=\"moreprompt\">");
                        wc_printf(_("Go to page: "));
 
-                       int first = 0;
-                       int last = BBS->num_pages - 1;
+                       first = 0;
+                       last = BBS->num_pages - 1;
 
                        for (i=0; i<=last; ++i) {
 

diff --git a/webcit/config.guess b/webcit/config.guess
index e3a2116a7dcd3d282cd95263d96fcbc6f5f42c7d..c2246a4f7f4c78281ccfc4238a54cf7d83c4f421 100755 (executable)
--- a/webcit/config.guess
+++ b/webcit/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-06-10'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+       echo i386-pc-auroraux${UNAME_RELEASE}
+       exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
        eval $set_cc_for_build
        SUN_ARCH="i386"
@@ -807,12 +811,12 @@ EOF
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
        case ${UNAME_MACHINE} in
            x86)
                echo i586-pc-interix${UNAME_RELEASE}
                exit ;;
-           EM64T | authenticamd | genuineintel)
+           authenticamd | genuineintel | EM64T)
                echo x86_64-unknown-interix${UNAME_RELEASE}
                exit ;;
            IA64)
@@ -854,6 +858,20 @@ EOF
     i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
        exit ;;
+    alpha:Linux:*:*)
+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+         EV5)   UNAME_MACHINE=alphaev5 ;;
+         EV56)  UNAME_MACHINE=alphaev56 ;;
+         PCA56) UNAME_MACHINE=alphapca56 ;;
+         PCA57) UNAME_MACHINE=alphapca56 ;;
+         EV6)   UNAME_MACHINE=alphaev6 ;;
+         EV67)  UNAME_MACHINE=alphaev67 ;;
+         EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+       objdump --private-headers /bin/sh | grep -q ld.so.1
+       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+       exit ;;
     arm*:Linux:*:*)
        eval $set_cc_for_build
        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +894,17 @@ EOF
     frv:Linux:*:*)
        echo frv-unknown-linux-gnu
        exit ;;
+    i*86:Linux:*:*)
+       LIBC=gnu
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+       exit ;;
     ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
@@ -901,39 +930,18 @@ EOF
        #endif
        #endif
 EOF
-       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-           /^CPU/{
-               s: ::g
-               p
-           }'`"
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     or32:Linux:*:*)
        echo or32-unknown-linux-gnu
        exit ;;
-    ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
-       exit ;;
-    ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
-       exit ;;
-    alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-         EV5)   UNAME_MACHINE=alphaev5 ;;
-         EV56)  UNAME_MACHINE=alphaev56 ;;
-         PCA56) UNAME_MACHINE=alphapca56 ;;
-         PCA57) UNAME_MACHINE=alphapca56 ;;
-         EV6)   UNAME_MACHINE=alphaev6 ;;
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-       objdump --private-headers /bin/sh | grep -q ld.so.1
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit ;;
     padre:Linux:*:*)
        echo sparc-unknown-linux-gnu
        exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+       echo hppa64-unknown-linux-gnu
+       exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +950,11 @@ EOF
          *)    echo hppa-unknown-linux-gnu ;;
        esac
        exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+       echo powerpc64-unknown-linux-gnu
+       exit ;;
+    ppc:Linux:*:*)
+       echo powerpc-unknown-linux-gnu
        exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +977,6 @@ EOF
     xtensa*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
-    i*86:Linux:*:*)
-       # The BFD linker knows what the default object file format is, so
-       # first see if it will tell us. cd to the root directory to prevent
-       # problems with other programs or directories called `ld' in the path.
-       # Set LC_ALL=C to ensure ld outputs messages in English.
-       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-                        | sed -ne '/supported targets:/!d
-                                   s/[         ][      ]*/ /g
-                                   s/.*supported targets: *//
-                                   s/ .*//
-                                   p'`
-        case "$ld_supported_targets" in
-         elf32-i386)
-               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-               ;;
-       esac
-       # Determine whether the default compiler is a.out or elf
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <features.h>
-       #ifdef __ELF__
-       # ifdef __GLIBC__
-       #  if __GLIBC__ >= 2
-       LIBC=gnu
-       #  else
-       LIBC=gnulibc1
-       #  endif
-       # else
-       LIBC=gnulibc1
-       # endif
-       #else
-       #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-       LIBC=gnu
-       #else
-       LIBC=gnuaout
-       #endif
-       #endif
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-           /^LIBC/{
-               s: ::g
-               p
-           }'`"
-       test x"${LIBC}" != x && {
-               echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-               exit
-       }
-       test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-       ;;
     i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
        # earlier versions are messed up and put the nodename in both
@@ -1247,6 +1206,16 @@ EOF
     *:Darwin:*:*)
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
        case $UNAME_PROCESSOR in
+           i386)
+               eval $set_cc_for_build
+               if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                     grep IS_64BIT_ARCH >/dev/null
+                 then
+                     UNAME_PROCESSOR="x86_64"
+                 fi
+               fi ;;
            unknown) UNAME_PROCESSOR=powerpc ;;
        esac
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

diff --git a/webcit/config.sub b/webcit/config.sub
index eb0389a693f35eb868f6b979d4ec781feda41d99..c2d125724c0ed2d2c6da5308c54567649554e5f3 100755 (executable)
--- a/webcit/config.sub
+++ b/webcit/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-11'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2009-06-11'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +153,7 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis | -knuth | -cray)
+       -apple | -axis | -knuth | -cray | -microblaze)
                os=
                basic_machine=$1
                ;;
@@ -284,6 +288,7 @@ case $basic_machine in
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
+       | rx \
        | score \
        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
        | sh64 | sh64le \
@@ -291,13 +296,14 @@ case $basic_machine in
        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
        | spu | strongarm \
        | tahoe | thumb | tic4x | tic80 | tron \
+       | ubicom32 \
        | v850 | v850e \
        | we32k \
        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
        | z8k | z80)
                basic_machine=$basic_machine-unknown
                ;;
-       m6811 | m68hc11 | m6812 | m68hc12)
+       m6811 | m68hc11 | m6812 | m68hc12 | picochip)
                # Motorola 68HC11/12.
                basic_machine=$basic_machine-unknown
                os=-none
@@ -340,7 +346,7 @@ case $basic_machine in
        | lm32-* \
        | m32c-* | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
@@ -368,15 +374,17 @@ case $basic_machine in
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
-       | romp-* | rs6000-* \
+       | romp-* | rs6000-* | rx-* \
        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
        | sparclite-* \
        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
        | tahoe-* | thumb-* \
-       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+       | tile-* | tilegx-* \
        | tron-* \
+       | ubicom32-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -726,6 +734,9 @@ case $basic_machine in
                basic_machine=ns32k-utek
                os=-sysv
                ;;
+        microblaze)
+               basic_machine=microblaze-xilinx
+               ;;
        mingw32)
                basic_machine=i386-pc
                os=-mingw32
@@ -1076,6 +1087,11 @@ case $basic_machine in
                basic_machine=tic6x-unknown
                os=-coff
                ;;
+        # This must be matched before tile*.
+        tilegx*)
+               basic_machine=tilegx-unknown
+               os=-linux-gnu
+               ;;
        tile*)
                basic_machine=tile-unknown
                os=-linux-gnu
@@ -1247,6 +1263,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
        # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+               os=-auroraux
+               ;;
        -solaris1 | -solaris1.*)
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
                ;;
@@ -1268,8 +1287,8 @@ case $os in
        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-             | -kopensolaris* \
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+             | -sym* | -kopensolaris* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
              | -aos* | -aros* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1290,7 +1309,7 @@ case $os in
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1423,6 +1442,8 @@ case $os in
        -dicos*)
                os=-dicos
                ;;
+        -nacl*)
+               ;;
        -none)
                ;;
        *)

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 3d60c556673efa8fc755a4306a1611ad8139f000..f8a9966d0c48140a8df58684b7d92f4027379018 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -179,7 +179,7 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
                                TheSession = sptr;
                        }
                        if (TheSession == NULL)
-                               syslog(1, "found sessionkey [%ld], but credentials for [%s|%s] didn't match\n",
+                               syslog(1, "found sessionkey [%d], but credentials for [%s|%s] didn't match\n",
                                        Hdr->HR.SessionKey,ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username));
                        break;
                case AUTH_COOKIE:
@@ -195,8 +195,8 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
        }
        CtdlLogResult(pthread_mutex_unlock(ListMutex));
        if (TheSession == NULL)
-               syslog(1, "didn't find sessionkey [%ld] for user [%s]\n",
-                       Hdr->HR.SessionKey,ChrPtr(Hdr->c_username));
+               syslog(1, "didn't find sessionkey [%d] for user [%s]\n",
+                       Hdr->HR.SessionKey, ChrPtr(Hdr->c_username));
        return TheSession;
 }
 

diff --git a/webcit/crypto.c b/webcit/crypto.c
index 9dd62118e32006be4dfefd6dc9d95d4bab6f61e8..2e8b3aac1c5c5200ea49df0d481bc7e2c47f9374 100644 (file)
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -421,7 +421,7 @@ int starttls(int sock) {
                errval = SSL_get_error(newssl, retval);
                ssl_error_reason = ERR_reason_error_string(ERR_get_error());
                if (ssl_error_reason == NULL) {
-                       syslog(3, "SSL_accept failed: errval=%i, retval=%i %s\n", errval, retval, strerror(errval));
+                       syslog(3, "SSL_accept failed: errval=%ld, retval=%d %s\n", errval, retval, strerror(errval));
                }
                else {
                        syslog(3, "SSL_accept failed: %s\n", ssl_error_reason);
@@ -436,7 +436,7 @@ int starttls(int sock) {
                errval = SSL_get_error(newssl, retval);
                ssl_error_reason = ERR_reason_error_string(ERR_get_error());
                if (ssl_error_reason == NULL) {
-                       syslog(3, "SSL_accept failed: errval=%i, retval=%i (%s)\n", errval, retval, strerror(errval));
+                       syslog(3, "SSL_accept failed: errval=%ld, retval=%d (%s)\n", errval, retval, strerror(errval));
                }
                else {
                        syslog(3, "SSL_accept failed: %s\n", ssl_error_reason);

diff --git a/webcit/event.c b/webcit/event.c
index 5d44e3f80b9d27e64be02cbc9cc01dd7a85514a6..1d73540775ab6b42faa4ff502b1d7af3dcbc75a7 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -1153,8 +1153,10 @@ STARTOVER:       for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                        serv_getln(buf, sizeof buf);
                        if (buf[0] == '8') {
                                serv_puts("Content-type: text/calendar");
+                               serv_puts("Content-Transfer-Encoding: quoted-printable");
                                serv_puts("");
-                               serv_puts(icalcomponent_as_ical_string(encaps));
+                               text_to_server_qp(icalcomponent_as_ical_string(encaps));
+//                             serv_puts(icalcomponent_as_ical_string(encaps));
                                serv_puts("000");
                        }
                        if ( (buf[0] == '8') || (buf[0] == '4') ) {

diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c
index 17ca57907298936493478f4af60c145227a296bb..f0bd712e427f4269a6aca7618a613b07e8823b18 100644 (file)
--- a/webcit/groupdav_put.c
+++ b/webcit/groupdav_put.c
@@ -124,7 +124,7 @@ void groupdav_put(void)
         * version, so we fail...
         */
        if (StrLength(WCC->Hdr->HR.dav_ifmatch) > 0) {
-               syslog(9, "dav_ifmatch: %s\n", WCC->Hdr->HR.dav_ifmatch);
+               syslog(9, "dav_ifmatch: %s\n", ChrPtr(WCC->Hdr->HR.dav_ifmatch));
                old_msgnum = locate_message_by_uid(ChrPtr(dav_uid));
                syslog(9, "old_msgnum:  %ld\n", old_msgnum);
                if (StrTol(WCC->Hdr->HR.dav_ifmatch) != old_msgnum) {

diff --git a/webcit/html2html.c b/webcit/html2html.c
index c2a0bf64826ef82af48ec729f317cfc71d84d879..7281eb64026fd5eecd6b98738688533a79603d0f 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -414,7 +414,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
                        if (!tag_end) {
                                syslog(9, "tag_end is null and ptr is:\n");
                                syslog(9, "%s\n", ptr);
-                               syslog(9, "Theoretical bytes remaining: %d\n", msgend - ptr);
+                               syslog(9, "Theoretical bytes remaining: %ld\n", msgend - ptr);
                        }
 
                        src=strstr(ptr, "src=\"cid:");

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index 912aa6f0be33b8a546e372a2f6695e803fa17a90..c3c8490af75b8381db8a01823a5937b7688cd9c9 100644 (file)
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -61,7 +61,7 @@ void ParseURLParams(StrBuf *url)
                        u->url_data = NewStrBufPlain(aptr, len);
                        StrBufUnescape(u->url_data, 1);
 #ifdef DEBUG_URLSTRINGS
-                       syslog(9, "%s = [%ld]  %s\n", 
+                       syslog(9, "%s = [%d]  %s\n", 
                                u->url_key, 
                                StrLength(u->url_data), 
                                ChrPtr(u->url_data)); 
@@ -71,7 +71,7 @@ void ParseURLParams(StrBuf *url)
                        len = bptr - aptr;
                        u->url_data = NewStrBufPlain(aptr, len);
                        StrBufUnescape(u->url_data, 1);
-                       syslog(1, "REJECTED because of __ is internal only: %s = [%ld]  %s\n", 
+                       syslog(1, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
                                u->url_key, 
                                StrLength(u->url_data), 
                                ChrPtr(u->url_data)); 
@@ -325,7 +325,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                        Put(WCC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
                }
                else {
-                       syslog(1, "REJECTED because of __ is internal only: %s = [%ld]  %s\n", 
+                       syslog(1, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
                                u->url_key, 
                                StrLength(u->url_data), 
                                ChrPtr(u->url_data)); 
@@ -333,7 +333,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                        free_url(u);
                }
 #ifdef DEBUG_URLSTRINGS
-               syslog(9, "Key: <%s> len: [%ld] Data: <%s>\n", 
+               syslog(9, "Key: <%s> len: [%d] Data: <%s>\n", 
                        u->url_key, 
                        StrLength(u->url_data), 
                        ChrPtr(u->url_data));

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 02b9102b5872c9b4a8ef7baa21b016f4fbc57150..9ed1f830cb7ce2e72371b3a462bf896d5c2629fb 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -108,7 +108,7 @@ void GetPrefTypes(HashList *List)
                        Pref->Type = PrefType;
                        Pref->eFlatPrefType = Pref->Type->eType;
 
-                       syslog(1, "Loading [%s]with type [%ld] [\"%s\"]\n",
+                       syslog(1, "Loading [%s]with type [%d] [\"%s\"]\n",
                                ChrPtr(Pref->Key),
                                Pref->Type->eType,
                                ChrPtr(Pref->Val));
@@ -537,7 +537,7 @@ void set_preference_backend(const char *key, size_t keylen,
                Pref->Type = PrefType;
                Pref->eFlatPrefType = PrefType->eType;
                if (Pref->Type->eType != lPrefType)
-                       syslog(1, "warning: saving preference with wrong type [%s] %ld != %ld \n",
+                       syslog(1, "warning: saving preference with wrong type [%s] %d != %ld \n",
                                key, Pref->Type->eType, lPrefType);
                switch (Pref->Type->eType)
                {

diff --git a/webcit/roomviews.c b/webcit/roomviews.c
index af93ae98b3564767be572b87da0faa6ad95137e3..c1f23fa1adc7060d4a448812d28a3365e4a3472d 100644 (file)
--- a/webcit/roomviews.c
+++ b/webcit/roomviews.c
@@ -93,7 +93,7 @@ int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
 {
        folder *Folder = (folder *)CTX;
 
-       syslog(0, "-> %s: %ld\n", ChrPtr(Folder->name), Folder->view);
+       syslog(0, "-> %s: %d\n", ChrPtr(Folder->name), Folder->view);
 
        return ((Folder->view == VIEW_CALENDAR) || 
                (Folder->view == VIEW_TASKS) || 

diff --git a/webcit/sitemap.c b/webcit/sitemap.c
index fd94266beb64116bc293b4c641c6a8014fad25e4..715c7245ffbe2484a5d9967b07105b6d0448f99d 100644 (file)
--- a/webcit/sitemap.c
+++ b/webcit/sitemap.c
@@ -97,6 +97,11 @@ void sitemap_do_wiki(void) {
  * Entry point for RSS feed generator
  */
 void sitemap(void) {
+       HashList *roomlist;
+       HashPos *it;
+       long HKlen;
+       const char *HashKey;
+       folder *room;
 
        output_headers(0, 0, 0, 0, 1, 0);
        hprintf("Content-type: text/xml\r\n");
@@ -111,11 +116,8 @@ void sitemap(void) {
        wc_printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
        wc_printf("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\r\n");
 
-       HashList *roomlist = GetRoomListHashLKRA(NULL, NULL);
-       HashPos *it = GetNewHashPos(roomlist, 0);
-       long HKlen;
-       const char *HashKey;
-       folder *room;
+       roomlist = GetRoomListHashLKRA(NULL, NULL);
+       it = GetNewHashPos(roomlist, 0);
 
        while (GetNextHashPos(roomlist, it, &HKlen, &HashKey, (void *)&room))
        {

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index f03e003016df5b1fe935d3f07a0c8ff014a65b8a..27fc0a92adb3b861d90f90503013b968e260285d 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -226,7 +226,7 @@ int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize)
        }
 #ifdef SERV_TRACE
         else
-                syslog(9, "%3d<<<BLOB: %ld bytes\n", WC->serv_sock, StrLength(buf));
+                syslog(9, "%3d<<<BLOB: %d bytes\n", WC->serv_sock, StrLength(buf));
 #endif
 
        return rc;
@@ -251,7 +251,7 @@ int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize)
        }
 #ifdef SERV_TRACE
         else
-                syslog(9, "%3d<<<BLOB: %ld bytes\n", WC->serv_sock, StrLength(buf));
+                syslog(9, "%3d<<<BLOB: %d bytes\n", WC->serv_sock, StrLength(buf));
 #endif
 
        return rc;
@@ -275,7 +275,7 @@ void FlushReadBuf (void)
                pche = pch + len;
                if (WCC->ReadPos != pche)
                {
-                       syslog(1, "ERROR: somebody didn't eat his soup! Remaing Chars: %d [%s]\n", 
+                       syslog(1, "ERROR: somebody didn't eat his soup! Remaing Chars: %ld [%s]\n", 
                                pche - WCC->ReadPos, pche);
                        syslog(1, 
                                "--------------------------------------------------------------------------------\n"

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 12a2ba71c210ac5d23eb8f5c926a61078f319a3c..6e3aef7ac746f95347b9f340f0903145a781149e 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -109,9 +109,11 @@ void load_redirs(char *filename) {
        }
 
        while (fgets(buf, sizeof buf, fp) != NULL) {
+               char *ch;
+
                buf[strlen(buf)-1] = 0;
 
-               char *ch = strchr(buf, '#');
+               ch = strchr(buf, '#');
                if (ch) strcpy(ch, "");
                striplt(buf);
                if (!IsEmptyStr(buf)) {