[naviserver-commits] naviserver/nsd tclcmds.c,1.16,1.17

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27085/nsd

Modified Files:
	tclcmds.c 
Log Message:
Alphabetize list of Tcl commands.


Index: tclcmds.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclcmds.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tclcmds.c	27 Jun 2005 17:46:56 -0000	1.16
--- tclcmds.c	7 Jul 2005 01:29:02 -0000	1.17
***************
*** 43,71 ****
  
  extern Tcl_ObjCmdProc
      NsTclAdpAppendObjCmd,
!     NsTclAdpPutsObjCmd,
      NsTclAdpEvalObjCmd,
!     NsTclAdpSafeEvalObjCmd,
      NsTclAdpIncludeObjCmd,
      NsTclAdpParseObjCmd,
!     NsTclAdpDirObjCmd,
      NsTclAdpReturnObjCmd,
!     NsTclAdpBreakObjCmd,
!     NsTclAdpAbortObjCmd,
      NsTclAdpTellObjCmd,
      NsTclAdpTruncObjCmd,
-     NsTclAdpDumpObjCmd,
-     NsTclAdpArgcObjCmd,
-     NsTclAdpArgvObjCmd,
-     NsTclAdpBindArgsObjCmd,
-     NsTclAdpExceptionObjCmd,
-     NsTclAdpStreamObjCmd,
-     NsTclAdpMimeTypeObjCmd,
-     NsTclAdpCompressObjCmd,
      NsTclAfterObjCmd,
      NsTclAtExitObjCmd,
-     NsTclAtStartupObjCmd,
      NsTclAtShutdownObjCmd,
      NsTclAtSignalObjCmd,
      NsTclCancelObjCmd,
      NsTclChanObjCmd,
--- 43,71 ----
  
  extern Tcl_ObjCmdProc
+     NsTclAdpAbortObjCmd,
      NsTclAdpAppendObjCmd,
!     NsTclAdpArgcObjCmd,
!     NsTclAdpArgvObjCmd,
!     NsTclAdpBindArgsObjCmd,
!     NsTclAdpBreakObjCmd,
!     NsTclAdpCompressObjCmd,
!     NsTclAdpDirObjCmd,
!     NsTclAdpDumpObjCmd,
      NsTclAdpEvalObjCmd,
!     NsTclAdpExceptionObjCmd,
      NsTclAdpIncludeObjCmd,
+     NsTclAdpMimeTypeObjCmd,
      NsTclAdpParseObjCmd,
!     NsTclAdpPutsObjCmd,
      NsTclAdpReturnObjCmd,
!     NsTclAdpSafeEvalObjCmd,
!     NsTclAdpStreamObjCmd,
      NsTclAdpTellObjCmd,
      NsTclAdpTruncObjCmd,
      NsTclAfterObjCmd,
      NsTclAtExitObjCmd,
      NsTclAtShutdownObjCmd,
      NsTclAtSignalObjCmd,
+     NsTclAtStartupObjCmd,
      NsTclCancelObjCmd,
      NsTclChanObjCmd,
***************
*** 76,84 ****
      NsTclCpFpObjCmd,
      NsTclCpObjCmd,
-     NsTclCryptObjCmd,
      NsTclCritSecObjCmd,
      NsTclDeleteCookieObjCmd,
      NsTclDummyObjCmd,
-     NsTclICtlObjCmd,
      NsTclFTruncateObjCmd,
      NsTclGetAddrObjCmd,
--- 76,83 ----
      NsTclCpFpObjCmd,
      NsTclCpObjCmd,
      NsTclCritSecObjCmd,
+     NsTclCryptObjCmd,
      NsTclDeleteCookieObjCmd,
      NsTclDummyObjCmd,
      NsTclFTruncateObjCmd,
      NsTclGetAddrObjCmd,
***************
*** 89,98 ****
      NsTclGmTimeObjCmd,
      NsTclGuessTypeObjCmd,
-     NsTclHashPathObjCmd,
      NsTclHTUUDecodeObjCmd,
      NsTclHTUUEncodeObjCmd,
      NsTclHeadersObjCmd,
      NsTclHttpObjCmd,
      NsTclHttpTimeObjCmd,
      NsTclInfoObjCmd,
      NsTclJobObjCmd,
--- 88,98 ----
      NsTclGmTimeObjCmd,
      NsTclGuessTypeObjCmd,
      NsTclHTUUDecodeObjCmd,
      NsTclHTUUEncodeObjCmd,
+     NsTclHashPathObjCmd,
      NsTclHeadersObjCmd,
      NsTclHttpObjCmd,
      NsTclHttpTimeObjCmd,
+     NsTclICtlObjCmd,
      NsTclInfoObjCmd,
      NsTclJobObjCmd,
***************
*** 102,107 ****
      NsTclLocalTimeObjCmd,
      NsTclLocationProcObjCmd,
