Menu
▾
▴
naviserver-commits — Commit notices
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(32) |
Mar
(56) |
Apr
(92) |
May
(39) |
Jun
(226) |
Jul
(98) |
Aug
(66) |
Sep
|
Oct
(153) |
Nov
(43) |
Dec
(42) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(97) |
Feb
(141) |
Mar
(147) |
Apr
(80) |
May
(51) |
Jun
(93) |
Jul
(88) |
Aug
(50) |
Sep
(179) |
Oct
(48) |
Nov
(82) |
Dec
(71) |
| 2007 |
Jan
(42) |
Feb
(46) |
Mar
(123) |
Apr
(21) |
May
(139) |
Jun
(59) |
Jul
(34) |
Aug
(57) |
Sep
(47) |
Oct
(137) |
Nov
(49) |
Dec
(12) |
| 2008 |
Jan
(10) |
Feb
(8) |
Mar
(63) |
Apr
(17) |
May
(34) |
Jun
(38) |
Jul
(16) |
Aug
(62) |
Sep
(9) |
Oct
(121) |
Nov
(38) |
Dec
(4) |
| 2009 |
Jan
|
Feb
(11) |
Mar
(9) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(4) |
Apr
(10) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(1) |
Feb
(1) |
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
(12) |
| 2012 |
Jan
(26) |
Feb
(1) |
Mar
(15) |
Apr
(1) |
May
(1) |
Jun
(7) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
(52) |
Nov
(8) |
Dec
(25) |
| 2013 |
Jan
(35) |
Feb
(14) |
Mar
(10) |
Apr
(10) |
May
(29) |
Jun
(16) |
Jul
(5) |
Aug
(8) |
Sep
(8) |
Oct
(6) |
Nov
(1) |
Dec
(3) |
| 2014 |
Jan
(16) |
Feb
(13) |
Mar
(5) |
Apr
(9) |
May
(21) |
Jun
(6) |
Jul
(5) |
Aug
(2) |
Sep
(59) |
Oct
(115) |
Nov
(122) |
Dec
(45) |
| 2015 |
Jan
(31) |
Feb
(32) |
Mar
(19) |
Apr
(25) |
May
(3) |
Jun
(4) |
Jul
(18) |
Aug
(3) |
Sep
(23) |
Oct
(11) |
Nov
(17) |
Dec
(12) |
| 2016 |
Jan
(20) |
Feb
(27) |
Mar
(20) |
Apr
(40) |
May
(35) |
Jun
(48) |
Jul
(44) |
Aug
(51) |
Sep
(18) |
Oct
(42) |
Nov
(39) |
Dec
(29) |
| 2017 |
Jan
(37) |
Feb
(34) |
Mar
(20) |
Apr
(37) |
May
(10) |
Jun
(2) |
Jul
(14) |
Aug
(15) |
Sep
(25) |
Oct
(29) |
Nov
(15) |
Dec
(29) |
| 2018 |
Jan
(5) |
Feb
(15) |
Mar
(6) |
Apr
(20) |
May
(39) |
Jun
(39) |
Jul
(17) |
Aug
(20) |
Sep
(10) |
Oct
(17) |
Nov
(20) |
Dec
(8) |
| 2019 |
Jan
(28) |
Feb
(21) |
Mar
(13) |
Apr
(44) |
May
(44) |
Jun
(28) |
Jul
(51) |
Aug
(30) |
Sep
(7) |
Oct
(20) |
Nov
(8) |
Dec
(21) |
| 2020 |
Jan
(27) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Vlad S. <ser...@us...> - 2005-05-20 20:54:03
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28491/nsd Modified Files: driver.c Log Message: typo during patching Index: driver.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** driver.c 20 May 2005 20:30:16 -0000 1.5 --- driver.c 20 May 2005 20:53:54 -0000 1.6 *************** *** 435,439 **** while (drvPtr != NULL) { if (drvPtr->bindaddr[0] == '/') { ! drvPtr->opt |= NS_DRIVER_UNIX; } if (drvPtr->opts & NS_DRIVER_UDP) { --- 435,439 ---- while (drvPtr != NULL) { if (drvPtr->bindaddr[0] == '/') { ! drvPtr->opts |= NS_DRIVER_UNIX; } if (drvPtr->opts & NS_DRIVER_UDP) { |
|
From: Vlad S. <ser...@us...> - 2005-05-20 20:30:25
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23242/include Modified Files: ns.h Log Message: added support for UDP and Unix domain sockets for HTTP over udp/unix sockets. Removed obsolete driver functions. Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ns.h 16 May 2005 01:25:01 -0000 1.17 --- ns.h 20 May 2005 20:30:16 -0000 1.18 *************** *** 116,119 **** --- 116,121 ---- #define NS_DRIVER_ASYNC 1 /* Use async read-ahead. */ #define NS_DRIVER_SSL 2 /* Use SSL port, protocol defaults. */ + #define NS_DRIVER_UDP 4 /* UDP socket */ + #define NS_DRIVER_UNIX 8 /* Unix domain socket */ #define NS_DRIVER_VERSION_1 1 |
|
From: Vlad S. <ser...@us...> - 2005-05-20 20:30:25
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23242 Modified Files: ChangeLog Log Message: added support for UDP and Unix domain sockets for HTTP over udp/unix sockets. Removed obsolete driver functions. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** ChangeLog 16 May 2005 06:57:06 -0000 1.78 --- ChangeLog 20 May 2005 20:30:15 -0000 1.79 *************** *** 1,2 **** --- 1,8 ---- + 2005-05-20 Vlad Seryakov <ser...@us...> + + * ns/include.h: + * nsd/driver.c: added support for UDP and Unix domain sockets + for HTTP over udp/unix sockets. Removed obsolete driver functions. + 2005-05-16 Stephen Deasey <sd...@us...> |
|
From: Vlad S. <ser...@us...> - 2005-05-20 20:30:24
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23242/nsd Modified Files: driver.c Log Message: added support for UDP and Unix domain sockets for HTTP over udp/unix sockets. Removed obsolete driver functions. Index: driver.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** driver.c 16 May 2005 00:53:01 -0000 1.4 --- driver.c 20 May 2005 20:30:16 -0000 1.5 *************** *** 410,461 **** *---------------------------------------------------------------------- * - * Ns_RegisterDriver -- - * - * Register a set of communications driver procs (no longer - * supported). - * - * Results: - * NULL. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ - - void * - Ns_RegisterDriver(char *server, char *label, void *procs, void *drvData) - { - Ns_Log(Error, "driver: loadable drivers no longer supported"); - return NULL; - } - - - /* - *---------------------------------------------------------------------- - * - * Ns_GetDriverContext -- - * - * Return the driver's context (no longer supported) - * - * Results: - * NULL. - * - * Side effects: - * None - * - *---------------------------------------------------------------------- - */ - - void * - Ns_GetDriverContext(Ns_Driver drv) - { - return NULL; - } - - - /* - *---------------------------------------------------------------------- - * * NsStartDrivers -- * --- 410,413 ---- *************** *** 482,487 **** drvPtr = firstDrvPtr; while (drvPtr != NULL) { ! drvPtr->sock = Ns_SockListenEx(drvPtr->bindaddr, drvPtr->port, ! drvPtr->backlog); if (drvPtr->sock == INVALID_SOCKET) { Ns_Log(Error, "%s: failed to listen on %s:%d: %s", --- 434,448 ---- drvPtr = firstDrvPtr; while (drvPtr != NULL) { ! if (drvPtr->bindaddr[0] == '/') { ! drvPtr->opt |= NS_DRIVER_UNIX; ! } ! if (drvPtr->opts & NS_DRIVER_UDP) { ! drvPtr->sock = Ns_SockListenUdp(drvPtr->bindaddr, drvPtr->port); ! } else ! if (drvPtr->opts & NS_DRIVER_UNIX) { ! drvPtr->sock = Ns_SockListenUnix(drvPtr->bindaddr); ! } else { ! drvPtr->sock = Ns_SockListenEx(drvPtr->bindaddr, drvPtr->port, drvPtr->backlog); ! } if (drvPtr->sock == INVALID_SOCKET) { Ns_Log(Error, "%s: failed to listen on %s:%d: %s", *************** *** 1225,1230 **** sockPtr->keep = 0; sockPtr->arg = NULL; ! sockPtr->sock = Ns_SockAccept(drvPtr->sock, ! (struct sockaddr *) &sockPtr->sa, &slen); if (sockPtr->sock == INVALID_SOCKET) { /* --- 1186,1194 ---- sockPtr->keep = 0; sockPtr->arg = NULL; ! if (drvPtr->opts & NS_DRIVER_UDP) { ! sockPtr->sock = drvPtr->sock; ! } else { ! sockPtr->sock = Ns_SockAccept(drvPtr->sock, (struct sockaddr *) &sockPtr->sa, &slen); ! } if (sockPtr->sock == INVALID_SOCKET) { /* |
|
From: Stephen D. <sd...@us...> - 2005-05-17 07:27:34
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv521 Modified Files: ChangeLog aclocal.m4 configure configure.in Added Files: tcl.m4 Log Message: Include tc.m4 macros and convert to Tcl TEA build system. Add messages to all autoconf feature tests. Remove unneeded feature tests. Rebuild configure script using autoconf 2.59. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/naviserver/naviserver/aclocal.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** aclocal.m4 16 Feb 2005 08:38:43 -0000 1.1.1.1 --- aclocal.m4 16 May 2005 06:57:06 -0000 1.2 *************** *** 32,41 **** # ! # configure.in -- # ! # AOLserver autoconf include which simply includes Tcl's tcl.m4. # ! builtin(include,../tcl8.4/unix/tcl.m4) --- 32,41 ---- # ! # aclocal.m4 -- # ! # Autoconf include which includes the bundled TEA tcl.m4. # ! builtin(include,tcl.m4) *************** *** 64,69 **** (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_6) AC_MSG_RESULT(yes) ], [ --- 64,69 ---- (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R,1,[Define to 1 if gethostbyname_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_6,1,[Define to 1 if gethostbyname_r takes 6 args.]) AC_MSG_RESULT(yes) ], [ *************** *** 81,86 **** (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_5) AC_MSG_RESULT(yes) ], [ --- 81,86 ---- (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R,1,[Define to 1 if gethostbyname_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_5,1,[Define to 1 if gethostbyname_r takes 5 args.]) AC_MSG_RESULT(yes) ], [ *************** *** 96,101 **** (void) gethostbyname_r(name, he, &data); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_3) AC_MSG_RESULT(yes) ], [ --- 96,101 ---- (void) gethostbyname_r(name, he, &data); ], [ ! AC_DEFINE(HAVE_GETHOSTBYNAME_R,1,[Define to 1 if gethostbyname_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYNAME_R_3,1,[Define to 1 if gethostbyname_r takes 3 args.]) AC_MSG_RESULT(yes) ], [ *************** *** 125,130 **** (void) gethostbyaddr_r(addr, length, type, result, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYADDR_R) ! AC_DEFINE(HAVE_GETHOSTBYADDR_R_7) AC_MSG_RESULT(yes) ], [ --- 125,130 ---- (void) gethostbyaddr_r(addr, length, type, result, buffer, buflen, &h_errnop); ], [ ! AC_DEFINE(HAVE_GETHOSTBYADDR_R,1,[Define to 1 if gethostbyaddr_r is available.]) ! AC_DEFINE(HAVE_GETHOSTBYADDR_R_7,1,[Define to 1 if gethostbyaddr_r takes 7 args.]) AC_MSG_RESULT(yes) ], [ Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** ChangeLog 16 May 2005 01:25:01 -0000 1.77 --- ChangeLog 16 May 2005 06:57:06 -0000 1.78 *************** *** 1,2 **** --- 1,14 ---- + 2005-05-16 Stephen Deasey <sd...@us...> + + * aclocal.m4: + * tcl.m4 + * configure.in: + * configure: + * include/Makefile.global.in: + * include/Makefile.module.in: Include tc.m4 macros and convert to + Tcl TEA build system. Add messages to all autoconf feature + tests. Remove unneeded feature tests. Rebuild configure script using + autoconf 2.59. + 2005-05-15 Stephen Deasey <sd...@us...> --- NEW FILE: tcl.m4 --- # tcl.m4 -- # # This file provides a set of autoconf macros to help TEA-enable # a Tcl extension. # # Copyright (c) 1999-2000 Ajuba Solutions. # Copyright (c) 2002-2005 ActiveState Corporation. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: tcl.m4,v 1.1 2005/05/16 06:57:07 sdeasey Exp $ AC_PREREQ(2.50) #------------------------------------------------------------------------ # TEA_PATH_TCLCONFIG -- # # Locate the tclConfig.sh file and perform a sanity check on [...3788 lines suppressed...] # we need TCLSH_PROG defined to get Windows short pathnames AC_REQUIRE([TEA_PROG_TCLSH]) AC_MSG_CHECKING([short pathname for $1 ($2)]) shortpath= case "$2" in *\ *) # Only do this if we need to. shortpath=`echo "puts [[file attributes {$2} -shortname]] ; exit" | ${TCLSH_PROG} 2>/dev/null` ;; esac if test "x${shortpath}" = "x" ; then AC_MSG_RESULT([not changed]) else $1=$shortpath AC_MSG_RESULT([${$1}]) fi fi ]) Index: configure =================================================================== RCS file: /cvsroot/naviserver/naviserver/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure 16 Feb 2005 15:05:45 -0000 1.2 --- configure 16 May 2005 06:57:06 -0000 1.3 *************** *** 1,34 **** #! /bin/sh ! # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 ! # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ! # Defaults: [...15039 lines suppressed...] ! # config.status does its own redirection, appending to config.log. ! # Unfortunately, on DOS this fails, as config.log is still kept open ! # by configure, so config.status won't be able to write to it; its ! # output is simply discarded. So we exec the FD to /dev/null, ! # effectively closing config.log, so it can be properly (re)opened and ! # appended to by config.status. When coming back to configure, we ! # need to make the FD available again. ! if test "$no_create" != yes; then ! ac_cs_success=: ! ac_config_status_args= ! test "$silent" = yes && ! ac_config_status_args="$ac_config_status_args --quiet" ! exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false ! exec 5>>config.log ! # Use ||, not &&, to avoid exiting from the if with $? = 1, which ! # would make configure fail if this is the last instruction. ! $ac_cs_success || { (exit 1); exit 1; } ! fi Index: configure.in =================================================================== RCS file: /cvsroot/naviserver/naviserver/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in 16 Feb 2005 16:45:43 -0000 1.2 --- configure.in 16 May 2005 06:57:07 -0000 1.3 *************** *** 34,43 **** # configure.in -- # ! # AOLserver configure script. # ! AC_INIT(include/ns.h) ! AC_PREREQ(2.13) ! AC_PREFIX_DEFAULT(/usr/local/aolserver) # --- 34,44 ---- # configure.in -- # ! # NaviServer configure script. # ! AC_INIT(NaviServer, 4.99.0, nav...@li...) ! AC_CONFIG_SRCDIR(include/ns.h) ! AC_PREREQ(2.50) ! AC_REVISION($Revision$) # *************** *** 45,84 **** # ! SC_PATH_TCLCONFIG ! SC_LOAD_TCLCONFIG if test "${TCL_THREADS}" != "1"; then AC_MSG_ERROR([must build tcl with --enable-threads]) fi ! SC_ENABLE_SYMBOLS ! ! AC_SUBST(TCL_LIB_SPEC) ! AC_SUBST(TCL_LIBS) ! AC_SUBST(TCL_INCLUDE_SPEC) ! AC_SUBST(TCL_RANLIB) ! AC_SUBST(TCL_EXEC_PREFIX) ! ! AC_SUBST(TCL_SHLIB_SUFFIX) ! AC_SUBST(TCL_CC_SEARCH_FLAGS) ! AC_SUBST(TCL_LD_SEARCH_FLAGS) ! AC_SUBST(TCL_LD_FLAGS) ! ! AC_SUBST(TCL_CC) ! AC_SUBST(TCL_CFLAGS_DEBUG) ! AC_SUBST(TCL_CFLAGS_OPTIMIZE) ! AC_SUBST(TCL_CFLAGS_WARNING) ! AC_SUBST(TCL_EXTRA_CFLAGS) ! AC_SUBST(TCL_SHLIB_CFLAGS) ! AC_SUBST(TCL_DEFS) ! ! if test "${CC+set}" != "set"; then ! CC=$TCL_CC ! fi ! AC_PROG_CC # ! # TCL_SHLIB_LD from tclConfig.sh is not quite right for aolserver. # ! test "x$prefix" = "xNONE" && prefix="/usr/local/aolserver" system=`uname` case "$system" in --- 46,68 ---- # ! TEA_INIT([3.2]) ! TEA_PATH_TCLCONFIG ! TEA_LOAD_TCLCONFIG ! TEA_ENABLE_THREADS if test "${TCL_THREADS}" != "1"; then AC_MSG_ERROR([must build tcl with --enable-threads]) fi ! TEA_SETUP_COMPILER ! TEA_PUBLIC_TCL_HEADERS ! TEA_ENABLE_SHARED ! TEA_CONFIG_CFLAGS ! TEA_ENABLE_SYMBOLS # ! # Modify SHLIB_LD from tclConfig.sh as we specifically name ! # shared library _init functions. # ! test "x$prefix" = "xNONE" && prefix="/usr/local/ns" system=`uname` case "$system" in *************** *** 92,96 **** ;; *) ! LDLIB="$TCL_SHLIB_LD" case "$LDLIB" in *gcc*) --- 76,80 ---- ;; *) ! LDLIB="$SHLIB_LD" case "$LDLIB" in *gcc*) *************** *** 124,128 **** esac SRCDIR=`cd $srcdir; pwd` ! AOLSERVER=$prefix AC_SUBST(SRCDIR) AC_SUBST(LDLIB) --- 108,112 ---- esac SRCDIR=`cd $srcdir; pwd` ! NAVISERVER=$prefix AC_SUBST(SRCDIR) AC_SUBST(LDLIB) *************** *** 132,147 **** AC_SUBST(CCRPATH) AC_SUBST(LDRPATH) ! AC_SUBST(CCRPATHS) ! AC_SUBST(LDRPATHS) ! AC_SUBST(AOLSERVER) # ! # Additional AOLserver checks. # AC_CHECK_HEADERS(inttypes.h) AC_CHECK_FUNCS(timegm fork1 poll drand48 random _NSGetEnviron) ! AC_CHECK_HEADER(mach-o/dyld.h, AC_DEFINE(USE_DYLD),) ! AC_CHECK_HEADER(dl.h, AC_DEFINE(USE_DLSHL),) AC_MSG_CHECKING([need for dup high]) AC_TRY_RUN([ --- 116,131 ---- AC_SUBST(CCRPATH) AC_SUBST(LDRPATH) ! AC_SUBST(SHLIB_SUFFIX) ! AC_SUBST(TCL_EXEC_PREFIX) ! AC_SUBST(NAVISERVER) # ! # Additional checks. # AC_CHECK_HEADERS(inttypes.h) AC_CHECK_FUNCS(timegm fork1 poll drand48 random _NSGetEnviron) ! AC_CHECK_HEADER(mach-o/dyld.h, AC_DEFINE(USE_DYLD,1,[Define to 1 if the <mach-o/dyld.h> header should be used.]),) ! AC_CHECK_HEADER(dl.h, AC_DEFINE(USE_DLSHL,1,[Define to 1 if the <dl.h> header should be used.]),) AC_MSG_CHECKING([need for dup high]) AC_TRY_RUN([ *************** *** 151,164 **** { return (sizeof(stdout->_file) == 1) ? 0 : 1; ! }], AC_DEFINE(USE_DUPHIGH) as_ok=yes, as_ok=no, as_ok=no) ! AC_MSG_RESULT($as_ok) ! ! AC_MSG_CHECKING([msg_controllen in struct msghdr]) ! AC_TRY_COMPILE([ ! #include <sys/types.h> ! #include <sys/socket.h>], [ ! struct msghdr msg; ! int *i = msg.msg_controllen; ! ], AC_DEFINE(HAVE_CMMSG) as_ok=yes, as_ok=no) AC_MSG_RESULT($as_ok) --- 135,139 ---- { return (sizeof(stdout->_file) == 1) ? 0 : 1; ! }], AC_DEFINE(USE_DUPHIGH,1,[need for dup high]) as_ok=yes, as_ok=no, as_ok=no) AC_MSG_RESULT($as_ok) *************** *** 238,242 **** # ! # Create Makefile.global. # --- 213,217 ---- # ! # Create Makefiles. # |
|
From: Stephen D. <sd...@us...> - 2005-05-17 01:39:24
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv521/include Modified Files: Makefile.global.in Makefile.module.in Log Message: Include tc.m4 macros and convert to Tcl TEA build system. Add messages to all autoconf feature tests. Remove unneeded feature tests. Rebuild configure script using autoconf 2.59. Index: Makefile.global.in =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/Makefile.global.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.global.in 27 Apr 2005 05:30:41 -0000 1.5 --- Makefile.global.in 16 May 2005 06:57:08 -0000 1.6 *************** *** 51,56 **** INSTALL_DATA = $(INSTALL_SH) -m 644 ! RANLIB = @TCL_RANLIB@ ! LIBEXT = @TCL_SHLIB_SUFFIX@ TCL_EXEC_PREFIX = @TCL_EXEC_PREFIX@ LIB_RUNTIME_DIR = --- 51,56 ---- INSTALL_DATA = $(INSTALL_SH) -m 644 ! RANLIB = @RANLIB@ ! LIBEXT = @SHLIB_SUFFIX@ TCL_EXEC_PREFIX = @TCL_EXEC_PREFIX@ LIB_RUNTIME_DIR = *************** *** 61,70 **** CCRPATH += @CCRPATH@ LDRPATH += @LDRPATH@ ! CC = $(PURIFY) @TCL_CC@ ! CFLAGS_DEBUG = @TCL_CFLAGS_DEBUG@ ! CFLAGS_OPTIMIZE = @TCL_CFLAGS_OPTIMIZE@ ! CFLAGS_WARNING = @TCL_CFLAGS_WARNING@ ! CFLAGS_INCLUDE = -I$(INCDIR) @TCL_INCLUDE_SPEC@ ! CFLAGS_EXTRA = @TCL_SHLIB_CFLAGS@ @TCL_EXTRA_CFLAGS@ DEFS = -DNO_CONST @TCL_DEFS@ @DEFS@ CFLAGS += @CFLAGS_DEFAULT@ $(CFLAGS_WARNING) $(CFLAGS_EXTRA) $(CFLAGS_INCLUDE) @CPPFLAGS@ $(DEFS) --- 61,70 ---- CCRPATH += @CCRPATH@ LDRPATH += @LDRPATH@ ! CC = $(PURIFY) @CC@ ! CFLAGS_DEBUG = @CFLAGS_DEBUG@ ! CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ ! CFLAGS_WARNING = @CFLAGS_WARNING@ ! CFLAGS_INCLUDE = -I$(INCDIR) @TCL_INCLUDES@ ! CFLAGS_EXTRA = @SHLIB_CFLAGS@ @TCL_EXTRA_CFLAGS@ DEFS = -DNO_CONST @TCL_DEFS@ @DEFS@ CFLAGS += @CFLAGS_DEFAULT@ $(CFLAGS_WARNING) $(CFLAGS_EXTRA) $(CFLAGS_INCLUDE) @CPPFLAGS@ $(DEFS) *************** *** 87,92 **** endif ! LIBS += @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@ ! CCLIBS = $(LIBS) @TCL_LD_FLAGS@ # Install directories --- 87,92 ---- endif ! NSLIBS += @TCL_LIB_SPEC@ @TCL_LIBS@ @LDFLAGS@ @LIBS@ ! CCLIBS = $(NSLIBS) @TCL_LD_FLAGS@ # Install directories *************** *** 106,112 **** ifneq (,$(findstring SunOS,$(uname))) ifneq (,$(findstring 5.6,$(uname))) ! LIBS += -lthread -lposix4 else ! LIBS += -lrt endif endif --- 106,112 ---- ifneq (,$(findstring SunOS,$(uname))) ifneq (,$(findstring 5.6,$(uname))) ! NSLIBS += -lthread -lposix4 else ! NSLIBS += -lrt endif endif Index: Makefile.module.in =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/Makefile.module.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.module.in 14 May 2005 10:22:31 -0000 1.6 --- Makefile.module.in 16 May 2005 06:57:08 -0000 1.7 *************** *** 130,138 **** $(MOD): $(LIBFILE) $(ALIBFILE) $(MODOBJS) $(RM) $(MOD) ! $(LDSO) $(LDFLAGS) -o $(MOD) $(MODOBJS) $(MODLIBS) $(LIBS) @LDRPATHS@ $(LIBFILE): $(LIBOBJS) $(RM) $(LIBFILE) ! $(LDLIB) $(LDFLAGS) -o $(LIBFILE) $(LIBOBJS) $(LIBLIBS) $(LIBS) @LDRPATHS@ $(ALIBFILE): $(LIBOBJS) --- 130,138 ---- $(MOD): $(LIBFILE) $(ALIBFILE) $(MODOBJS) $(RM) $(MOD) ! $(LDSO) $(LDFLAGS) -o $(MOD) $(MODOBJS) $(MODLIBS) $(NSLIBS) @LDRPATH@ $(LIBFILE): $(LIBOBJS) $(RM) $(LIBFILE) ! $(LDLIB) $(LDFLAGS) -o $(LIBFILE) $(LIBOBJS) $(LIBLIBS) $(NSLIBS) @LDRPATH@ $(ALIBFILE): $(LIBOBJS) *************** *** 142,146 **** $(PGM): $(PGMOBJS) $(LIBFILE) $(ALIBFILE) $(RM) $(PGM) ! $(CC) $(LDFLAGS) -o $(PGM) $(PGMOBJS) $(PGMLIBS) $(CCLIBS) @CCRPATHS@ $(MODOBJS) $(LIBOBJS) $(PGMOBJS): $(HDRS) $(INCDIR)/ns.h $(INCDIR)/nsthread.h --- 142,146 ---- $(PGM): $(PGMOBJS) $(LIBFILE) $(ALIBFILE) $(RM) $(PGM) ! $(CC) $(LDFLAGS) -o $(PGM) $(PGMOBJS) $(PGMLIBS) $(CCLIBS) @CCRPATH@ $(MODOBJS) $(LIBOBJS) $(PGMOBJS): $(HDRS) $(INCDIR)/ns.h $(INCDIR)/nsthread.h |
|
From: Stephen D. <sd...@us...> - 2005-05-16 01:25:26
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894/nsd Modified Files: info.c nsd.h nsmain.c Log Message: Remove redundant Ns_InfoLabel(). Use Ns_InfoTag() instead. Index: info.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/info.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** info.c 16 May 2005 00:53:01 -0000 1.4 --- info.c 16 May 2005 01:25:02 -0000 1.5 *************** *** 439,468 **** *---------------------------------------------------------------------- * - * Ns_InfoLabel -- - * - * Returns version information about this build. - * - * Results: - * A string version name. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ - - char * - Ns_InfoLabel(void) - { - return NSD_LABEL; - } - - - /* - *---------------------------------------------------------------------- - * * Ns_InfoTag -- * ! * Returns CVS tag of this build (can be meaningless). * * Results: --- 439,445 ---- *---------------------------------------------------------------------- * * Ns_InfoTag -- * ! * Returns CVS tag of this build (meaningless without "cvs export"). * * Results: *************** *** 506,510 **** static CONST char *opts[] = { "address", "argv0", "boottime", "builddate", "callbacks", ! "config", "home", "hostname", "label", "locks", "log", "major", "minor", "name", "nsd", "pageroot", "patchlevel", "pid", "platform", "pools", "scheduled", "server", "servers", --- 483,487 ---- static CONST char *opts[] = { "address", "argv0", "boottime", "builddate", "callbacks", ! "config", "home", "hostname", "locks", "log", "major", "minor", "name", "nsd", "pageroot", "patchlevel", "pid", "platform", "pools", "scheduled", "server", "servers", *************** *** 514,518 **** enum { IAddressIdx, IArgv0Idx, IBoottimeIdx, IBuilddateIdx, ICallbacksIdx, ! IConfigIdx, IHomeIdx, hostINameIdx, ILabelIdx, ILocksIdx, ILogIdx, IMajorIdx, IMinorIdx, INameIdx, INsdIdx, IPageRootIdx, IPatchLevelIdx, IPidIdx, IPlatformIdx, IPoolsIdx, IScheduledIdx, IServerIdx, IServersIdx, --- 491,495 ---- enum { IAddressIdx, IArgv0Idx, IBoottimeIdx, IBuilddateIdx, ICallbacksIdx, ! IConfigIdx, IHomeIdx, hostINameIdx, ILocksIdx, ILogIdx, IMajorIdx, IMinorIdx, INameIdx, INsdIdx, IPageRootIdx, IPatchLevelIdx, IPidIdx, IPlatformIdx, IPoolsIdx, IScheduledIdx, IServerIdx, IServersIdx, *************** *** 652,659 **** break; - case ILabelIdx: - Tcl_SetResult(interp, Ns_InfoLabel(), TCL_STATIC); - break; - case IBuilddateIdx: Tcl_SetResult(interp, Ns_InfoBuildDate(), TCL_STATIC); --- 629,632 ---- Index: nsd.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** nsd.h 18 Apr 2005 13:04:14 -0000 1.12 --- nsd.h 16 May 2005 01:25:02 -0000 1.13 *************** *** 115,121 **** #define NSD_NAME "NaviServer" ! #define NSD_VERSION NS_PATCH_LEVEL ! #define NSD_LABEL "naviserver4_0" #define NSD_TAG "$Name$" #define NS_CONFIG_PARAMETERS "ns/parameters" #define NS_CONFIG_THREADS "ns/threads" --- 115,121 ---- #define NSD_NAME "NaviServer" ! #define NSD_VERSION NS_PATCH_LEVEL #define NSD_TAG "$Name$" + #define NS_CONFIG_PARAMETERS "ns/parameters" #define NS_CONFIG_THREADS "ns/threads" Index: nsmain.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** nsmain.c 30 Apr 2005 09:22:42 -0000 1.10 --- nsmain.c 16 May 2005 01:25:02 -0000 1.11 *************** *** 297,301 **** } if (mode == 'V') { ! printf("NaviServer/%s (%s)\n", NSD_VERSION, Ns_InfoLabel()); printf(" CVS Tag: %s\n", Ns_InfoTag()); printf(" Built: %s\n", Ns_InfoBuildDate()); --- 297,301 ---- } if (mode == 'V') { ! printf("NaviServer/%s\n", NSD_VERSION); printf(" CVS Tag: %s\n", Ns_InfoTag()); printf(" Built: %s\n", Ns_InfoBuildDate()); |
|
From: Stephen D. <sd...@us...> - 2005-05-16 01:25:24
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894/include Modified Files: ns.h Log Message: Remove redundant Ns_InfoLabel(). Use Ns_InfoTag() instead. Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ns.h 16 May 2005 01:00:15 -0000 1.16 --- ns.h 16 May 2005 01:25:01 -0000 1.17 *************** *** 913,917 **** NS_EXTERN int Ns_InfoStarted(void); NS_EXTERN int Ns_InfoServersStarted(void); - NS_EXTERN char *Ns_InfoLabel(void); NS_EXTERN char *Ns_InfoTag(void); --- 913,916 ---- |
|
From: Stephen D. <sd...@us...> - 2005-05-16 01:25:24
|
Update of /cvsroot/naviserver/naviserver/nscp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894/nscp Modified Files: nscp.c Log Message: Remove redundant Ns_InfoLabel(). Use Ns_InfoTag() instead. Index: nscp.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nscp/nscp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nscp.c 16 May 2005 00:53:01 -0000 1.2 --- nscp.c 16 May 2005 01:25:01 -0000 1.3 *************** *** 538,545 **** Tcl_DStringAppend(unameDSPtr, user, -1); sprintf(msg, "\nWelcome to %s running at %s (pid %d)\n" ! "%s/%s (%s) for %s built on %s\nCVS Tag: %s\n", sessPtr->modPtr->server, Ns_InfoNameOfExecutable(), Ns_InfoPid(), ! Ns_InfoServerName(), Ns_InfoServerVersion(), Ns_InfoLabel(), Ns_InfoPlatform(), Ns_InfoBuildDate(), Ns_InfoTag()); } else { --- 538,545 ---- Tcl_DStringAppend(unameDSPtr, user, -1); sprintf(msg, "\nWelcome to %s running at %s (pid %d)\n" ! "%s/%s for %s built on %s\nCVS Tag: %s\n", sessPtr->modPtr->server, Ns_InfoNameOfExecutable(), Ns_InfoPid(), ! Ns_InfoServerName(), Ns_InfoServerVersion(), Ns_InfoPlatform(), Ns_InfoBuildDate(), Ns_InfoTag()); } else { |
|
From: Stephen D. <sd...@us...> - 2005-05-16 01:25:10
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894 Modified Files: ChangeLog Log Message: Remove redundant Ns_InfoLabel(). Use Ns_InfoTag() instead. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** ChangeLog 16 May 2005 01:00:15 -0000 1.76 --- ChangeLog 16 May 2005 01:25:01 -0000 1.77 *************** *** 1,4 **** --- 1,10 ---- 2005-05-15 Stephen Deasey <sd...@us...> + * include/ns.h: + * nsd/nsd.h: + * nsd/info.c: + * nsd/nsmain.c: + * nscp/nscp.c: Remove redundant Ns_InfoLabel(). Use Ns_InfoTag() instead. + * include/ns.h: Bump version to 4.99.0 alpha. |
|
From: Stephen D. <sd...@us...> - 2005-05-16 01:00:37
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12686/include Modified Files: ns.h Log Message: Bump version to 4.99.0 alpha. Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ns.h 16 May 2005 00:53:00 -0000 1.15 --- ns.h 16 May 2005 01:00:15 -0000 1.16 *************** *** 31,36 **** * ns.h -- * ! * All the public types and function declarations for the core ! * AOLserver. * * $Header$ --- 31,35 ---- * ns.h -- * ! * All the public types and function declarations for the core server. * * $Header$ *************** *** 40,55 **** #define NS_H ! #define NS_MAJOR_VERSION 4 ! #define NS_MINOR_VERSION 0 ! #define NS_RELEASE_SERIAL 10 #define NS_VERSION_NUM (NS_MAJOR_VERSION * 10000 \ + NS_MINOR_VERSION * 100 \ + NS_RELEASE_SERIAL) ! #define NS_VERSION "4.0" ! #define NS_PATCH_LEVEL "4.0.10" ! #define NS_ALPHA_RELEASE 0 ! #define NS_BETA_RELEASE 1 ! #define NS_FINAL_RELEASE 2 /* --- 39,54 ---- #define NS_H ! #define NS_MAJOR_VERSION 4 ! #define NS_MINOR_VERSION 99 ! #define NS_RELEASE_SERIAL 0 #define NS_VERSION_NUM (NS_MAJOR_VERSION * 10000 \ + NS_MINOR_VERSION * 100 \ + NS_RELEASE_SERIAL) ! #define NS_VERSION "4.99" ! #define NS_PATCH_LEVEL "4.99.0" ! #define NS_ALPHA_RELEASE 0 ! #define NS_BETA_RELEASE 1 ! #define NS_FINAL_RELEASE 2 /* *************** *** 58,62 **** */ ! #define NS_RELEASE_LEVEL NS_FINAL_RELEASE #include "nsthread.h" --- 57,61 ---- */ ! #define NS_RELEASE_LEVEL NS_ALPHA_RELEASE #include "nsthread.h" |
|
From: Stephen D. <sd...@us...> - 2005-05-16 01:00:36
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12686 Modified Files: ChangeLog Log Message: Bump version to 4.99.0 alpha. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** ChangeLog 16 May 2005 00:53:00 -0000 1.75 --- ChangeLog 16 May 2005 01:00:15 -0000 1.76 *************** *** 1,4 **** --- 1,6 ---- 2005-05-15 Stephen Deasey <sd...@us...> + * include/ns.h: Bump version to 4.99.0 alpha. + * include/ns.h: * nscp/nscp.c: |
|
From: Stephen D. <sd...@us...> - 2005-05-16 00:53:13
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11783/include Modified Files: ns.h Log Message: Silence some compiler warnings. Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ns.h 12 Apr 2005 06:21:22 -0000 1.14 --- ns.h 16 May 2005 00:53:00 -0000 1.15 *************** *** 1131,1136 **** */ ! NS_EXTERN int Ns_SockRecv(SOCKET sock, void *vbuf, int nrecv, int timeout); ! NS_EXTERN int Ns_SockSend(SOCKET sock, void *vbuf, int nsend, int timeout); NS_EXTERN int Ns_SockWait(SOCKET sock, int what, int timeout); --- 1131,1136 ---- */ ! NS_EXTERN int Ns_SockRecv(SOCKET sock, void *vbuf, size_t nrecv, int timeout); ! NS_EXTERN int Ns_SockSend(SOCKET sock, void *vbuf, size_t nsend, int timeout); NS_EXTERN int Ns_SockWait(SOCKET sock, int what, int timeout); |
|
From: Stephen D. <sd...@us...> - 2005-05-16 00:53:13
|
Update of /cvsroot/naviserver/naviserver/nsthread In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11783/nsthread Modified Files: nsthreadtest.c Log Message: Silence some compiler warnings. Index: nsthreadtest.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/nsthreadtest.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nsthreadtest.c 16 Feb 2005 08:41:10 -0000 1.1.1.1 --- nsthreadtest.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 51,54 **** --- 51,57 ---- static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; + + extern void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); + /* * Collection of synchronization objects for tests. |
|
From: Stephen D. <sd...@us...> - 2005-05-16 00:53:13
|
Update of /cvsroot/naviserver/naviserver/nscp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11783/nscp Modified Files: nscp.c Log Message: Silence some compiler warnings. Index: nscp.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nscp/nscp.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nscp.c 16 Feb 2005 08:40:49 -0000 1.1.1.1 --- nscp.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 302,306 **** Tcl_DString unameDS; char buf[64], *res; ! int n, len, ncmd, stop; Sess *sessPtr = arg; char *server = sessPtr->modPtr->server; --- 302,307 ---- Tcl_DString unameDS; char buf[64], *res; ! int n, ncmd, stop; ! unsigned int len; Sess *sessPtr = arg; char *server = sessPtr->modPtr->server; *************** *** 425,429 **** } n = strlen(prompt); ! if (send(sock, prompt, n, 0) != n) { result = 0; goto bail; --- 426,430 ---- } n = strlen(prompt); ! if (send(sock, prompt, (unsigned int) n, 0) != n) { result = 0; goto bail; *************** *** 546,550 **** sprintf(msg, "Access denied!\n"); } ! (void) send(sessPtr->sock, msg, (int)strlen(msg), 0); Tcl_DStringFree(&uds); Tcl_DStringFree(&pds); --- 547,551 ---- sprintf(msg, "Access denied!\n"); } ! (void) send(sessPtr->sock, msg, strlen(msg), 0); Tcl_DStringFree(&uds); Tcl_DStringFree(&pds); |
|
From: Stephen D. <sd...@us...> - 2005-05-16 00:53:12
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11783 Modified Files: ChangeLog Log Message: Silence some compiler warnings. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** ChangeLog 15 May 2005 07:47:20 -0000 1.74 --- ChangeLog 16 May 2005 00:53:00 -0000 1.75 *************** *** 1,4 **** --- 1,19 ---- 2005-05-15 Stephen Deasey <sd...@us...> + * include/ns.h: + * nscp/nscp.c: + * nsd/adpeval.c: + * nsd/conn.c: + * nsd/driver.c: + * nsd/info.c: + * nsd/init.tcl: + * nsd/sock.c: + * nsd/tclinit.c: + * nsd/tcljob.c: + * nsd/tclmisc.c: + * nsd/tclset.c: + * nsd/urlopen.c: + * nsthread/nsthreadtest.c: Silence some compiler warnings. + * nsd/tcljob.c: * nsd/tclobjv.c: |
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11783/nsd Modified Files: adpeval.c conn.c driver.c info.c sock.c tclinit.c tcljob.c tclmisc.c tclset.c urlopen.c Log Message: Silence some compiler warnings. Index: tclmisc.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tclmisc.c 4 May 2005 12:43:43 -0000 1.5 --- tclmisc.c 16 May 2005 00:53:01 -0000 1.6 *************** *** 367,371 **** } string = Tcl_GetStringFromObj(objv[1], &nbytes); ! result = ns_malloc(1 + (4 * nbytes) / 2); Ns_HtuuEncode((unsigned char *) string, (size_t)nbytes, result); Tcl_SetResult(interp, result, (Tcl_FreeProc *) ns_free); --- 367,371 ---- } string = Tcl_GetStringFromObj(objv[1], &nbytes); ! result = ns_malloc((size_t) 1 + (4 * nbytes) / 2); Ns_HtuuEncode((unsigned char *) string, (size_t)nbytes, result); Tcl_SetResult(interp, result, (Tcl_FreeProc *) ns_free); *************** *** 1065,1069 **** str = Tcl_GetStringFromObj(objv[1],&strLen); SHAInit(&ctx); ! SHAUpdate(&ctx, str, strLen); SHAFinal(digest, &ctx); --- 1065,1069 ---- str = Tcl_GetStringFromObj(objv[1],&strLen); SHAInit(&ctx); ! SHAUpdate(&ctx, str, (unsigned int) strLen); SHAFinal(digest, &ctx); Index: tclinit.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclinit.c 3 Apr 2005 06:38:01 -0000 1.3 --- tclinit.c 16 May 2005 00:53:01 -0000 1.4 *************** *** 922,926 **** int length, result; int status; - Tcl_Obj *objPtr; if (objc < 2) { --- 922,925 ---- *************** *** 1054,1058 **** NULL ); } - Tcl_DecrRefCount(objPtr); result = TCL_ERROR; } else { --- 1053,1056 ---- Index: conn.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** conn.c 18 Apr 2005 16:02:25 -0000 1.12 --- conn.c 16 May 2005 00:53:01 -0000 1.13 *************** *** 912,917 **** { NsInterp *itPtr = arg; ! Ns_Conn *conn; ! Conn *connPtr; Ns_Set *form; Ns_Request *request; --- 912,917 ---- { NsInterp *itPtr = arg; ! Ns_Conn *conn = itPtr->conn; ! Conn *connPtr = (Conn *) conn; Ns_Set *form; Ns_Request *request; *************** *** 956,960 **** result = Tcl_GetObjResult(interp); - connPtr = (Conn *) conn = itPtr->conn; /* --- 956,959 ---- Index: sock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/sock.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sock.c 16 Feb 2005 08:40:13 -0000 1.1.1.1 --- sock.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 68,72 **** int ! Ns_SockRecv(SOCKET sock, void *buf, int toread, int timeout) { int nread; --- 68,72 ---- int ! Ns_SockRecv(SOCKET sock, void *buf, size_t toread, int timeout) { int nread; *************** *** 100,104 **** int ! Ns_SockSend(SOCKET sock, void *buf, int towrite, int timeout) { int nwrote; --- 100,104 ---- int ! Ns_SockSend(SOCKET sock, void *buf, size_t towrite, int timeout) { int nwrote; Index: tcljob.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tcljob.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcljob.c 15 May 2005 07:47:21 -0000 1.2 --- tcljob.c 16 May 2005 00:53:01 -0000 1.3 *************** *** 987,991 **** Ns_Time currentTime; Ns_GetTime(¤tTime); ! snprintf(buf, 100, "queue_id_%x_%x", tp.nextQueueId++, currentTime.sec); Tcl_SetResult(interp, buf, TCL_VOLATILE); } --- 987,992 ---- Ns_Time currentTime; Ns_GetTime(¤tTime); ! snprintf(buf, 100, "queue_id_%lx_%lx", ! tp.nextQueueId++, (unsigned long) currentTime.sec); Tcl_SetResult(interp, buf, TCL_VOLATILE); } Index: info.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/info.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** info.c 12 Apr 2005 06:21:23 -0000 1.3 --- info.c 16 May 2005 00:53:01 -0000 1.4 *************** *** 38,42 **** --- 38,49 ---- #include "nsd.h" + + extern void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); extern char *nsBuildDate; + + /* + * Static variables defined in this file. + */ + static Ns_ThreadArgProc ThreadArgProc; Index: urlopen.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/urlopen.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** urlopen.c 16 Feb 2005 08:39:36 -0000 1.1.1.1 --- urlopen.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 122,126 **** Stream stream; Ns_Request *request; ! int status, tosend, n; status = NS_ERROR; --- 122,127 ---- Stream stream; Ns_Request *request; ! int status, n; ! unsigned int tosend; status = NS_ERROR; Index: tclset.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclset.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclset.c 16 Feb 2005 08:40:35 -0000 1.1.1.1 --- tclset.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 58,62 **** static int NoServer(Tcl_Interp *interp); - static int BadArgs(Tcl_Interp *interp, char **argv, char *args); static int LookupSet(NsInterp *itPtr, char *id, int delete, Ns_Set **setPtr); static int LookupObjSet(NsInterp *itPtr, Tcl_Obj *idPtr, int delete, --- 58,61 ---- *************** *** 780,809 **** } - - /* - *---------------------------------------------------------------------- - * - * BadArgs -- - * - * Complain that the wrong # args were recieved. - * - * Results: - * TCL result. - * - * Side effects: - * Error message appended to interp result. - * - *---------------------------------------------------------------------- - */ - - static int - BadArgs(Tcl_Interp *interp, char **argv, char *args) - { - Tcl_AppendResult(interp, "wrong # of args: should be \"", - argv[0], " ", argv[1], " ", args, "\"", NULL); - - return TCL_ERROR; - } - static int NoServer(Tcl_Interp *interp) --- 779,782 ---- Index: adpeval.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/adpeval.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** adpeval.c 16 Feb 2005 08:40:24 -0000 1.1.1.1 --- adpeval.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 544,550 **** keyPtr = (FileKey *) Tcl_GetHashKey(&servPtr->adp.pages, hPtr); Tcl_AppendElement(interp, pagePtr->file); ! sprintf(buf, "dev %ld ino %ld mtime %ld refcnt %d evals %d size %ld blocks %d scripts %d", ! keyPtr->dev, keyPtr->ino, pagePtr->mtime, pagePtr->refcnt, ! pagePtr->evals, pagePtr->size, pagePtr->code.nblocks, pagePtr->code.nscripts); Tcl_AppendElement(interp, buf); --- 544,550 ---- keyPtr = (FileKey *) Tcl_GetHashKey(&servPtr->adp.pages, hPtr); Tcl_AppendElement(interp, pagePtr->file); ! sprintf(buf, "dev %ld ino %ld mtime %lu refcnt %d evals %d size %ld blocks %d scripts %d", ! (long) keyPtr->dev, (long) keyPtr->ino, (unsigned long) pagePtr->mtime, pagePtr->refcnt, ! pagePtr->evals, (long) pagePtr->size, pagePtr->code.nblocks, pagePtr->code.nscripts); Tcl_AppendElement(interp, buf); Index: driver.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** driver.c 3 Apr 2005 06:38:01 -0000 1.3 --- driver.c 16 May 2005 00:53:01 -0000 1.4 *************** *** 1089,1093 **** ServerMap *mapPtr = NULL; Tcl_HashEntry *hPtr; ! char *host; int status = 1; --- 1089,1093 ---- ServerMap *mapPtr = NULL; Tcl_HashEntry *hPtr; ! char *host = NULL; int status = 1; *************** *** 1321,1325 **** } ! (*sockPtr->drvPtr->proc)(DriverClose, sockPtr, NULL, 0); --nactive; --- 1321,1325 ---- } ! (*sockPtr->drvPtr->proc)(DriverClose, (Ns_Sock *) sockPtr, NULL, 0); --nactive; |
|
From: Stephen D. <sd...@us...> - 2005-05-15 07:47:31
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15088/nsd Modified Files: tcljob.c tclobjv.c tclxkeylist.c unix.c Log Message: Hide global symbols which shouldn't be exported. Index: unix.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/unix.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** unix.c 4 May 2005 12:34:58 -0000 1.5 --- unix.c 15 May 2005 07:47:21 -0000 1.6 *************** *** 41,81 **** #include <grp.h> - static Ns_Mutex lock; - static int debugMode; - /* ! *---------------------------------------------------------------------- ! * ! * FatalSignalHandler -- ! * ! * Ensure that we drop core on fatal signals like SIGBUS and ! * SIGSEGV. ! * ! * Results: ! * None. ! * ! * Side effects: ! * A core file will be left wherever the server was running. ! * ! *---------------------------------------------------------------------- */ ! void ! FatalSignalHandler(int signal) ! { ! #ifdef __linux ! /* ! * LinuxThreads thread manager needs to kill all child threads ! * on fatal signals, else they get left behind as dead threads. ! * As of glibc 2.3 with NPTL, this should be a no-op. ! */ ! pthread_kill_other_threads_np(); ! #endif - Ns_Log(Fatal, "received fatal signal %d", signal); - abort(); - } --- 41,59 ---- #include <grp.h> /* ! * Static functions defined in this file. */ ! static int Pipe(int *fds, int sockpair); ! static void FatalSignalHandler(int signal); ! /* ! * Static variables defined in this file. ! */ ! ! static Ns_Mutex lock; ! static int debugMode; *************** *** 259,262 **** --- 237,252 ---- */ + int + ns_sockpair(int *socks) + { + return Pipe(socks, 1); + } + + int + ns_pipe(int *fds) + { + return Pipe(fds, 0); + } + static int Pipe(int *fds, int sockpair) *************** *** 270,291 **** } if (!err) { ! fcntl(fds[0], F_SETFD, 1); ! fcntl(fds[1], F_SETFD, 1); } return err; } - int - ns_sockpair(int *socks) - { - return Pipe(socks, 1); - } - - int - ns_pipe(int *fds) - { - return Pipe(fds, 0); - } - /* --- 260,269 ---- } if (!err) { ! fcntl(fds[0], F_SETFD, 1); ! fcntl(fds[1], F_SETFD, 1); } return err; } /* *************** *** 552,555 **** --- 530,567 ---- return rc; } + #endif + + /* + *---------------------------------------------------------------------- + * + * FatalSignalHandler -- + * + * Ensure that we drop core on fatal signals like SIGBUS and + * SIGSEGV. + * + * Results: + * None. + * + * Side effects: + * A core file will be left wherever the server was running. + * + *---------------------------------------------------------------------- + */ + + static void + FatalSignalHandler(int signal) + { + #ifdef __linux + /* + * LinuxThreads thread manager needs to kill all child threads + * on fatal signals, else they get left behind as dead threads. + * As of glibc 2.3 with NPTL, this should be a no-op. + */ + + pthread_kill_other_threads_np(); #endif + + Ns_Log(Fatal, "received fatal signal %d", signal); + abort(); + } Index: tclxkeylist.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclxkeylist.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tclxkeylist.c 6 Mar 2005 18:37:07 -0000 1.2 --- tclxkeylist.c 15 May 2005 07:47:21 -0000 1.3 *************** *** 67,71 **** * Used to return argument messages by most commands. */ ! char *tclXWrongArgs = "wrong # args: "; /* --- 67,71 ---- * Used to return argument messages by most commands. */ ! static char *tclXWrongArgs = "wrong # args: "; /* Index: tclobjv.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclobjv.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tclobjv.c 9 Apr 2005 14:43:09 -0000 1.6 --- tclobjv.c 15 May 2005 07:47:21 -0000 1.7 *************** *** 47,52 **** static Tcl_SetFromAnyProc SetSpecFromAny; ! Ns_ObjvProc ObjvTcl; ! Ns_ObjvProc ObjvTclArgs; static void FreeSpecs(Ns_ObjvSpec *optSpec); --- 47,52 ---- static Tcl_SetFromAnyProc SetSpecFromAny; ! static Ns_ObjvProc ObjvTcl; ! static Ns_ObjvProc ObjvTclArgs; static void FreeSpecs(Ns_ObjvSpec *optSpec); *************** *** 855,859 **** */ ! int ObjvTcl(Ns_ObjvSpec *spec, Tcl_Interp *interp, int *objcPtr, Tcl_Obj *CONST objv[]) { --- 855,859 ---- */ ! static int ObjvTcl(Ns_ObjvSpec *spec, Tcl_Interp *interp, int *objcPtr, Tcl_Obj *CONST objv[]) { *************** *** 888,892 **** */ ! int ObjvTclArgs(Ns_ObjvSpec *spec, Tcl_Interp *interp, int *objcPtr, Tcl_Obj *CONST objv[]) { --- 888,892 ---- */ ! static int ObjvTclArgs(Ns_ObjvSpec *spec, Tcl_Interp *interp, int *objcPtr, Tcl_Obj *CONST objv[]) { Index: tcljob.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tcljob.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tcljob.c 16 Feb 2005 08:40:34 -0000 1.1.1.1 --- tcljob.c 15 May 2005 07:47:21 -0000 1.2 *************** *** 183,191 **** static Job* getNextJob(void); ! Queue* NewQueue(CONST char* queueName, CONST char* queueDesc, int maxThreads); ! void FreeQueue(Queue *queuePtr); ! Job* NewJob(CONST char* server, CONST char* queueName, int type, Tcl_Obj *script); ! void FreeJob(Job *jobPtr); static int LookupQueue(Tcl_Interp *interp, --- 183,191 ---- static Job* getNextJob(void); ! static Queue* NewQueue(CONST char* queueName, CONST char* queueDesc, int maxThreads); ! static void FreeQueue(Queue *queuePtr); ! static Job* NewJob(CONST char* server, CONST char* queueName, int type, Tcl_Obj *script); ! static void FreeJob(Job *jobPtr); static int LookupQueue(Tcl_Interp *interp, *************** *** 1233,1237 **** */ ! Queue* NewQueue(CONST char* queueName, CONST char* queueDesc, int maxThreads) { --- 1233,1237 ---- */ ! static Queue* NewQueue(CONST char* queueName, CONST char* queueDesc, int maxThreads) { *************** *** 1275,1279 **** */ ! void FreeQueue(Queue *queuePtr) { --- 1275,1279 ---- */ ! static void FreeQueue(Queue *queuePtr) { *************** *** 1302,1306 **** */ ! Job* NewJob(CONST char* server, CONST char* queueId, int type, Tcl_Obj *script) { --- 1302,1306 ---- */ ! static Job* NewJob(CONST char* server, CONST char* queueId, int type, Tcl_Obj *script) { *************** *** 1344,1348 **** */ ! void FreeJob(Job *jobPtr) { --- 1344,1348 ---- */ ! static void FreeJob(Job *jobPtr) { |
|
From: Stephen D. <sd...@us...> - 2005-05-15 07:47:31
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15088 Modified Files: ChangeLog Log Message: Hide global symbols which shouldn't be exported. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** ChangeLog 15 May 2005 07:45:38 -0000 1.73 --- ChangeLog 15 May 2005 07:47:20 -0000 1.74 *************** *** 1,4 **** --- 1,9 ---- 2005-05-15 Stephen Deasey <sd...@us...> + * nsd/tcljob.c: + * nsd/tclobjv.c: + * nsd/tclxkeylist.c: + * nsd/unix.c: Hide global symbols which shouldn't be exported. + * Makefile: Add new "checkexports" target which prints out a list of global symbols which shouldn't be. |
|
From: Stephen D. <sd...@us...> - 2005-05-15 07:45:47
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14797 Modified Files: ChangeLog Makefile Log Message: Add new "checkexports" target which prints out a list of global symbols which shouldn't be. Index: Makefile =================================================================== RCS file: /cvsroot/naviserver/naviserver/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 27 Apr 2005 05:30:40 -0000 1.6 --- Makefile 15 May 2005 07:45:38 -0000 1.7 *************** *** 76,79 **** --- 76,84 ---- rm gdb.run + checkexports: all + @for i in $(dirs); do \ + nm -p $$i/*.so | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | uniq | grep -v '^[Nn]s\|^TclX\|^_'; \ + done + clean: @for i in $(dirs); do \ Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** ChangeLog 14 May 2005 10:28:41 -0000 1.72 --- ChangeLog 15 May 2005 07:45:38 -0000 1.73 *************** *** 1,2 **** --- 1,7 ---- + 2005-05-15 Stephen Deasey <sd...@us...> + + * Makefile: Add new "checkexports" target which prints out a list + of global symbols which shouldn't be. + 2005-05-14 Stephen Deasey <sd...@us...> |
|
From: Stephen D. <sd...@us...> - 2005-05-14 10:29:19
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30905 Modified Files: ChangeLog Log Message: Move nsdb module's Tcl file into module directory and add to module shared Tcl install target. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** ChangeLog 14 May 2005 10:24:18 -0000 1.71 --- ChangeLog 14 May 2005 10:28:41 -0000 1.72 *************** *** 1,7 **** 2005-05-14 Stephen Deasey <sd...@us...> * nsperm/Makefile: Use new TCL variable to install shared Tcl files. ! * include/Makefile.module.in: Add new MODNAME and TCL Makefile variables which modules can use to specify a list of shared tcl --- 1,12 ---- 2005-05-14 Stephen Deasey <sd...@us...> + * tcl/nsdb.tcl: + * nsdb/util.tcl: + * nsdb/Makefile: Move nsdb module's Tcl file into module directory + and add to module shared Tcl install target. + * nsperm/Makefile: Use new TCL variable to install shared Tcl files. ! * include/Makefile.module.in: Add new MODNAME and TCL Makefile variables which modules can use to specify a list of shared tcl |
|
From: Stephen D. <sd...@us...> - 2005-05-14 10:28:51
|
Update of /cvsroot/naviserver/naviserver/nsdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30905/nsdb Modified Files: Makefile Added Files: util.tcl Log Message: Move nsdb module's Tcl file into module directory and add to module shared Tcl install target. --- NEW FILE: util.tcl --- # # The contents of this file are subject to the Mozilla Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://www.mozilla.org/. # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. # # The Original Code is AOLserver Code and related documentation # distributed by AOL. # # The Initial Developer of the Original Code is America Online, # Inc. Portions created by AOL are Copyright (C) 1999 America Online, # Inc. All Rights Reserved. # # Alternatively, the contents of this file may be used under the terms # of the GNU General Public License (the "GPL"), in which case the # provisions of GPL are applicable instead of those above. If you wish # to allow use of your version of this file only under the terms of the # GPL and not to allow others to use your version of this file under the # License, indicate your decision by deleting the provisions above and # replace them with the notice and other provisions required by the GPL. # If you do not delete the provisions above, a recipient may use your # version of this file under either the License or the GPL. # # # $Header: /cvsroot/naviserver/naviserver/nsdb/util.tcl,v 1.1 2005/05/14 10:28:41 sdeasey Exp $ # # # nsdb.tcl -- # # Database services utils. # nsv_set _nsdb months [list January February March April May June \ July August September October November December] # # ns_dbquotename - # # If name contains a space, then it is surrounded by double quotes. # This is useful for names in SQL statements that may contain spaces. # proc ns_dbquotename {name} { if {[string match "* *" $name]} { return "\"$name\"" } else { return $name } } # # ns_dbquotevalue - # # Prepares a value string for inclusion in an SQL statement: # "" is translated into NULL. # All values of any numeric type are left alone. # All other values are surrounded by single quotes and any # single quotes included in the value are escaped (ie. translated # into 2 single quotes). proc ns_dbquotevalue {value {type text}} { if {[string match "" $value]} { return "NULL" } if {$type == "decimal" \ || $type == "double" \ || $type == "integer" \ || $type == "int" \ || $type == "real" \ || $type == "smallint" \ || $type == "bigint" \ || $type == "bit" \ || $type == "float" \ || $type == "numeric" \ || $type == "tinyint"} { return $value } regsub -all "'" $value "''" value return "'$value'" } # # ns_localsqltimestamp - # # Return an SQL string for the current time. # proc ns_localsqltimestamp {} { set time [ns_localtime] return [format "%04d-%02d-%02d %02d:%02d:%02d" \ [expr {[ns_parsetime year $time] + 1900}] \ [expr {[ns_parsetime mon $time] + 1}] \ [ns_parsetime mday $time] \ [ns_parsetime hour $time] \ [ns_parsetime min $time] \ [ns_parsetime sec $time]] } # # ns_parsesqldate - # # Parse and SQL date string fro month, day, or year. # proc ns_parsesqldate {opt sqldate} { scan $sqldate "%04d-%02d-%02d" year month day switch $opt { month {return [lindex [nsv_get _nsdb months] [expr {$month - 1}]]} day {return $day} year {return $year} default {error "Unknown option \"$opt\": should be year, month or day"} } } # # ns_parsesqltime - # # Parse and SQL timestamp string for time or ampm spec. # proc ns_parsesqltime {opt sqltime} { if {[scan $sqltime "%02d:%02d:%02d" hours minutes seconds] == 2} { set seconds 0 } switch $opt { time { if {$hours == 0} { set hours 12 } elseif {$hours > 12} { set hours [incr hours -12] } if {$seconds == 0} { return [format "%d:%02d" $hours $minutes] } else { return [format "%d:%02d:%02d" $hours $minutes $seconds] } } ampm { if {$hours < 12} { return AM } else { return PM } } default {error "Unknown command \"$opt\": should be time or ampm"} } } # # ns_parsesqltimestamp -- # # Parse and SQL timestamp string for month, day, year, time, # or ampm spec. # proc ns_parsesqltimestamp {opt sqltimestamp} { switch $opt { month - day - year {return [ns_parsesqldate $opt [lindex [split $sqltimestamp " "] 0]]} time - ampm {return [ns_parsesqltime $opt [lindex [split $sqltimestamp " "] 1]]} default {error "Unknown command \"$opt\": should be month, day, year, time or ampm"} } } # # ns_buildsqltime - # # Create an SQL timestamp. # proc ns_buildsqltime {time ampm} { if {[string match "" $time] && [string match "" $ampm]} { return "" } if {[string match "" $time] || [string match "" $ampm]} { error "Invalid time: $time $ampm" } set seconds 0 set num [scan $time "%d:%d:%d" hours minutes seconds] if {$num < 2 || $num > 3 \ || $hours < 1 || $hours > 12 \ || $minutes < 0 || $minutes > 59 \ || $seconds < 0 || $seconds > 61} { error "Invalid time: $time $ampm" } if {$ampm == "AM"} { if {$hours == 12} { set hours 0 } } elseif {$ampm == "PM"} { if {$hours != 12} { incr hours 12 } } else { error "Invalid time: $time $ampm" } return [format "%02d:%02d:%02d" $hours $minutes $seconds] } # # ns_buildsqldate - # # Create and SQL date string. # proc ns_buildsqldate {month day year} { if {[string match "" $month] \ && [string match "" $day] \ && [string match "" $year]} { return "" } if {![ns_issmallint $month]} { set month [expr {[lsearch [nsv_get _nsdb months] $month] + 1}] } if {[string match "" $month] \ || [string match "" $day] \ || [string match "" $year] \ || $month < 1 || $month > 12 \ || $day < 1 || $day > 31 \ || $year < 1\ || ($month == 2 && $day > 29)\ || (($year % 4) != 0 && $month == 2 && $day > 28) \ || ($month == 4 && $day > 30)\ || ($month == 6 && $day > 30)\ || ($month == 9 && $day > 30)\ || ($month == 11 && $day > 30) } { error "Invalid date: $month $day $year" } return [format "%04d-%02d-%02d" $year $month $day] } # # ns_buildsqltimestamp - # # Create and SQL timestamp string. # proc ns_buildsqltimestamp {month day year time ampm} { set date [ns_buildsqldate $month $day $year] set time [ns_buildsqltime $time $ampm] if {[string match "" $date] || [string match "" $time]} { return "" } return "$date $time" } # # ns_writecsv - # # Write an SQL table to an open file in csv format. # proc ns_writecsv {datafp db table {header 1}} { set row [ns_db select $db "select * from [ns_dbquotename $table]"] set rowsize [ns_set size $row] if {$header} { regsub -all "\"" [ns_set key $row 0] "\"\"" value puts -nonewline $datafp "\"$value\"" for {set i 1} {$i < $rowsize} {incr i} { regsub -all "\"" [ns_set key $row $i] "\"\"" value puts -nonewline $datafp ",\"$value\"" } puts -nonewline $datafp "\r\n" } while {[ns_db getrow $db $row]} { regsub -all \" [ns_set value $row 0] "\"\"" value puts -nonewline $datafp "\"$value\"" for {set i 1} {$i < $rowsize} {incr i} { regsub -all \" [ns_set value $row $i] "\"\"" value puts -nonewline $datafp ",\"$value\"" } puts -nonewline $datafp "\r\n" } } Index: Makefile =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsdb/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 27 Apr 2005 06:18:34 -0000 1.2 --- Makefile 14 May 2005 10:28:41 -0000 1.3 *************** *** 30,38 **** # $Header$ ! LIB = nsdb ! LIBOBJS = dbinit.o dbdrv.o dbtcl.o dbutil.o LIBHDRS = nsdb.h ! MOD = nsdb.so ! OBJS = nsdb.o ! HDRS = db.h include ../include/Makefile.build --- 30,41 ---- # $Header$ ! MODNAME = nsdb ! LIB = nsdb ! LIBOBJS = dbinit.o dbdrv.o dbtcl.o dbutil.o LIBHDRS = nsdb.h ! MOD = nsdb.so ! OBJS = nsdb.o ! HDRS = db.h ! TCL = util.tcl ! include ../include/Makefile.build |
|
From: Stephen D. <sd...@us...> - 2005-05-14 10:28:49
|
Update of /cvsroot/naviserver/naviserver/tcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30905/tcl Removed Files: nsdb.tcl Log Message: Move nsdb module's Tcl file into module directory and add to module shared Tcl install target. --- nsdb.tcl DELETED --- |
|
From: Stephen D. <sd...@us...> - 2005-05-14 10:24:30
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30377 Modified Files: ChangeLog Log Message: Use new TCL variable to install shared Tcl files. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** ChangeLog 14 May 2005 10:22:31 -0000 1.70 --- ChangeLog 14 May 2005 10:24:18 -0000 1.71 *************** *** 1,4 **** --- 1,7 ---- 2005-05-14 Stephen Deasey <sd...@us...> + * nsperm/Makefile: Use new TCL variable to install shared Tcl + files. + * include/Makefile.module.in: Add new MODNAME and TCL Makefile variables which modules can use to specify a list of shared tcl |
|
From: Stephen D. <sd...@us...> - 2005-05-14 10:24:30
|
Update of /cvsroot/naviserver/naviserver/nsperm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30377/nsperm Modified Files: Makefile Log Message: Use new TCL variable to install shared Tcl files. Index: Makefile =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsperm/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 16 Feb 2005 08:41:07 -0000 1.1.1.1 --- Makefile 14 May 2005 10:24:18 -0000 1.2 *************** *** 31,48 **** # MOD = nsperm.so OBJS = nsperm.o MODINST = cpfiles include ../include/Makefile.build ! moddir = nsperm ! moddat = $(INSTSRVMOD)/$(moddir) ! modtcl = $(INSTTCL)/$(moddir) cpfiles: - $(MKDIR) $(modtcl) - $(INSTALL_DATA) init.tcl $(modtcl)/ - $(INSTALL_DATA) compat.tcl $(modtcl)/ $(MKDIR) $(moddat) for f in passwd group hosts.allow hosts.deny perms; do \ --- 31,45 ---- # + MODNAME = nsperm MOD = nsperm.so OBJS = nsperm.o + TCL = init.tcl compat.tcl MODINST = cpfiles include ../include/Makefile.build ! moddat = $(INSTSRVMOD)/$(MODNAME) cpfiles: $(MKDIR) $(moddat) for f in passwd group hosts.allow hosts.deny perms; do \ |