-     NsTclLogObjCmd,
      NsTclLogCtlObjCmd,
      NsTclLogRollObjCmd,
      NsTclMarkForDeleteObjCmd,
--- 102,107 ----
      NsTclLocalTimeObjCmd,
      NsTclLocationProcObjCmd,
      NsTclLogCtlObjCmd,
+     NsTclLogObjCmd,
      NsTclLogRollObjCmd,
      NsTclMarkForDeleteObjCmd,
***************
*** 125,128 ****
--- 125,129 ----
      NsTclPauseObjCmd,
      NsTclPurgeFilesObjCmd,
+     NsTclRWLockObjCmd,
      NsTclRandObjCmd,
      NsTclRegisterAdpObjCmd,
***************
*** 146,152 ****
      NsTclRmdirObjCmd,
      NsTclRollFileObjCmd,
!     NsTclRWLockObjCmd,
!     NsTclSchedObjCmd,
      NsTclSchedDailyObjCmd,
      NsTclSchedWeeklyObjCmd,
      NsTclSelectObjCmd,
--- 147,153 ----
      NsTclRmdirObjCmd,
      NsTclRollFileObjCmd,
!     NsTclSHA1ObjCmd,
      NsTclSchedDailyObjCmd,
+     NsTclSchedObjCmd,
      NsTclSchedWeeklyObjCmd,
      NsTclSelectObjCmd,
***************
*** 184,194 ****
      NsTclWriteContentObjCmd,
      NsTclWriteFpObjCmd,
!     NsTclWriteObjCmd,
!     NsTclSHA1ObjCmd;
  
  extern Tcl_CmdProc
      NsTclAdpDebugCmd,
      NsTclAdpRegisterAdpCmd,
-     NsTclAdpRegisterAdpCmd,
      NsTclAdpRegisterProcCmd,
      NsTclAdpStatsCmd,
--- 185,193 ----
      NsTclWriteContentObjCmd,
      NsTclWriteFpObjCmd,
!     NsTclWriteObjCmd;
  
  extern Tcl_CmdProc
      NsTclAdpDebugCmd,
      NsTclAdpRegisterAdpCmd,
      NsTclAdpRegisterProcCmd,
      NsTclAdpStatsCmd,
***************
*** 205,209 ****
      NsTclEncodingForCharsetCmd,
      NsTclEnvCmd,
-     NsTclEnvCmd,
      NsTclHrefsCmd,
      NsTclLibraryCmd,
--- 204,207 ----
***************
*** 237,437 ****
  
  static Cmd cmds[] = {
      {"ns_crypt", NULL, NsTclCryptObjCmd},
!     {"ns_sleep", NULL, NsTclSleepObjCmd},
!     {"ns_localtime", NULL, NsTclLocalTimeObjCmd},
!     {"ns_gmtime", NULL, NsTclGmTimeObjCmd},
!     {"ns_time", NULL, NsTclTimeObjCmd},
      {"ns_fmttime", NULL, NsTclStrftimeObjCmd},
      {"ns_httptime", NULL, NsTclHttpTimeObjCmd},
-     {"ns_parsehttptime", NULL, NsTclParseHttpTimeObjCmd},
-     {"ns_parsequery", NULL, NsTclParseQueryObjCmd},
- 
-     {"ns_rand", NULL, NsTclRandObjCmd},
- 
      {"ns_info", NULL, NsTclInfoObjCmd},
! 
!     {"ns_hashpath", NULL, NsTclHashPathObjCmd},
!     {"ns_modulepath", NULL, NsTclModulePathObjCmd},
!     {"ns_pagepath", NULL, NsTclPagePathObjCmd},
!     {"ns_serverpath", NULL, NsTclServerPathObjCmd},
! 
!     {"ns_serverrootproc", NULL, NsTclServerRootProcObjCmd},
      {"ns_locationproc", NULL, NsTclLocationProcObjCmd},
- 
-     /*
-      * log.c
-      */
- 
      {"ns_log", NULL, NsTclLogObjCmd},
      {"ns_logctl", NULL, NsTclLogCtlObjCmd},
      {"ns_logroll", NULL, NsTclLogRollObjCmd},
! 
!     {"ns_urlencode", NULL, NsTclUrlEncodeObjCmd},
!     {"ns_urldecode", NULL, NsTclUrlDecodeObjCmd},
!     {"ns_uuencode", NULL, NsTclHTUUEncodeObjCmd},
!     {"ns_uudecode", NULL, NsTclHTUUDecodeObjCmd},
!     {"ns_base64encode", NULL, NsTclHTUUEncodeObjCmd},
!     {"ns_base64decode", NULL, NsTclHTUUDecodeObjCmd},
!     {"ns_gifsize", NULL, NsTclGifSizeObjCmd},
!     {"ns_jpegsize", NULL, NsTclJpegSizeObjCmd},
!     {"ns_guesstype", NULL, NsTclGuessTypeObjCmd},
! 
!     /*
!      * tclmisc.c
!      */
! 
!     {"ns_sha1", NULL, NsTclSHA1ObjCmd},
!     {"ns_striphtml", NsTclStripHtmlCmd, NULL},
!     {"ns_quotehtml", NsTclQuoteHtmlCmd, NULL},
!     {"ns_hrefs", NsTclHrefsCmd, NULL},
! 
!     /*
!      * tclcallbacks.c
!      */
! 
!     {"ns_atsignal", NULL, NsTclAtSignalObjCmd},
!     {"ns_atstartup", NULL, NsTclAtStartupObjCmd},
!     {"ns_atshutdown", NULL, NsTclAtShutdownObjCmd},
!     {"ns_atexit", NULL, NsTclAtExitObjCmd},
! 
!     /*
!      * tclconf.c
!      */
! 
!     {"ns_config", NsTclConfigCmd, NULL},
!     {"ns_configsection", NsTclConfigSectionCmd, NULL},
!     {"ns_configsections", NsTclConfigSectionsCmd, NULL},
! 
!     /*
!      * tclfile.c
!      */
! 
!     {"ns_unlink", NULL, NsTclUnlinkObjCmd},
      {"ns_mkdir", NULL, NsTclMkdirObjCmd},
-     {"ns_rmdir", NULL, NsTclRmdirObjCmd},
-     {"ns_cp", NULL, NsTclCpObjCmd},
-     {"ns_cpfp", NULL, NsTclCpFpObjCmd},
-     {"ns_rollfile", NULL, NsTclRollFileObjCmd},
-     {"ns_purgefiles", NULL, NsTclPurgeFilesObjCmd},
      {"ns_mktemp", NsTclMkTempCmd, NULL},
!     {"ns_tmpnam", NULL, NsTclTmpNamObjCmd},
      {"ns_normalizepath", NULL, NsTclNormalizePathObjCmd},
!     {"ns_link", NULL, NsTclLinkObjCmd},
!     {"ns_symlink", NULL, NsTclSymlinkObjCmd},
      {"ns_rename", NULL, NsTclRenameObjCmd},
!     {"ns_kill", NULL, NsTclKillObjCmd},
!     {"ns_writefp", NULL, NsTclWriteFpObjCmd},
!     {"ns_truncate", NULL, NsTclTruncateObjCmd},
!     {"ns_ftruncate", NULL, NsTclFTruncateObjCmd},
!     {"ns_chmod", NULL, NsTclChmodObjCmd},
! 
!     /*
!      * tclenv.c
!      */
! 
!     {"ns_env", NsTclEnvCmd, NULL},
!     {"env", NsTclEnvCmd, NULL}, /* NB: Backwards compatible. */
! 
!     /*
!      * tcljob.c
!      */
! 
!     {"ns_job", NULL, NsTclJobObjCmd},
! 
!     /*
!      * tclhttp.c
!      */
! 
!     {"ns_http", NULL, NsTclHttpObjCmd},
! 
!     /*
!      * tclsched.c
!      */
! 
!     {"ns_schedule_proc", NULL, NsTclSchedObjCmd},
      {"ns_schedule_daily", NULL, NsTclSchedDailyObjCmd},
      {"ns_schedule_weekly", NULL, NsTclSchedWeeklyObjCmd},
!     {"ns_after", NULL, NsTclAfterObjCmd},
!     {"ns_cancel", NULL, NsTclCancelObjCmd},
!     {"ns_pause", NULL, NsTclPauseObjCmd},
!     {"ns_resume", NULL, NsTclResumeObjCmd},
!     {"ns_unschedule_proc", NULL, NsTclUnscheduleObjCmd},
! 
!     /*
!      * tclset.c
!      */
! 
      {"ns_set", NULL, NsTclSetObjCmd},
!     {"ns_parseheader", NsTclParseHeaderCmd, NULL},
! 
!     /*
!      * tclsock.c
!      */
! 
      {"ns_sockcallback", NULL, NsTclSockCallbackObjCmd},
      {"ns_socklistencallback", NULL, NsTclSockListenCallbackObjCmd},
-     {"ns_sockblocking", NULL, NsTclSockSetBlockingObjCmd},
      {"ns_socknonblocking", NULL, NsTclSockSetNonBlockingObjCmd},
      {"ns_socknread", NULL, NsTclSockNReadObjCmd},
      {"ns_sockopen", NULL, NsTclSockOpenObjCmd},
      {"ns_socklisten", NULL, NsTclSockListenObjCmd},
-     {"ns_sockaccept", NULL, NsTclSockAcceptObjCmd},
-     {"ns_sockcheck", NULL, NsTclSockCheckObjCmd},
      {"ns_sockselect", NULL, NsTclSelectObjCmd},
!     {"ns_socketpair", NULL, NsTclSocketPairObjCmd},
!     {"ns_hostbyaddr", NULL, NsTclGetHostObjCmd},
!     {"ns_addrbyhost", NULL, NsTclGetAddrObjCmd},
! 
!     /*
!      * tclxkeylist.c
!      */
! 
!     {"keyldel", TclX_KeyldelObjCmd, NULL},
!     {"keylget", TclX_KeylgetObjCmd, NULL},
!     {"keylkeys", TclX_KeylkeysObjCmd, NULL},
!     {"keylset", TclX_KeylsetObjCmd, NULL},
! 
!     /*
!      * cache.c
!      */
! 
!     {"ns_cache_flush", NsTclCacheFlushCmd, NULL},
!     {"ns_cache_stats", NsTclCacheStatsCmd, NULL},
!     {"ns_cache_names", NsTclCacheNamesCmd, NULL},
!     {"ns_cache_size", NsTclCacheSizeCmd, NULL},
!     {"ns_cache_keys", NsTclCacheKeysCmd, NULL},
! 
!     /*
!      * tclthread.c
!      */
! 
      {"ns_thread", NsTclThreadCmd, NULL},
!     {"ns_mutex", NULL, NsTclMutexObjCmd},
!     {"ns_cond", NULL, NsTclCondObjCmd},
!     {"ns_event", NULL, NsTclCondObjCmd},
!     {"ns_rwlock", NULL, NsTclRWLockObjCmd},
!     {"ns_sema", NULL, NsTclSemaObjCmd},
!     {"ns_critsec", NULL, NsTclCritSecObjCmd},
! 
!     /*
!      * tclinit.c
!      */
! 
!     {"ns_init", NULL, NsTclDummyObjCmd},
!     {"ns_cleanup", NULL, NsTclDummyObjCmd},
!     {"ns_markfordelete", NULL, NsTclMarkForDeleteObjCmd},
! 
!     /*
!      * encoding.c
!      */
! 
!     {"ns_charsets", NsTclCharsetsCmd, NULL},
!     {"ns_encodingforcharset", NsTclEncodingForCharsetCmd, NULL},
! 
!     /*
!      * tclobjv.c
!      */
! 
!     {"ns_parseargs", NULL, NsTclParseArgsObjCmd},
  
      /*
--- 235,345 ----
  
  static Cmd cmds[] = {
+     {"env", NsTclEnvCmd, NULL},
+     {"keyldel", TclX_KeyldelObjCmd, NULL},
+     {"keylget", TclX_KeylgetObjCmd, NULL},
+     {"keylkeys", TclX_KeylkeysObjCmd, NULL},
+     {"keylset", TclX_KeylsetObjCmd, NULL},
+     {"ns_addrbyhost", NULL, NsTclGetAddrObjCmd},
+     {"ns_after", NULL, NsTclAfterObjCmd},
+     {"ns_atexit", NULL, NsTclAtExitObjCmd},
+     {"ns_atshutdown", NULL, NsTclAtShutdownObjCmd},
+     {"ns_atsignal", NULL, NsTclAtSignalObjCmd},
+     {"ns_atstartup", NULL, NsTclAtStartupObjCmd},
+     {"ns_base64decode", NULL, NsTclHTUUDecodeObjCmd},
+     {"ns_base64encode", NULL, NsTclHTUUEncodeObjCmd},
+     {"ns_cache_flush", NsTclCacheFlushCmd, NULL},
+     {"ns_cache_keys", NsTclCacheKeysCmd, NULL},
+     {"ns_cache_names", NsTclCacheNamesCmd, NULL},
+     {"ns_cache_size", NsTclCacheSizeCmd, NULL},
+     {"ns_cache_stats", NsTclCacheStatsCmd, NULL},
+     {"ns_cancel", NULL, NsTclCancelObjCmd},
+     {"ns_charsets", NsTclCharsetsCmd, NULL},
+     {"ns_chmod", NULL, NsTclChmodObjCmd},
+     {"ns_cleanup", NULL, NsTclDummyObjCmd},
+     {"ns_cond", NULL, NsTclCondObjCmd},
+     {"ns_config", NsTclConfigCmd, NULL},
+     {"ns_configsection", NsTclConfigSectionCmd, NULL},
+     {"ns_configsections", NsTclConfigSectionsCmd, NULL},
+     {"ns_cp", NULL, NsTclCpObjCmd},
+     {"ns_cpfp", NULL, NsTclCpFpObjCmd},
+     {"ns_critsec", NULL, NsTclCritSecObjCmd},
      {"ns_crypt", NULL, NsTclCryptObjCmd},
!     {"ns_encodingforcharset", NsTclEncodingForCharsetCmd, NULL},
!     {"ns_env", NsTclEnvCmd, NULL},
!     {"ns_event", NULL, NsTclCondObjCmd},
!     {"ns_ftruncate", NULL, NsTclFTruncateObjCmd},
      {"ns_fmttime", NULL, NsTclStrftimeObjCmd},
+     {"ns_gifsize", NULL, NsTclGifSizeObjCmd},
+     {"ns_gmtime", NULL, NsTclGmTimeObjCmd},
+     {"ns_guesstype", NULL, NsTclGuessTypeObjCmd},
+     {"ns_hashpath", NULL, NsTclHashPathObjCmd},
+     {"ns_hostbyaddr", NULL, NsTclGetHostObjCmd},
+     {"ns_hrefs", NsTclHrefsCmd, NULL},
+     {"ns_http", NULL, NsTclHttpObjCmd},
      {"ns_httptime", NULL, NsTclHttpTimeObjCmd},
      {"ns_info", NULL, NsTclInfoObjCmd},
!     {"ns_init", NULL, NsTclDummyObjCmd},
!     {"ns_job", NULL, NsTclJobObjCmd},
!     {"ns_jpegsize", NULL, NsTclJpegSizeObjCmd},
!     {"ns_kill", NULL, NsTclKillObjCmd},
!     {"ns_link", NULL, NsTclLinkObjCmd},
!     {"ns_localtime", NULL, NsTclLocalTimeObjCmd},
      {"ns_locationproc", NULL, NsTclLocationProcObjCmd},
      {"ns_log", NULL, NsTclLogObjCmd},
      {"ns_logctl", NULL, NsTclLogCtlObjCmd},
      {"ns_logroll", NULL, NsTclLogRollObjCmd},
!     {"ns_markfordelete", NULL, NsTclMarkForDeleteObjCmd},
      {"ns_mkdir", NULL, NsTclMkdirObjCmd},
      {"ns_mktemp", NsTclMkTempCmd, NULL},
!     {"ns_modulepath", NULL, NsTclModulePathObjCmd},
!     {"ns_mutex", NULL, NsTclMutexObjCmd},
      {"ns_normalizepath", NULL, NsTclNormalizePathObjCmd},
!     {"ns_pagepath", NULL, NsTclPagePathObjCmd},
!     {"ns_parseargs", NULL, NsTclParseArgsObjCmd},
!     {"ns_parseheader", NsTclParseHeaderCmd, NULL},
!     {"ns_parsehttptime", NULL, NsTclParseHttpTimeObjCmd},
!     {"ns_parsequery", NULL, NsTclParseQueryObjCmd},
!     {"ns_pause", NULL, NsTclPauseObjCmd},
!     {"ns_purgefiles", NULL, NsTclPurgeFilesObjCmd},
!     {"ns_quotehtml", NsTclQuoteHtmlCmd, NULL},
!     {"ns_rand", NULL, NsTclRandObjCmd},
      {"ns_rename", NULL, NsTclRenameObjCmd},
!     {"ns_resume", NULL, NsTclResumeObjCmd},
!     {"ns_rmdir", NULL, NsTclRmdirObjCmd},
!     {"ns_rollfile", NULL, NsTclRollFileObjCmd},
!     {"ns_rwlock", NULL, NsTclRWLockObjCmd},
      {"ns_schedule_daily", NULL, NsTclSchedDailyObjCmd},
+     {"ns_schedule_proc", NULL, NsTclSchedObjCmd},
      {"ns_schedule_weekly", NULL, NsTclSchedWeeklyObjCmd},
!     {"ns_sema", NULL, NsTclSemaObjCmd},
!     {"ns_serverpath", NULL, NsTclServerPathObjCmd},
!     {"ns_serverrootproc", NULL, NsTclServerRootProcObjCmd},
      {"ns_set", NULL, NsTclSetObjCmd},
!     {"ns_sha1", NULL, NsTclSHA1ObjCmd},
!     {"ns_sleep", NULL, NsTclSleepObjCmd},
!     {"ns_sockaccept", NULL, NsTclSockAcceptObjCmd},
!     {"ns_sockblocking", NULL, NsTclSockSetBlockingObjCmd},
      {"ns_sockcallback", NULL, NsTclSockCallbackObjCmd},
+     {"ns_sockcheck", NULL, NsTclSockCheckObjCmd},
+     {"ns_socketpair", NULL, NsTclSocketPairObjCmd},
      {"ns_socklistencallback", NULL, NsTclSockListenCallbackObjCmd},
      {"ns_socknonblocking", NULL, NsTclSockSetNonBlockingObjCmd},
      {"ns_socknread", NULL, NsTclSockNReadObjCmd},
      {"ns_sockopen", NULL, NsTclSockOpenObjCmd},
      {"ns_socklisten", NULL, NsTclSockListenObjCmd},
      {"ns_sockselect", NULL, NsTclSelectObjCmd},
!     {"ns_striphtml", NsTclStripHtmlCmd, NULL},
!     {"ns_symlink", NULL, NsTclSymlinkObjCmd},
      {"ns_thread", NsTclThreadCmd, NULL},
!     {"ns_time", NULL, NsTclTimeObjCmd},
!     {"ns_tmpnam", NULL, NsTclTmpNamObjCmd},
!     {"ns_truncate", NULL, NsTclTruncateObjCmd},
!     {"ns_unlink", NULL, NsTclUnlinkObjCmd},
!     {"ns_unschedule_proc", NULL, NsTclUnscheduleObjCmd},
!     {"ns_urldecode", NULL, NsTclUrlDecodeObjCmd},
!     {"ns_urlencode", NULL, NsTclUrlEncodeObjCmd},
!     {"ns_uudecode", NULL, NsTclHTUUDecodeObjCmd},
!     {"ns_uuencode", NULL, NsTclHTUUEncodeObjCmd},
!     {"ns_writefp", NULL, NsTclWriteFpObjCmd},
  
      /*
***************
*** 448,587 ****
  
  static Cmd servCmds[] = {
! 
!     /*
!      * tclrequest.c
!      */
! 
!     {"ns_register_filter", NULL, NsTclRegisterFilterObjCmd},
!     {"ns_register_trace", NULL, NsTclRegisterTraceObjCmd},
      {"ns_register_adp", NULL, NsTclRegisterAdpObjCmd},
      {"ns_register_proc", NULL, NsTclRegisterProcObjCmd},
!     {"ns_unregister_adp", NULL, NsTclUnRegisterObjCmd},
!     {"ns_unregister_proc", NULL, NsTclUnRegisterObjCmd},
!     {"ns_atclose", NsTclAtCloseCmd, NULL},
! 
!     /*
!      * tclresp.c
!      */
! 
!     {"ns_return", NULL, NsTclReturnObjCmd},
      {"ns_respond", NULL, NsTclRespondObjCmd},
!     {"ns_returnfile", NULL, NsTclReturnFileObjCmd},
!     {"ns_returnfp", NULL, NsTclReturnFpObjCmd},
      {"ns_returnbadrequest", NULL, NsTclReturnBadRequestObjCmd},
      {"ns_returnerror", NULL, NsTclReturnErrorObjCmd},
      {"ns_returnnotice", NULL, NsTclReturnNoticeObjCmd},
-     {"ns_returnadminnotice", NULL, NsTclReturnNoticeObjCmd},
      {"ns_returnredirect", NULL, NsTclReturnRedirectObjCmd},
-     {"ns_headers", NULL, NsTclHeadersObjCmd},
-     {"ns_write", NULL, NsTclWriteObjCmd},
-     {"ns_connsendfp", NULL, NsTclConnSendFpObjCmd},
-     {"ns_returnforbidden", NULL, NsTclReturnForbiddenObjCmd},
      {"ns_returnunauthorized", NULL, NsTclReturnUnauthorizedObjCmd},
!     {"ns_returnnotfound", NULL, NsTclReturnNotFoundObjCmd},
! 
!     /*
!      * tclfile.c
!      */
! 
!     {"ns_chan", NULL, NsTclChanObjCmd},
!     {"ns_url2file", NULL, NsTclUrl2FileObjCmd},
! 
! 
!     {"ns_library", NsTclLibraryCmd, NULL},
!     {"ns_geturl", NULL, NsTclGetUrlObjCmd},
! 
!     {"ns_checkurl", NULL, NsTclRequestAuthorizeObjCmd},
!     {"ns_requestauthorize", NULL, NsTclRequestAuthorizeObjCmd},
! 
!     /*
!      * tcladmin.c
!      */
! 
!     {"ns_shutdown", NULL, NsTclShutdownObjCmd},
! 
!     /*
!      * conn.c
!      */
! 
!     {"ns_conncptofp", NULL, NsTclWriteContentObjCmd},
!     {"ns_writecontent", NULL, NsTclWriteContentObjCmd},
!     {"ns_conn", NULL, NsTclConnObjCmd},
!     {"ns_startcontent", NULL, NsTclStartContentObjCmd},
! 
!     /*
!      * cookies.c
!      */
! 
!     {"ns_deletecookie", NULL, NsTclDeleteCookieObjCmd},
!     {"ns_getcookie", NULL, NsTclGetCookieObjCmd},
      {"ns_setcookie", NULL, NsTclSetCookieObjCmd},
- 
-     /*
-      * adpparse.c
-      */
- 
-     {"ns_register_adptag", NsTclRegisterTagCmd, NULL},
-     {"ns_adp_registeradp", NsTclAdpRegisterAdpCmd, NULL},
-     {"ns_adp_registertag", NsTclAdpRegisterAdpCmd, NULL},
-     {"ns_adp_registerproc", NsTclAdpRegisterProcCmd, NULL},
- 
-     /*
-      * adpcmds.c
-      */
- 
-     {"ns_adp_stats", NsTclAdpStatsCmd, NULL},
-     {"ns_adp_debug", NsTclAdpDebugCmd, NULL},
- 
-     {"_ns_adp_include", NULL, NsTclAdpIncludeObjCmd},
-     {"ns_adp_eval", NULL, NsTclAdpEvalObjCmd},
-     {"ns_adp_safeeval", NULL, NsTclAdpSafeEvalObjCmd},
-     {"ns_adp_parse", NULL, NsTclAdpParseObjCmd},
-     {"ns_puts", NULL, NsTclAdpPutsObjCmd},
-     {"ns_adp_puts", NULL, NsTclAdpPutsObjCmd},
-     {"ns_adp_append", NULL, NsTclAdpAppendObjCmd},
-     {"ns_adp_dir", NULL, NsTclAdpDirObjCmd},
-     {"ns_adp_return", NULL, NsTclAdpReturnObjCmd},
-     {"ns_adp_break", NULL, NsTclAdpBreakObjCmd},
-     {"ns_adp_abort", NULL, NsTclAdpAbortObjCmd},
-     {"ns_adp_tell", NULL, NsTclAdpTellObjCmd},
-     {"ns_adp_trunc", NULL, NsTclAdpTruncObjCmd},
-     {"ns_adp_dump", NULL, NsTclAdpDumpObjCmd},
-     {"ns_adp_argc", NULL, NsTclAdpArgcObjCmd},
-     {"ns_adp_argv", NULL, NsTclAdpArgvObjCmd},
-     {"ns_adp_bind_args", NULL, NsTclAdpBindArgsObjCmd},
-     {"ns_adp_exception", NULL, NsTclAdpExceptionObjCmd},
-     {"ns_adp_stream", NULL, NsTclAdpStreamObjCmd},
-     {"ns_adp_mime", NULL, NsTclAdpMimeTypeObjCmd},
-     {"ns_adp_mimetype", NULL, NsTclAdpMimeTypeObjCmd},
-     {"ns_adp_compress", NULL, NsTclAdpCompressObjCmd},
- 
-     /*
-      * tclvar.c
-      */
- 
      {"ns_share", NsTclShareCmd, NULL},
      {"ns_var", NULL, NsTclVarObjCmd},
!     {"nsv_get", NULL, NsTclNsvGetObjCmd},
      {"nsv_exists", NULL, NsTclNsvExistsObjCmd},
!     {"nsv_set", NULL, NsTclNsvSetObjCmd},
      {"nsv_incr", NULL, NsTclNsvIncrObjCmd},
-     {"nsv_append", NULL, NsTclNsvAppendObjCmd},
      {"nsv_lappend", NULL, NsTclNsvLappendObjCmd},
-     {"nsv_array", NULL, NsTclNsvArrayObjCmd},
-     {"nsv_unset", NULL, NsTclNsvUnsetObjCmd},
      {"nsv_names", NULL, NsTclNsvNamesObjCmd},
! 
!     /*
!      * serv.c
!      */
! 
!     {"ns_server", NULL, NsTclServerObjCmd},
! 
!     /*
!      * tclinit.c
!      */
! 
!     {"ns_ictl", NULL, NsTclICtlObjCmd},
  
      /*
--- 356,436 ----
  
  static Cmd servCmds[] = {
!     {"_ns_adp_include", NULL, NsTclAdpIncludeObjCmd},
!     {"ns_adp_abort", NULL, NsTclAdpAbortObjCmd},
!     {"ns_adp_append", NULL, NsTclAdpAppendObjCmd},
!     {"ns_adp_argc", NULL, NsTclAdpArgcObjCmd},
!     {"ns_adp_argv", NULL, NsTclAdpArgvObjCmd},
!     {"ns_adp_bind_args", NULL, NsTclAdpBindArgsObjCmd},
!     {"ns_adp_break", NULL, NsTclAdpBreakObjCmd},
!     {"ns_adp_compress", NULL, NsTclAdpCompressObjCmd},
!     {"ns_adp_debug", NsTclAdpDebugCmd, NULL},
!     {"ns_adp_dir", NULL, NsTclAdpDirObjCmd},
!     {"ns_adp_dump", NULL, NsTclAdpDumpObjCmd},
!     {"ns_adp_eval", NULL, NsTclAdpEvalObjCmd},
!     {"ns_adp_exception", NULL, NsTclAdpExceptionObjCmd},
!     {"ns_adp_mime", NULL, NsTclAdpMimeTypeObjCmd},
!     {"ns_adp_mimetype", NULL, NsTclAdpMimeTypeObjCmd},
!     {"ns_adp_parse", NULL, NsTclAdpParseObjCmd},
!     {"ns_adp_puts", NULL, NsTclAdpPutsObjCmd},
!     {"ns_adp_registeradp", NsTclAdpRegisterAdpCmd, NULL},
!     {"ns_adp_registerproc", NsTclAdpRegisterProcCmd, NULL},
!     {"ns_adp_registertag", NsTclAdpRegisterAdpCmd, NULL},
!     {"ns_adp_return", NULL, NsTclAdpReturnObjCmd},
!     {"ns_adp_safeeval", NULL, NsTclAdpSafeEvalObjCmd},
!     {"ns_adp_stats", NsTclAdpStatsCmd, NULL},
!     {"ns_adp_stream", NULL, NsTclAdpStreamObjCmd},
!     {"ns_adp_tell", NULL, NsTclAdpTellObjCmd},
!     {"ns_adp_trunc", NULL, NsTclAdpTruncObjCmd},
!     {"ns_atclose", NsTclAtCloseCmd, NULL},
!     {"ns_chan", NULL, NsTclChanObjCmd},
!     {"ns_checkurl", NULL, NsTclRequestAuthorizeObjCmd},
!     {"ns_conn", NULL, NsTclConnObjCmd},
!     {"ns_conncptofp", NULL, NsTclWriteContentObjCmd},
!     {"ns_connsendfp", NULL, NsTclConnSendFpObjCmd},
!     {"ns_deletecookie", NULL, NsTclDeleteCookieObjCmd},
!     {"ns_getcookie", NULL, NsTclGetCookieObjCmd},
!     {"ns_geturl", NULL, NsTclGetUrlObjCmd},
!     {"ns_headers", NULL, NsTclHeadersObjCmd},
!     {"ns_ictl", NULL, NsTclICtlObjCmd},
!     {"ns_library", NsTclLibraryCmd, NULL},
!     {"ns_puts", NULL, NsTclAdpPutsObjCmd},
      {"ns_register_adp", NULL, NsTclRegisterAdpObjCmd},
+     {"ns_register_adptag", NsTclRegisterTagCmd, NULL},
+     {"ns_register_filter", NULL, NsTclRegisterFilterObjCmd},
      {"ns_register_proc", NULL, NsTclRegisterProcObjCmd},
!     {"ns_register_trace", NULL, NsTclRegisterTraceObjCmd},
!     {"ns_requestauthorize", NULL, NsTclRequestAuthorizeObjCmd},
      {"ns_respond", NULL, NsTclRespondObjCmd},
!     {"ns_return", NULL, NsTclReturnObjCmd},
!     {"ns_returnadminnotice", NULL, NsTclReturnNoticeObjCmd},
      {"ns_returnbadrequest", NULL, NsTclReturnBadRequestObjCmd},
      {"ns_returnerror", NULL, NsTclReturnErrorObjCmd},
+     {"ns_returnfile", NULL, NsTclReturnFileObjCmd},
+     {"ns_returnforbidden", NULL, NsTclReturnForbiddenObjCmd},
+     {"ns_returnfp", NULL, NsTclReturnFpObjCmd},
+     {"ns_returnnotfound", NULL, NsTclReturnNotFoundObjCmd},
      {"ns_returnnotice", NULL, NsTclReturnNoticeObjCmd},
      {"ns_returnredirect", NULL, NsTclReturnRedirectObjCmd},
      {"ns_returnunauthorized", NULL, NsTclReturnUnauthorizedObjCmd},
!     {"ns_server", NULL, NsTclServerObjCmd},
      {"ns_setcookie", NULL, NsTclSetCookieObjCmd},
      {"ns_share", NsTclShareCmd, NULL},
+     {"ns_shutdown", NULL, NsTclShutdownObjCmd},
+     {"ns_startcontent", NULL, NsTclStartContentObjCmd},
+     {"ns_unregister_adp", NULL, NsTclUnRegisterObjCmd},
+     {"ns_unregister_proc", NULL, NsTclUnRegisterObjCmd},
+     {"ns_url2file", NULL, NsTclUrl2FileObjCmd},
      {"ns_var", NULL, NsTclVarObjCmd},
!     {"ns_write", NULL, NsTclWriteObjCmd},
!     {"ns_writecontent", NULL, NsTclWriteContentObjCmd},
!     {"nsv_append", NULL, NsTclNsvAppendObjCmd},
!     {"nsv_array", NULL, NsTclNsvArrayObjCmd},
      {"nsv_exists", NULL, NsTclNsvExistsObjCmd},
!     {"nsv_get", NULL, NsTclNsvGetObjCmd},
      {"nsv_incr", NULL, NsTclNsvIncrObjCmd},
      {"nsv_lappend", NULL, NsTclNsvLappendObjCmd},
      {"nsv_names", NULL, NsTclNsvNamesObjCmd},
!     {"nsv_set", NULL, NsTclNsvSetObjCmd},
!     {"nsv_unset", NULL, NsTclNsvUnsetObjCmd},
  
      /*