naviserver-commits — Commit notices

[naviserver-commits] modules/nsberkeleydb nsberkeleydb.c,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsberkeleydb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2950/nsberkeleydb

Modified Files:
	nsberkeleydb.c 
Log Message:
silenced more compiler warnings


Index: nsberkeleydb.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsberkeleydb/nsberkeleydb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsberkeleydb.c	8 Jun 2005 20:03:38 -0000	1.2
--- nsberkeleydb.c	13 Jun 2005 16:04:31 -0000	1.3
***************
*** 55,59 ****
  static int      DbFree(Ns_DbHandle *handle);
  static int      DbShutdown(void *arg);
! static void     DbError(const char *errpfx, char *msg);
  static Ns_Set  *DbBindRow(Ns_DbHandle *handle);
  
--- 55,59 ----
  static int      DbFree(Ns_DbHandle *handle);
  static int      DbShutdown(void *arg);
! static void     DbError(const DB_ENV *env,const char *errpfx, const char *msg);
  static Ns_Set  *DbBindRow(Ns_DbHandle *handle);
  
***************
*** 153,157 ****
      }
      Ns_RegisterShutdown((Ns_Callback *)DbShutdown,0);
!     Ns_Log(Notice,"%s/%s: Home=%s, Cache=%ld, Flags=%x",dbName,hModule,dbHome,dbCacheSize,dbEnvFlags);
      Ns_DStringFree(&ds);
      return NS_OK;
--- 153,157 ----
      }
      Ns_RegisterShutdown((Ns_Callback *)DbShutdown,0);
!     Ns_Log(Notice,"%s/%s: Home=%s, Cache=%ud, Flags=%x",dbName,hModule,dbHome,dbCacheSize,dbEnvFlags);
      Ns_DStringFree(&ds);
      return NS_OK;
***************
*** 210,214 ****
      if(dbDbFlags) db->set_flags(db,dbDbFlags);
      if(dbPageSize) db->set_pagesize(db,dbPageSize);
!     if((rc = db->open(db,dbpath,0,dbtype,DB_CREATE|DB_THREAD|DB_DIRTY_READ,0664,0)) != 0) {
        db->err(db,rc,"%s: open",handle->datasource);
        db->close(db,0);
--- 210,214 ----
      if(dbDbFlags) db->set_flags(db,dbDbFlags);
      if(dbPageSize) db->set_pagesize(db,dbPageSize);
!     if((rc = db->open(db,0,dbpath,0,dbtype,DB_CREATE|DB_THREAD|DB_DIRTY_READ,0664)) != 0) {
        db->err(db,rc,"%s: open",handle->datasource);
        db->close(db,0);
***************
*** 278,282 ****
        conn->key.data = query+4;
        if((conn->data.data = strstr(conn->key.data,dbDelimiter))) {
!         *((char*)conn->data.data)++ = 0;
          conn->data.size = strlen(conn->data.data)+1;
        }
--- 278,282 ----
        conn->key.data = query+4;
        if((conn->data.data = strstr(conn->key.data,dbDelimiter))) {
!         *((char*)conn->data.data++) = 0;
          conn->data.size = strlen(conn->data.data)+1;
        }
***************
*** 420,424 ****
  
  static void
! DbError(const char *errpfx, char *msg)
  {
       Ns_Log(Error,"nsberkeleydb: %s: %s",errpfx,msg);
--- 420,424 ----
  
  static void
! DbError(const DB_ENV *env,const char *errpfx, const char *msg)
  {
       Ns_Log(Error,"nsberkeleydb: %s: %s",errpfx,msg);
***************
*** 484,488 ****
  
  static int
! DbCmd(ClientData dummy, Tcl_Interp *interp, int argc, char **argv)
  {
      Ns_DbHandle *handle;
--- 484,488 ----
  
  static int
! DbCmd(ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Ns_DbHandle *handle;
***************
*** 492,496 ****
        return TCL_ERROR;
      }
!     if(Ns_TclDbGetHandle(interp,argv[2],&handle) != TCL_OK) return TCL_ERROR;
      /* Make sure this is an Db handle before accessing handle->connection. */
      if(Ns_DbDriverName(handle) != dbName) {
--- 492,496 ----
        return TCL_ERROR;
      }
!     if(Ns_TclDbGetHandle(interp,(char*)argv[2],&handle) != TCL_OK) return TCL_ERROR;
      /* Make sure this is an Db handle before accessing handle->connection. */
      if(Ns_DbDriverName(handle) != dbName) {

[naviserver-commits] modules/nsimap nsimap.c,1.3,1.4

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsimap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2950/nsimap

Modified Files:
	nsimap.c 
Log Message:
silenced more compiler warnings


Index: nsimap.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsimap/nsimap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nsimap.c	12 Jun 2005 22:34:23 -0000	1.3
--- nsimap.c	13 Jun 2005 16:04:33 -0000	1.4
***************
*** 24,29 ****
   */
  
- static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__;
- 
  /*
   * nsimap.c -- Interface to c-client Mail library
--- 24,27 ----
***************
*** 267,270 ****
--- 265,270 ----
  #include <setjmp.h>
  
+ NS_RCSID("@(#) $Header$");
+ 
  #define VERSION  "3.2.3"
  
***************
*** 307,311 ****
  static char *strStripHtml(char *str,char *tags[]);
  static char *strLower(char *str);
! static void mailGc(mailServer *server);
  static void mm_parseline(ENVELOPE *env,char *hdr,char *data,char *host);
  void mm_getquota(MAILSTREAM *stream,char *qroot,QUOTALIST *qlist);
--- 307,311 ----
  static char *strStripHtml(char *str,char *tags[]);
  static char *strLower(char *str);
! static void mailGc(void *arg);
  static void mm_parseline(ENVELOPE *env,char *hdr,char *data,char *host);
  void mm_getquota(MAILSTREAM *stream,char *qroot,QUOTALIST *qlist);
***************
*** 699,704 ****
  
  // Garbage collection routine, closes expired sessions
! static void mailGc(mailServer *server)
  {
      mailSession *session;
      time_t now = time(0);
--- 699,705 ----
  
  // Garbage collection routine, closes expired sessions
! static void mailGc(void *arg)
  {
+     mailServer *server = arg;
      mailSession *session;
      time_t now = time(0);
***************
*** 853,858 ****
      case cmdDecode: {
          // Decode text into plain 8bit string
!         char *data;
          int len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
--- 854,861 ----
      case cmdDecode: {
          // Decode text into plain 8bit string
!         char *data; 
!         void *vdata;
          int len = 0;
+         unsigned long llen;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
***************
*** 862,882 ****
          // Decode BASE64 encoded text */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"base64")) {
!           data = (char *)rfc822_base64(data,num=len,&len);
!           Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert a quoted-printable string to an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"qprint")) {
!           data = (char *)rfc822_qprint(data,num=len,&len);
!           Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert a UTF7 an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_decode(data,(int)(num=len),(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!             ns_free(data);
              return TCL_OK;
            }
--- 865,885 ----
          // Decode BASE64 encoded text */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"base64")) {
!           vdata = (char *)rfc822_base64(data,num=len,&llen);
!           Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(vdata,(int)llen));
!           fs_give(&vdata);
            return TCL_OK;
          } else
          // Convert a quoted-printable string to an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"qprint")) {
!           vdata = (char *)rfc822_qprint(data,num=len,&llen);
!           Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(vdata,(int)llen));
!           fs_give(&vdata);
            return TCL_OK;
          } else
          // Convert a UTF7 an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_decode(data,(int)(num=len),&len))) {
              Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!             ns_free(vdata);
              return TCL_OK;
            }
***************
*** 887,892 ****
--- 890,897 ----
      case cmdEncode: {
          // Encode plain 8bit string
+         void *vdata;
          char *data;
          int len = 0;
+         unsigned long llen;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
***************
*** 896,914 ****
          // Convert an 8bit string to a quoted printable string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"qprint")) {
!           data = (char *)rfc822_8bit(data,num=len,&len);
!           Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert an 8bit string to a base64 string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"base64")) {
!           data = (char *)rfc822_binary(data,num=len,&len);
!           Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert a 8-bit string into UTF7 */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_encode(data,(int)(num=len),(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
              ns_free(data);
--- 901,919 ----
          // Convert an 8bit string to a quoted printable string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"qprint")) {
!           vdata = (char *)rfc822_8bit(data,num=len,&llen);
!           Tcl_SetObjResult(interp,Tcl_NewStringObj(vdata,(int)llen));
!           fs_give(&vdata);
            return TCL_OK;
          } else
          // Convert an 8bit string to a base64 string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"base64")) {
!           vdata = (char *)rfc822_binary(data,num=len,&llen);
!           Tcl_SetObjResult(interp,Tcl_NewStringObj(vdata,(int)llen));
!           fs_give(&vdata);
            return TCL_OK;
          } else
          // Convert a 8-bit string into UTF7 */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_encode(data,(int)(num=len),&len))) {
              Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
              ns_free(data);
***************
*** 1140,1144 ****
          BODY *body = 0;
          PARAMETER *filename;
!         char *text,*fname = 0,*data = 0;
          unsigned long len,decode = 0,mode = 0;
  
--- 1145,1150 ----
          BODY *body = 0;
          PARAMETER *filename;
!         void *data = 0;
!         char *text,*fname = 0;
          unsigned long len,decode = 0,mode = 0;
  
***************
*** 1394,1400 ****
          long flags = 0;
          SORTPGM pgm;
  	SEARCHPGM *spg = 0;
!         unsigned long *ids,*id;
!         static char* sSort[] = {"date","arrival","from","subject","to","cc","size",0};
          static int iSort[] = { SORTDATE,SORTARRIVAL,SORTFROM,SORTSUBJECT,SORTTO,SORTCC,SORTSIZE};
          if(objc < 5) {
--- 1400,1407 ----
          long flags = 0;
          SORTPGM pgm;
+         void *vdata;
  	SEARCHPGM *spg = 0;
!         unsigned long *id, *ids;
!         static const char* sSort[] = {"date","arrival","from","subject","to","cc","size",0};
          static int iSort[] = { SORTDATE,SORTARRIVAL,SORTFROM,SORTSUBJECT,SORTTO,SORTCC,SORTSIZE};
          if(objc < 5) {
***************
*** 1408,1416 ****
          spg = mail_newsearchpgm();
          if(objc == 6) mailFlags(Tcl_GetStringFromObj(objv[5],0),&flags);
!         if((ids = mail_sort(session->stream,0,spg,&pgm,flags))) {
            session->list = Tcl_NewListObj(0,0);
            for(id = ids;*id;id++)
              Tcl_ListObjAppendElement(interp,session->list,Tcl_NewIntObj((int)*id));
!           fs_give(&ids);
            Tcl_SetObjResult(interp,session->list);
          }
--- 1415,1423 ----
          spg = mail_newsearchpgm();
          if(objc == 6) mailFlags(Tcl_GetStringFromObj(objv[5],0),&flags);
!         if((vdata = ids = mail_sort(session->stream,0,spg,&pgm,flags))) {
            session->list = Tcl_NewListObj(0,0);
            for(id = ids;*id;id++)
              Tcl_ListObjAppendElement(interp,session->list,Tcl_NewIntObj((int)*id));
!           fs_give(&vdata);
            Tcl_SetObjResult(interp,session->list);
          }
***************
*** 1804,1808 ****
           case ST_DECODE1:
               outp[1] = UNB64(*inp);
!     	 *outp++ |= outp[1] >> 4;
      	 *outp <<= 4;
      	 state = ST_DECODE2;
--- 1811,1816 ----
           case ST_DECODE1:
               outp[1] = UNB64(*inp);
!     	 *outp = outp[1] >> 4;
!          outp++;
      	 *outp <<= 4;
      	 state = ST_DECODE2;
***************
*** 1810,1814 ****
           case ST_DECODE2:
               outp[1] = UNB64(*inp);
!     	 *outp++ |= outp[1] >> 2;
      	 *outp <<= 6;
      	 state = ST_DECODE3;
--- 1818,1823 ----
           case ST_DECODE2:
               outp[1] = UNB64(*inp);
!     	 *outp = outp[1] >> 2;
!          outp++;
      	 *outp <<= 6;
      	 state = ST_DECODE3;
***************
*** 1874,1878 ****
        if(inp == endp || !SPECIAL(*inp)) {
          /* flush overflow and terminate region */
!         if(state != ST_ENCODE0) *outp++ = B64(*outp);
          *outp++ = '-';
          state = ST_NORMAL;
--- 1883,1890 ----
        if(inp == endp || !SPECIAL(*inp)) {
          /* flush overflow and terminate region */
!         if(state != ST_ENCODE0) {
!           *outp = B64(*outp);
!           outp++;
!         }
          *outp++ = '-';
          state = ST_NORMAL;
***************
*** 1882,1897 ****
           case ST_ENCODE0:
               *outp++ = B64(*inp >> 2);
!     	 *outp = *inp++ << 4;
!     	 state = ST_ENCODE1;
!     	 break;
           case ST_ENCODE1:
!              *outp++ = B64(*outp | *inp >> 4);
!     	 *outp = *inp++ << 2;
!     	 state = ST_ENCODE2;
!     	 break;
           case ST_ENCODE2:
!              *outp++ = B64(*outp | *inp >> 6);
!     	 *outp++ = B64(*inp++);
!     	 state = ST_ENCODE0;
           case ST_NORMAL:
               break;
--- 1894,1911 ----
           case ST_ENCODE0:
               *outp++ = B64(*inp >> 2);
!     	     *outp = *inp++ << 4;
!     	     state = ST_ENCODE1;
!     	     break;
           case ST_ENCODE1:
!              *outp = B64(*outp | *inp >> 4);
!              outp++;
!     	     *outp = *inp++ << 2;
!     	     state = ST_ENCODE2;
!     	     break;
           case ST_ENCODE2:
!              *outp = B64(*outp | *inp >> 6);
!              outp++;
!     	     *outp++ = B64(*inp++);
!     	     state = ST_ENCODE0;
           case ST_NORMAL:
               break;

[naviserver-commits] modules/nsfreetds nsfreetds.c,1.6,1.7

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsfreetds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2950/nsfreetds

Modified Files:
	nsfreetds.c 
Log Message:
silenced more compiler warnings


Index: nsfreetds.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsfreetds/nsfreetds.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nsfreetds.c	9 Jun 2005 21:07:37 -0000	1.6
--- nsfreetds.c	13 Jun 2005 16:04:33 -0000	1.7
***************
*** 383,392 ****
  Db_Cmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
      Ns_DbHandle *handle;
      enum commands {
          cmdRowsAffected, cmdVersion
!     } cmd;
  
!     static char *sCmd[] = {
          "rows_affected", "version",
          0
--- 383,393 ----
  Db_Cmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
+     int cmd;
      Ns_DbHandle *handle;
      enum commands {
          cmdRowsAffected, cmdVersion
!     };
  
!     static const char *sCmd[] = {
          "rows_affected", "version",
          0

[naviserver-commits] modules/nsgdchart gdchart.c,1.3,1.4

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsgdchart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2950/nsgdchart

Modified Files:
	gdchart.c 
Log Message:
silenced more compiler warnings


Index: gdchart.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/gdchart.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gdchart.c	12 Jun 2005 22:34:23 -0000	1.3
--- gdchart.c	13 Jun 2005 16:04:33 -0000	1.4
***************
*** 309,313 ****
  }
  
! static void draw_3d_line(gdImagePtr im,int y0,int x1,int x2,int y1[],int y2[],int xdepth,int ydepth,int num_sets,int clr[],int clrshd[])
  {
  #define F(x,i)	(int)((float)((x)-x1)*slope[i]+(float)y1[i])
--- 309,313 ----
  }
  
! static void draw_3d_line(gdImagePtr im,int y0,int x1,int x2,int y1[],int y2[],int xdepth,int ydepth,int num_sets,unsigned long clr[],unsigned long clrshd[])
  {
  #define F(x,i)	(int)((float)((x)-x1)*slope[i]+(float)y1[i])
***************
*** 566,570 ****
      gdImagePtr bg_img = 0;
      int num_sets = GDC->num_sets;
!     float xorig,yorig,vyorig;
      float yscl = 0.0;
      float vyscl = 0.0;
--- 566,570 ----
      gdImagePtr bg_img = 0;
      int num_sets = GDC->num_sets;
!     float xorig,yorig,vyorig = 0;
      float yscl = 0.0;
      float vyscl = 0.0;
***************
*** 611,616 ****
      int annote_hgt = 0;
      int setno = 0;		/* affects PX() and PY() */
!     float *uvol;
!     unsigned long BGColor,LineColor,PlotColor, GridColor,VolColor,AnnoteColor;
      float *uvals[num_sets];
      unsigned long ExtVolColor[GDC->num_points];
--- 611,617 ----
      int annote_hgt = 0;
      int setno = 0;		/* affects PX() and PY() */
!     float *uvol = 0;
!     unsigned long BGColor = 0,LineColor = 0,PlotColor = 0;
!     unsigned long GridColor = 0,VolColor = 0,AnnoteColor = 0;
      float *uvals[num_sets];
      unsigned long ExtVolColor[GDC->num_points];
***************
*** 1614,1619 ****
  	int y1[num_sets];
  	int y2[num_sets];
! 	int clr[num_sets];
! 	int clrshd[num_sets];
  
  	for(i = 1; i < GDC->num_points; ++i) {
--- 1615,1620 ----
  	int y1[num_sets];
  	int y2[num_sets];
! 	unsigned long clr[num_sets];
! 	unsigned long clrshd[num_sets];
  
  	for(i = 1; i < GDC->num_points; ++i) {
***************
*** 1665,1669 ****
                             xdepth_3D,
                             ydepth_3D,
!                            set,clr,
                             clrshd);
  	  }
--- 1666,1671 ----
                             xdepth_3D,
                             ydepth_3D,
!                            set,
!                            clr,
                             clrshd);
  	  }

[naviserver-commits] modules/nsdns nsdns.c,1.3,1.4

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsdns
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2950/nsdns

Modified Files:
	nsdns.c 
Log Message:
silenced more compiler warnings


Index: nsdns.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/nsdns.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nsdns.c	12 Jun 2005 22:34:22 -0000	1.3
--- nsdns.c	13 Jun 2005 16:04:32 -0000	1.4
***************
*** 47,51 ****
  static int dnsWrite(int sock, void *vbuf, int len);
  static int dnsRead(int sock, void *vbuf, int len);
! static void DnsPanic(char *fmt,...);
  static void DnsSegv(int sig);
  static int DnsCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
--- 47,51 ----
  static int dnsWrite(int sock, void *vbuf, int len);
  static int dnsRead(int sock, void *vbuf, int len);
! static void DnsPanic(const char *fmt,...);
  static void DnsSegv(int sig);
  static int DnsCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
***************
*** 150,159 ****
  
  static void
! DnsPanic(char *fmt,...)
  {
      va_list ap;
  
      va_start(ap,fmt);
!     Ns_Log(Error,"nsdns[%d]: panic %x",getpid(),va_arg(ap,char*));
      va_end(ap);
      close(dnsUdpSock);
--- 150,159 ----
  
  static void
! DnsPanic(const char *fmt,...)
  {
      va_list ap;
  
      va_start(ap,fmt);
!     Ns_Log(Error,"nsdns[%d]: panic %p",getpid(),va_arg(ap,char*));
      va_end(ap);
      close(dnsUdpSock);

[naviserver-commits] naviserver ChangeLog,1.118,1.119

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** ChangeLog	13 Jun 2005 08:51:54 -0000	1.118
--- ChangeLog	13 Jun 2005 10:18:55 -0000	1.119
***************
*** 5,8 ****
--- 5,11 ----
  	(first arg was lacking the "const" qualifier).
  
+ 	* nsd/nswin32: Added (untested) implementatio of
+ 	NsMemMap() and NsMemUmap() calls.
+ 
  2005-06-12  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/nsd nswin32.c,1.5,1.6

[Zoran V. <vas...@us...>]

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

Modified Files:
	nswin32.c 
Log Message:
Added (untested) implementation of NsMemMap() and NsMemUmap()


Index: nswin32.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nswin32.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nswin32.c	11 Jun 2005 18:40:31 -0000	1.5
--- nswin32.c	13 Jun 2005 10:17:27 -0000	1.6
***************
*** 444,448 ****
  NsMemMap(char *path, int size, int mode, FileMap *mapPtr)
  {
!     return NS_ERROR;
  }
  
--- 444,513 ----
  NsMemMap(char *path, int size, int mode, FileMap *mapPtr)
  {
!     HANDLE hndl, mobj;
!     LPCVOID addr;
!     char name[256];
! 
!     switch (mode) {
!     case NS_MMAP_WRITE:
!         hndl = CreateFile(path, 
!                           GENERIC_READ|GENERIC_WRITE,
!                           FILE_SHARE_READ|FILE_SHARE_WRITE,
!                           NULL,
!                           OPEN_EXISTING,
!                           FILE_FLAG_WRITE_THROUGH,
!                           NULL);
!         break;
!     case NS_MMAP_READ:
!         hndl = CreateFile(path, 
!                           GENERIC_READ,
!                           FILE_SHARE_READ,
!                           NULL,
!                           OPEN_EXISTING,
!                           0,
!                           NULL);
!         break;
!     default:
!         return NS_ERROR;
!     }
! 
!     if (hndl == NULL || hndl == INVALID_HANDLE_VALUE) {
!         Ns_Log(Error, "CreateFile(%s): %s", path, GetLastError());
!         return NS_ERROR;
!     }
! 
!     sprintf(name, "MapObj-%s", Ns_ThreadGetName());
! 
!     mobj = CreateFileMapping(hndl,
!                              NULL,
!                              PAGE_READWRITE|SEC_NOCACHE,
!                              0,
!                              0,
!                              name);
! 
!     if (mobj == NULL || mobj == INVALID_HANDLE_VALUE) {
!         Ns_Log(Error, "CreateFileMapping(%s): %s", path, GetLastError());
!         CloseHandle(hndl);
!         return NS_ERROR;
!     }
! 
!     addr = MapViewOfFile(mobj, 
!                          FILE_MAP_ALL_ACCESS,
!                          0, 
!                          0, 
!                          size);
! 
!     if (addr == NULL) {
!         Ns_Log(Warning, "MapViewOfFile(%s): %s", path, GetLastError());
!         CloseHandle(mobj);
!         CloseHandle(hndl);
!         return NS_ERROR;
!     }
! 
!     mapPtr->mapobj = (void *) mobj;
!     mapPtr->handle = (int) hndl;
!     mapPtr->addr   = (void *) addr;
!     mapPtr->size   = size;
! 
!     return NS_OK;
  }
  
***************
*** 467,471 ****
  NsMemUmap(FileMap *mapPtr)
  {
!     return;
  }
  
--- 532,538 ----
  NsMemUmap(FileMap *mapPtr)
  {
!     UnmapViewOfFile((LPCVOID)mapPtr->addr);
!     CloseHandle((HANDLE)mapPtr->mapobj);
!     CloseHandle((HANDLE)mapPtr->handle);
  }
  

[naviserver-commits] naviserver ChangeLog,1.117,1.118

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** ChangeLog	13 Jun 2005 06:14:26 -0000	1.117
--- ChangeLog	13 Jun 2005 08:51:54 -0000	1.118
***************
*** 1,2 ****
--- 1,8 ----
+ 2005-06-13  Zoran Vasiljevic  <vas...@us...>
+ 
+ 	* nsd/compress.c: Fixed Ns_CompressGzip() declaration 
+ 	when --without-zlib is used during compilation
+ 	(first arg was lacking the "const" qualifier).
+ 
  2005-06-12  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/nsd compress.c,1.3,1.4

[Zoran V. <vas...@us...>]

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

Modified Files:
	compress.c 
Log Message:
Fixed Ns_CompressGzip declaration when --without-zlib is used
(was lacking the "const" qualifier).


Index: compress.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/compress.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compress.c	13 Jun 2005 06:14:26 -0000	1.3
--- compress.c	13 Jun 2005 08:50:17 -0000	1.4
***************
*** 111,115 ****
  
  int
! Ns_CompressGzip(char *buf, int len, Tcl_DString *outPtr, int level)
  {
      return NS_ERROR;
--- 111,115 ----
  
  int
! Ns_CompressGzip(const char *buf, int len, Tcl_DString *outPtr, int level)
  {
      return NS_ERROR;

[naviserver-commits] naviserver/nsd adpparse.c,1.2,1.3 compress.c,1.2,1.3 listen.c,1.2,1.3 sock.c,1.3,1.4 tclimg.c,1.2,1.3 tclmisc.c,1.8,1.9 tclresp.c,1.7,1.8 uuencode.c,1.3,1.4

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

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

Modified Files:
	adpparse.c compress.c listen.c sock.c tclimg.c tclmisc.c 
	tclresp.c uuencode.c 
Log Message:
        * include/ns.h:
        * nsd/adpparse.c:
        * nsd/compress.c:
        * nsd/listen.c:
        * nsd/sock.c:
        * nsd/tclimg.c:
        * nsd/tclmisc.c:
        * nsd/tclresp.c:
        * nsd/uuencode.c:
        * nscp/nscp.c:
        * tests/tclresp.test: Fix some issues with mixing signed/unsigned
        data that gcc4 was complaining about and a couple of instances of
        uninitialised variables.


Index: compress.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/compress.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** compress.c	10 Jun 2005 17:58:38 -0000	1.2
--- compress.c	13 Jun 2005 06:14:26 -0000	1.3
***************
*** 67,71 ****
  
  int
! Ns_CompressGzip(char *buf, int len, Tcl_DString *outPtr, int level)
  {
      uLongf glen;
--- 67,71 ----
  
  int
! Ns_CompressGzip(const char *buf, int len, Tcl_DString *outPtr, int level)
  {
      uLongf glen;
***************
*** 89,93 ****
      skip = sizeof(header) - 2;
      glen -= skip;
!     if (compress2(gbuf + skip, &glen, buf, (uLong) len, level) != Z_OK) {
          return NS_ERROR;
      }
--- 89,93 ----
      skip = sizeof(header) - 2;
      glen -= skip;
!     if (compress2((Bytef *) gbuf + skip, &glen, (Bytef *) buf, (uLong) len, level) != Z_OK) {
          return NS_ERROR;
      }
***************
*** 100,104 ****
  
      crc = crc32(0, Z_NULL, 0);
!     crc = crc32(crc, buf, len);
      footer[0] = htonl(crc);
      footer[1] = htonl(len);
--- 100,104 ----
  
      crc = crc32(0, Z_NULL, 0);
!     crc = crc32(crc, (Bytef *) buf, len);
      footer[0] = htonl(crc);
      footer[1] = htonl(len);
***************
*** 136,140 ****
   */
  int
! Ns_Compress(char *buf, int len, Tcl_DString *outPtr, int level)
  {
      return Ns_CompressGzip(buf, len, outPtr, level);
--- 136,140 ----
   */
  int
! Ns_Compress(const char *buf, int len, Tcl_DString *outPtr, int level)
  {
      return Ns_CompressGzip(buf, len, outPtr, level);

Index: tclmisc.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tclmisc.c	12 Jun 2005 14:42:44 -0000	1.8
--- tclmisc.c	13 Jun 2005 06:14:26 -0000	1.9
***************
*** 393,398 ****
  NsTclHTUUDecodeObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
!     int   size;
!     char *string, *decoded;
   
      if (objc != 2) {
--- 393,399 ----
  NsTclHTUUDecodeObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj **objv)
  {
!     int            size;
!     char          *string;
!     unsigned char *decoded;
   
      if (objc != 2) {
***************
*** 402,409 ****
      string = Tcl_GetStringFromObj(objv[1], &size);
      size += 3;
!     decoded = ns_malloc((size_t)size);
!     size = Ns_HtuuDecode(string, (unsigned char *) decoded, size);
      decoded[size] = '\0';
!     Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(decoded,size));
      ns_free(decoded);
      return TCL_OK;
--- 403,410 ----
      string = Tcl_GetStringFromObj(objv[1], &size);
      size += 3;
!     decoded = ns_malloc(size);
!     size = Ns_HtuuDecode(string, decoded, size);
      decoded[size] = '\0';
!     Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(decoded, size));
      ns_free(decoded);
      return TCL_OK;
***************
*** 1052,1061 ****
  NsTclSHA1ObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
  {
!     SHA_CTX ctx;
!     char    digest[20];
!     char    digestChars[41];
!     int     i;
!     char    *str;
!     int     strLen;
      
      if (objc != 2) {
--- 1053,1062 ----
  NsTclSHA1ObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
  {
!     SHA_CTX        ctx;
!     unsigned char  digest[20];
!     char           digestChars[41];
!     int            i;
!     char          *str;
!     int            strLen;
      
      if (objc != 2) {
***************
*** 1066,1075 ****
      str = Tcl_GetStringFromObj(objv[1],&strLen);
      SHAInit(&ctx);
!     SHAUpdate(&ctx, str, (unsigned int) strLen);
      SHAFinal(digest, &ctx);
  
      for (i = 0; i < 20; ++i) {
! 	digestChars[i * 2] = hexChars[(unsigned char)(digest[i]) >> 4];
! 	digestChars[i * 2 + 1] = hexChars[(unsigned char)(digest[i]) & 0xF];
      }
      digestChars[40] = '\0';
--- 1067,1076 ----
      str = Tcl_GetStringFromObj(objv[1],&strLen);
      SHAInit(&ctx);
!     SHAUpdate(&ctx, (unsigned char *) str, (unsigned int) strLen);
      SHAFinal(digest, &ctx);
  
      for (i = 0; i < 20; ++i) {
! 	digestChars[i * 2] = hexChars[digest[i] >> 4];
! 	digestChars[i * 2 + 1] = hexChars[digest[i] & 0xF];
      }
      digestChars[40] = '\0';

Index: listen.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/listen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** listen.c	10 Jun 2005 17:58:39 -0000	1.2
--- listen.c	13 Jun 2005 06:14:26 -0000	1.3
***************
*** 222,226 ****
  {
      struct sockaddr_in  sa;
!     int                 len;
      Tcl_HashTable      *tablePtr;
      Tcl_HashEntry      *hPtr;
--- 222,226 ----
  {
      struct sockaddr_in  sa;
!     socklen_t           len;
      Tcl_HashTable      *tablePtr;
      Tcl_HashEntry      *hPtr;

Index: uuencode.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/uuencode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** uuencode.c	10 Jun 2005 17:58:41 -0000	1.3
--- uuencode.c	13 Jun 2005 06:14:26 -0000	1.4
***************
*** 111,115 ****
  
      p = input;
!     q = output;
      for (n = len / 3; n > 0; --n) {
  	*q++ = ENC(p[0] >> 2);
--- 111,115 ----
  
      p = input;
!     q = (unsigned char *) output;
      for (n = len / 3; n > 0; --n) {
  	*q++ = ENC(p[0] >> 2);
***************
*** 189,193 ****
  
      n = 0;
!     p = input;
      q = output;
      while (*p) {
--- 189,193 ----
  
      n = 0;
!     p = (unsigned char *) input;
      q = output;
      while (*p) {

Index: tclimg.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclimg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tclimg.c	10 Jun 2005 17:58:40 -0000	1.2
--- tclimg.c	13 Jun 2005 06:14:26 -0000	1.3
***************
*** 180,184 ****
  NsTclJpegSizeObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
  {
!     int   code, w, h;
      Tcl_Channel chan;
  
--- 180,184 ----
  NsTclJpegSizeObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
  {
!     int   code, w = 0, h = 0;
      Tcl_Channel chan;
  

Index: sock.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/sock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sock.c	10 Jun 2005 17:58:39 -0000	1.3
--- sock.c	13 Jun 2005 06:14:26 -0000	1.4
***************
*** 210,214 ****
      SOCKET sock;
  
!     sock = accept(lsock, saPtr, lenPtr);
      if (sock != INVALID_SOCKET) {
  	sock = SockSetup(sock);
--- 210,214 ----
      SOCKET sock;
  
!     sock = accept(lsock, saPtr, (socklen_t *) lenPtr);
      if (sock != INVALID_SOCKET) {
  	sock = SockSetup(sock);
***************
*** 350,354 ****
  {
      SOCKET         sock;
!     int		   len, err;
  
      /*
--- 350,355 ----
  {
      SOCKET         sock;
!     int            err;
!     socklen_t      len;
  
      /*
***************
*** 359,370 ****
      sock = SockConnect(host, port, lhost, lport, 1);
      if (sock != INVALID_SOCKET) {
! 	len = sizeof(err);
!     	if (Ns_SockWait(sock, NS_SOCK_WRITE, timeout) == NS_OK
! 		&& getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == 0
! 		&& err == 0) {
! 	    return sock;
! 	}
! 	ns_sockclose(sock);
! 	sock = INVALID_SOCKET;
      }
      return sock;
--- 360,371 ----
      sock = SockConnect(host, port, lhost, lport, 1);
      if (sock != INVALID_SOCKET) {
!         len = sizeof(err);
!         if (Ns_SockWait(sock, NS_SOCK_WRITE, timeout) == NS_OK
!             && getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == 0
!             && err == 0) {
!             return sock;
!         }
!         ns_sockclose(sock);
!         sock = INVALID_SOCKET;
      }
      return sock;

Index: adpparse.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/adpparse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** adpparse.c	10 Jun 2005 17:58:38 -0000	1.2
--- adpparse.c	13 Jun 2005 06:14:26 -0000	1.3
***************
*** 558,571 ****
      Tag            *tagPtr = NULL;
      char           *ss = NULL, *se = NULL, *s = NULL, *e = NULL;
!     char           *a = NULL, *as = NULL, *ae = NULL , *t = NULL;
!     int             level = 0, state, stream, streamdone;
      Tcl_DString     tag;
      Tcl_HashEntry  *hPtr = NULL;
  
      Tcl_DStringInit(&tag);
-     t = utf;
-     streamdone = 0;
-     state = 0;
      Ns_RWLockRdLock(&servPtr->adp.taglock);
      while ((s = strchr(utf, '<')) && (e = strchr(s, '>'))) {
  	/*
--- 558,569 ----
      Tag            *tagPtr = NULL;
      char           *ss = NULL, *se = NULL, *s = NULL, *e = NULL;
!     char           *a = NULL, *as = NULL, *ae = NULL , *t = utf;
!     int             level = 0, state = 0, stream = 0, streamdone = 0;
      Tcl_DString     tag;
      Tcl_HashEntry  *hPtr = NULL;
  
      Tcl_DStringInit(&tag);
      Ns_RWLockRdLock(&servPtr->adp.taglock);
+ 
      while ((s = strchr(utf, '<')) && (e = strchr(s, '>'))) {
  	/*

Index: tclresp.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclresp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tclresp.c	10 Jun 2005 17:58:40 -0000	1.7
--- tclresp.c	13 Jun 2005 06:14:26 -0000	1.8
***************
*** 161,165 ****
   *
   * Side effects:
!  *      String may be transcoded. Connection will be closed.
   *
   *----------------------------------------------------------------------
--- 161,166 ----
   *
   * Side effects:
!  *      String may be transcoded if binary switch not given. Connection
!  *      will be closed.
   *
   *----------------------------------------------------------------------
***************
*** 170,205 ****
  {
      Ns_Conn *conn;
!     unsigned char *data = 0, *type = 0;
!     int result, param = 1, status = 0, len = 0, binary = 0;
  
!     if (objc != 4 && objc != 5) {
!         Tcl_WrongNumArgs(interp, 1, objv, "?-binary? status type string");
!         return TCL_ERROR;
!     }
!     if (objc == 5) {
!         if(strcmp(Tcl_GetString(objv[param]),"-binary")) {
!            Tcl_WrongNumArgs(interp, 1, objv, "?-binary? status type string");
!            return TCL_ERROR;
!         }
!         binary = 1;
!         param++;
!     }
!     if (Tcl_GetIntFromObj(interp, objv[param], &status) != TCL_OK) {
          return TCL_ERROR;
      }
-     type = Tcl_GetString(objv[param+1]);
-     if (binary != 0) { 
-         data = Tcl_GetByteArrayFromObj(objv[param+2], &len);
-     } else {
-         data = Tcl_GetStringFromObj(objv[param+2], &len);
-     }
      if (GetConn(arg, interp, &conn) != TCL_OK) {
          return TCL_ERROR;
      }
!     if(binary != 0) {
!        result = Ns_ConnReturnData(conn, status, data, len, type);
      } else {
!        result = Ns_ConnReturnCharData(conn, status, data, len, type);
      }
      return Result(interp, result);
  }
--- 171,202 ----
  {
      Ns_Conn *conn;
!     Tcl_Obj *dataObj;
!     char    *type, *data;
!     int      status, len, result, binary = NS_FALSE;
  
!     Ns_ObjvSpec opts[] = {
!         {"-binary",  Ns_ObjvBool, &binary, (void *) NS_TRUE},
!         {NULL, NULL, NULL, NULL}
!     };
!     Ns_ObjvSpec args[] = {
!         {"status",   Ns_ObjvInt,    &status,  NULL},
!         {"type",     Ns_ObjvString, &type,    NULL},
!         {"data",     Ns_ObjvObj,    &dataObj, NULL},
!         {NULL, NULL, NULL, NULL}
!     };
!     if (Ns_ParseObjv(opts, args, interp, 1, objc, objv) != NS_OK) {
          return TCL_ERROR;
      }
      if (GetConn(arg, interp, &conn) != TCL_OK) {
          return TCL_ERROR;
      }
!     if (binary) {
!         data = (char *) Tcl_GetByteArrayFromObj(dataObj, &len);
!         result = Ns_ConnReturnData(conn, status, data, len, type);
      } else {
!         data = Tcl_GetStringFromObj(dataObj, &len);
!         result = Ns_ConnReturnCharData(conn, status, data, len, type);
      }
+ 
      return Result(interp, result);
  }

[naviserver-commits] naviserver/tests tclresp.test,1.4,1.5

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

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

Modified Files:
	tclresp.test 
Log Message:
        * include/ns.h:
        * nsd/adpparse.c:
        * nsd/compress.c:
        * nsd/listen.c:
        * nsd/sock.c:
        * nsd/tclimg.c:
        * nsd/tclmisc.c:
        * nsd/tclresp.c:
        * nsd/uuencode.c:
        * nscp/nscp.c:
        * tests/tclresp.test: Fix some issues with mixing signed/unsigned
        data that gcc4 was complaining about and a couple of instances of
        uninitialised variables.


Index: tclresp.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/tclresp.test,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tclresp.test	10 Jun 2005 16:56:49 -0000	1.4
--- tclresp.test	13 Jun 2005 06:14:26 -0000	1.5
***************
*** 26,30 ****
  test tclresp-1.2.1 {basic syntax} -body {
      ns_return
! } -returnCodes error -result {wrong # args: should be "ns_return ?-binary? status type string"}
  
  test tclresp-1.2.2 {basic syntax} -body {
--- 26,30 ----
  test tclresp-1.2.1 {basic syntax} -body {
      ns_return
! } -returnCodes error -result {wrong # args: should be "ns_return ?-binary? status type data"}
  
  test tclresp-1.2.2 {basic syntax} -body {

[naviserver-commits] naviserver/nscp nscp.c,1.4,1.5

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

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

Modified Files:
	nscp.c 
Log Message:
        * include/ns.h:
        * nsd/adpparse.c:
        * nsd/compress.c:
        * nsd/listen.c:
        * nsd/sock.c:
        * nsd/tclimg.c:
        * nsd/tclmisc.c:
        * nsd/tclresp.c:
        * nsd/uuencode.c:
        * nscp/nscp.c:
        * tests/tclresp.test: Fix some issues with mixing signed/unsigned
        data that gcc4 was complaining about and a couple of instances of
        uninitialised variables.


Index: nscp.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nscp/nscp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nscp.c	10 Jun 2005 17:58:37 -0000	1.4
--- nscp.c	13 Jun 2005 06:14:26 -0000	1.5
***************
*** 412,416 ****
  {
      unsigned char buf[2048];
!     int n;
      int result = 0;
      int retry = 0;
--- 412,416 ----
  {
      unsigned char buf[2048];
!     size_t n;
      int result = 0;
      int retry = 0;
***************
*** 426,430 ****
      }
      n = strlen(prompt);
!     if (send(sock, prompt, (unsigned int) n, 0) != n) {
  	result = 0;
  	goto bail;
--- 426,430 ----
      }
      n = strlen(prompt);
!     if (send(sock, prompt, n, 0) != n) {
  	result = 0;
  	goto bail;
***************
*** 478,482 ****
  	}
  
! 	Tcl_DStringAppend(dsPtr, buf, n);
  	result = 1;
  
--- 478,482 ----
  	}
  
! 	Tcl_DStringAppend(dsPtr, (char *) buf, n);
  	result = 1;
  

[naviserver-commits] naviserver ChangeLog,1.116,1.117

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

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

Modified Files:
	ChangeLog 
Log Message:
        * include/ns.h:
        * nsd/adpparse.c:
        * nsd/compress.c:
        * nsd/listen.c:
        * nsd/sock.c:
        * nsd/tclimg.c:
        * nsd/tclmisc.c:
        * nsd/tclresp.c:
        * nsd/uuencode.c:
        * nscp/nscp.c:
        * tests/tclresp.test: Fix some issues with mixing signed/unsigned
        data that gcc4 was complaining about and a couple of instances of
        uninitialised variables.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** ChangeLog	13 Jun 2005 04:32:28 -0000	1.116
--- ChangeLog	13 Jun 2005 06:14:26 -0000	1.117
***************
*** 1,4 ****
--- 1,18 ----
  2005-06-12  Stephen Deasey  <sd...@us...>
  
+ 	* include/ns.h:
+ 	* nsd/adpparse.c:
+ 	* nsd/compress.c:
+ 	* nsd/listen.c:
+ 	* nsd/sock.c:
+ 	* nsd/tclimg.c:
+ 	* nsd/tclmisc.c:
+ 	* nsd/tclresp.c:
+ 	* nsd/uuencode.c:
+ 	* nscp/nscp.c:
+ 	* tests/tclresp.test: Fix some issues with mixing signed/unsigned
+ 	data that gcc4 was complaining about and a couple of instances of
+ 	uninitialised variables.
+ 
  	* nsd/tclobjv.c: Simplify code and clarify comment.
  

[naviserver-commits] naviserver/include ns.h,1.26,1.27

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

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

Modified Files:
	ns.h 
Log Message:
        * include/ns.h:
        * nsd/adpparse.c:
        * nsd/compress.c:
        * nsd/listen.c:
        * nsd/sock.c:
        * nsd/tclimg.c:
        * nsd/tclmisc.c:
        * nsd/tclresp.c:
        * nsd/uuencode.c:
        * nscp/nscp.c:
        * tests/tclresp.test: Fix some issues with mixing signed/unsigned
        data that gcc4 was complaining about and a couple of instances of
        uninitialised variables.


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ns.h	13 Jun 2005 01:56:13 -0000	1.26
--- ns.h	13 Jun 2005 06:14:26 -0000	1.27
***************
*** 571,577 ****
   */
  
! NS_EXTERN int Ns_Compress(char *buf, int len, Tcl_DString *outPtr, int level)
       NS_GNUC_DEPRECATED;
! NS_EXTERN int Ns_CompressGzip(char *buf, int len, Tcl_DString *outPtr, int level);
  
  /*
--- 571,577 ----
   */
  
! NS_EXTERN int Ns_Compress(const char *buf, int len, Tcl_DString *outPtr, int level)
       NS_GNUC_DEPRECATED;
! NS_EXTERN int Ns_CompressGzip(const char *buf, int len, Tcl_DString *outPtr, int level);
  
  /*

[naviserver-commits] naviserver/nsd tclobjv.c,1.9,1.10

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

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

Modified Files:
	tclobjv.c 
Log Message:
Simplify code and clarify comment.


Index: tclobjv.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclobjv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tclobjv.c	10 Jun 2005 17:58:40 -0000	1.9
--- tclobjv.c	13 Jun 2005 04:32:28 -0000	1.10
***************
*** 294,302 ****
  
      if (*objcPtr > 0) {
!         if (spec->arg == NULL) {
!             *dest = Tcl_GetString(objv[0]);
!         } else {
!             *dest = Tcl_GetStringFromObj(objv[0], (int *) spec->arg);
!         }
          *objcPtr -= 1;
          return TCL_OK;
--- 294,298 ----
  
      if (*objcPtr > 0) {
!         *dest = Tcl_GetStringFromObj(objv[0], (int *) spec->arg);
          *objcPtr -= 1;
          return TCL_OK;
***************
*** 311,319 ****
   * Ns_ObjvByteArray --
   *
!  *      Consume exactly one argument, returning a pointer to it's
!  *      cstring into *spec->dest.
   *
   *      If spec->arg is != NULL it is assumed to be a pointer to an
!  *      int and the returned string length will be left in it.
   *
   * Results:
--- 307,315 ----
   * Ns_ObjvByteArray --
   *
!  *      Consume exactly one argument, returning a pointer to the
!  *      raw bytes into *spec->dest.
   *
   *      If spec->arg is != NULL it is assumed to be a pointer to an
!  *      int and the number of bytes will be left in it.
   *
   * Results:
***************
*** 333,341 ****
  
      if (*objcPtr > 0) {
!         if (spec->arg == NULL) {
!             *dest = Tcl_GetByteArrayFromObj(objv[0],0);
!         } else {
!             *dest = Tcl_GetByteArrayFromObj(objv[0], (int *) spec->arg);
!         }
          *objcPtr -= 1;
          return TCL_OK;
--- 329,333 ----
  
      if (*objcPtr > 0) {
!         *dest = Tcl_GetByteArrayFromObj(objv[0], (int *) spec->arg);
          *objcPtr -= 1;
          return TCL_OK;

[naviserver-commits] naviserver ChangeLog,1.115,1.116

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

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

Modified Files:
	ChangeLog 
Log Message:
Simplify code and clarify comment.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** ChangeLog	13 Jun 2005 01:58:16 -0000	1.115
--- ChangeLog	13 Jun 2005 04:32:28 -0000	1.116
***************
*** 1,4 ****
--- 1,6 ----
  2005-06-12  Stephen Deasey  <sd...@us...>
  
+ 	* nsd/tclobjv.c: Simplify code and clarify comment.
+ 
  	* nscgi/nscgi.c: Use non-depreciated functions.
  

[naviserver-commits] naviserver/nscgi nscgi.c,1.2,1.3

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

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

Modified Files:
	nscgi.c 
Log Message:
Use non-depreciated functions.


Index: nscgi.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nscgi/nscgi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nscgi.c	10 Jun 2005 17:58:37 -0000	1.2
--- nscgi.c	13 Jun 2005 01:58:16 -0000	1.3
***************
*** 774,778 ****
      	Ns_DString tmp;
  	
!         if (Ns_DecodeUrl(dsPtr, cgiPtr->pathinfo) != NULL) {
              SetUpdate(cgiPtr->env, "PATH_INFO", dsPtr->string);
          } else {
--- 774,778 ----
      	Ns_DString tmp;
  	
!         if (Ns_UrlPathDecode(dsPtr, cgiPtr->pathinfo, NULL) != NULL) {
              SetUpdate(cgiPtr->env, "PATH_INFO", dsPtr->string);
          } else {
***************
*** 782,786 ****
  	Ns_DStringInit(&tmp);
          Ns_UrlToFile(dsPtr, modPtr->server, cgiPtr->pathinfo);
!         if (Ns_DecodeUrl(&tmp, dsPtr->string) != NULL) {
              SetUpdate(cgiPtr->env, "PATH_TRANSLATED", tmp.string);
          } else {
--- 782,786 ----
  	Ns_DStringInit(&tmp);
          Ns_UrlToFile(dsPtr, modPtr->server, cgiPtr->pathinfo);
!         if (Ns_UrlPathDecode(&tmp, dsPtr->string, NULL) != NULL) {
              SetUpdate(cgiPtr->env, "PATH_TRANSLATED", tmp.string);
          } else {
***************
*** 801,854 ****
  
      /*
!      * Determine SERVER_NAME from the conn location.
       */
  
!     s = Ns_ConnLocation(conn);
!     p = NULL;
!     if (s != NULL) {
!         if (strstr(s, "://") == NULL) {
!             Ns_Log(Warning, "nscgi: location does not contain '://'");
!             s = NULL;
!         } else {
!             s = strchr(s, ':');         /* Get past the http */
!             if (s != NULL) {
!                 s += 3;                 /* Get past the // */
!                 p = strchr(s, ':');     /* Get to the port number */ 
!             }
          }
      }
!     if (s == NULL) {
!         s = Ns_ConnHost(conn);
!         SetUpdate(cgiPtr->env, "SERVER_NAME", s);
!     } else {
!         if (p == NULL) {
!             Ns_DStringAppend(dsPtr, s);           /* No port number */
!         } else {
!             Ns_DStringNAppend(dsPtr, s, (p - s)); /* Port number exists */
!         }
!         s = Ns_DStringExport(dsPtr);
!         SetUpdate(cgiPtr->env, "SERVER_NAME", s);
!         ns_free(s);
      }
  
-     /*
-      * Determine SERVER_PORT from the conn location.
-      */
- 
-     s = Ns_ConnLocation(conn);
-     if (s != NULL) {
-         s = strchr(s, ':');             /* Skip past http. */
-         if (s != NULL) {
-             ++s;
-             s = strchr(s, ':');         /* Skip past hostname. */
-             if (s != NULL) {
-                 ++s;
-             }
-         }
-     }
-     if (s == NULL) {
-         s = "80";
-     }
-     SetUpdate(cgiPtr->env, "SERVER_PORT", s);
      SetUpdate(cgiPtr->env, "AUTH_TYPE", "Basic");
      SetUpdate(cgiPtr->env, "REMOTE_USER", conn->authUser);
--- 801,826 ----
  
      /*
!      * Determine SERVER_NAME and SERVER_PORT from the conn location.
       */
  
!     s = Ns_ConnLocationAppend(conn, dsPtr);
!     s = strchr(s, ':');
!     s += 3;               /* Get past the protocol://  */
!     p = strchr(s, ':');   /* Get to the port number    */ 
!     if (p != NULL) {
!         SetUpdate(cgiPtr->env, "SERVER_PORT", p);
!         for (i = 0; p != '\0'; ++p) {
!             ++i;
          }
+         Ns_DStringTrunc(dsPtr, i);
      }
!     SetUpdate(cgiPtr->env, "SERVER_NAME", dsPtr->string);
!     Ns_DStringTrunc(dsPtr, 0);
!     if (p == NULL) {
!         Ns_DStringPrintf(dsPtr, "%d", Ns_ConnPort(conn));
!         SetUpdate(cgiPtr->env, "SERVER_PORT", dsPtr->string);
!         Ns_DStringTrunc(dsPtr, 0);
      }
  
      SetUpdate(cgiPtr->env, "AUTH_TYPE", "Basic");
      SetUpdate(cgiPtr->env, "REMOTE_USER", conn->authUser);
***************
*** 932,936 ****
  		    *e = '\0';
  		}
! 		Ns_UrlDecode(dsPtr, s);
  		Ns_DStringNAppend(dsPtr, "", 1);
  		if (e != NULL) {
--- 904,908 ----
  		    *e = '\0';
  		}
! 		Ns_UrlQueryDecode(dsPtr, s, NULL);
  		Ns_DStringNAppend(dsPtr, "", 1);
  		if (e != NULL) {
***************
*** 1107,1111 ****
                  if (*value == '/') {
                      Ns_DStringInit(&redir);
!                     Ns_DStringVarAppend(&redir, Ns_ConnLocation(conn), value, NULL);
                      last = Ns_SetPut(hdrs, ds.string, redir.string);
                      Ns_DStringFree(&redir);
--- 1079,1084 ----
                  if (*value == '/') {
                      Ns_DStringInit(&redir);
!                     Ns_ConnLocationAppend(conn, &redir);
!                     Ns_DStringAppend(&redir, value);
                      last = Ns_SetPut(hdrs, ds.string, redir.string);
                      Ns_DStringFree(&redir);

[naviserver-commits] naviserver ChangeLog,1.114,1.115

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

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

Modified Files:
	ChangeLog 
Log Message:
Use non-depreciated functions.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** ChangeLog	13 Jun 2005 01:55:13 -0000	1.114
--- ChangeLog	13 Jun 2005 01:58:16 -0000	1.115
***************
*** 1,4 ****
--- 1,6 ----
  2005-06-12  Stephen Deasey  <sd...@us...>
  
+ 	* nscgi/nscgi.c: Use non-depreciated functions.
+ 
  	* nsd/str.c: Add new function Ns_StrIsHost.
  	* include/ns.h:

[naviserver-commits] naviserver/include ns.h,1.25,1.26

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

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

Modified Files:
	ns.h 
Log Message:
        * nsd/str.c: Add new function Ns_StrIsHost.
        * include/ns.h:
        * nsd/nsd.h:
        * nsd/driver.c: Save the protocol seperate from the location in
        the driver structure and ensure the location always begins with a
        "protocol://" string.
        * nsd/server.c:
        * nsd/conn.c:
        * nsd/pathname.c: Simplify code by using protocol direct from
        driver structure and checking Host header with Ns_StrIsHost.


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ns.h	11 Jun 2005 20:00:48 -0000	1.25
--- ns.h	13 Jun 2005 01:56:13 -0000	1.26
***************
*** 405,419 ****
  
  typedef struct Ns_Driver {
!     void	*arg;		    /* Driver callback data. */
!     char	*server;	    /* Virtual server name. */
!     char	*module;	    /* Driver module. */
!     char        *name;		    /* Driver name. */
!     char        *location;	    /* Location, e.g, "http://foo:9090" */
!     char        *address;	    /* Address in location. */
!     int     	 sendwait;	    /* send() I/O timeout. */
!     int     	 recvwait;	    /* recv() I/O timeout. */
!     int		 bufsize;	    /* Conn bufsize (0 for SSL) */
!     int		 sndbuf;	    /* setsockopt() SNDBUF option. */
!     int		 rcvbuf;	    /* setsockopt() RCVBUF option. */
  } Ns_Driver;
  
--- 405,420 ----
  
  typedef struct Ns_Driver {
!     void    *arg;           /* Driver callback data. */
!     char    *server;        /* Virtual server name. */
!     char    *module;        /* Driver module. */
!     char    *name;          /* Driver name. */
!     char    *location;      /* Location, e.g, "http://foo:9090" */
!     char    *address;       /* Address in location, e.g. "foo" */
!     char    *protocol;      /* Protocol in location, e.g, "http" */
!     int      sendwait;      /* send() I/O timeout. */
!     int      recvwait;      /* recv() I/O timeout. */
!     int      bufsize;       /* Conn bufsize (0 for SSL) */
!     int      sndbuf;        /* setsockopt() SNDBUF option. */
!     int      rcvbuf;        /* setsockopt() RCVBUF option. */
  } Ns_Driver;
  
***************
*** 472,476 ****
  typedef int   (Ns_FilterProc) (void *arg, Ns_Conn *conn, int why);
  typedef int   (Ns_UrlToFileProc) (Ns_DString *dsPtr, char *server, char *url);
! typedef char *(Ns_ServerRootProc) (Ns_DString  *dest, char *host, void *arg);
  typedef char *(Ns_ConnLocationProc) (Ns_Conn *conn, Ns_DString *dest, void *arg);
  typedef char *(Ns_LocationProc) (Ns_Conn *conn); /* depreciated */
--- 473,477 ----
  typedef int   (Ns_FilterProc) (void *arg, Ns_Conn *conn, int why);
  typedef int   (Ns_UrlToFileProc) (Ns_DString *dsPtr, char *server, char *url);
! typedef char *(Ns_ServerRootProc) (Ns_DString  *dest, CONST char *host, void *arg);
  typedef char *(Ns_ConnLocationProc) (Ns_Conn *conn, Ns_DString *dest, void *arg);
  typedef char *(Ns_LocationProc) (Ns_Conn *conn); /* depreciated */
***************
*** 1179,1182 ****
--- 1180,1184 ----
  NS_EXTERN char *Ns_NextWord(char *line);
  NS_EXTERN char *Ns_StrNStr(char *pattern, char *expression);
+ NS_EXTERN int Ns_StrIsHost(CONST char *string);
  
  /*

[naviserver-commits] naviserver/nsd conn.c,1.16,1.17 driver.c,1.10,1.11 nsd.h,1.16,1.17 pathname.c,1.4,1.5 server.c,1.5,1.6 str.c,1.2,1.3

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

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

Modified Files:
	conn.c driver.c nsd.h pathname.c server.c str.c 
Log Message:
        * nsd/str.c: Add new function Ns_StrIsHost.
        * include/ns.h:
        * nsd/nsd.h:
        * nsd/driver.c: Save the protocol seperate from the location in
        the driver structure and ensure the location always begins with a
        "protocol://" string.
        * nsd/server.c:
        * nsd/conn.c:
        * nsd/pathname.c: Simplify code by using protocol direct from
        driver structure and checking Host header with Ns_StrIsHost.


Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** nsd.h	11 Jun 2005 18:40:31 -0000	1.16
--- nsd.h	13 Jun 2005 01:55:14 -0000	1.17
***************
*** 356,360 ****
      char *name;                 /* Driver name. */
      char *location;             /* Location, e.g, "http://foo:9090" */
!     char *address;              /* Address in location. */
      int sendwait;               /* send() I/O timeout. */
      int recvwait;               /* recv() I/O timeout. */
--- 356,361 ----
      char *name;                 /* Driver name. */
      char *location;             /* Location, e.g, "http://foo:9090" */
!     char *address;              /* Address in location, e.g. "foo" */
!     char *protocol;             /* Protocol in location, e.g, "http" */
      int sendwait;               /* send() I/O timeout. */
      int recvwait;               /* recv() I/O timeout. */
***************
*** 888,892 ****
  
  extern int NsUrlToFile(Ns_DString *dsPtr, NsServer *servPtr, char *url);
! extern char *NsPageRoot(Ns_DString *dest, NsServer *servPtr, char *host);
  
  /*
--- 889,893 ----
  
  extern int NsUrlToFile(Ns_DString *dsPtr, NsServer *servPtr, char *url);
! extern char *NsPageRoot(Ns_DString *dest, NsServer *servPtr, CONST char *host);
  
  /*

Index: str.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/str.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** str.c	10 Jun 2005 17:58:39 -0000	1.2
--- str.c	13 Jun 2005 01:55:14 -0000	1.3
***************
*** 297,298 ****
--- 297,333 ----
      return NULL;
  }
+ 
+ 
+ /*
+  *----------------------------------------------------------------------
+  *
+  * Ns_StrIsHost --
+  *
+  *      Does the given string contain only characters permitted in a
+  *      Host header? Letters, digits, single periods and the colon port
+  *      seperator are valid.
+  *
+  * Results:
+  *      NS_TRUE or NS_FALSE.
+  *
+  * Side effects:
+  *      None. 
+  *
+  *----------------------------------------------------------------------
+  */
+ 
+ int
+ Ns_StrIsHost(CONST char *string)
+ {
+     register CONST char *p;
+ 
+     for (p = string; *p != '\0'; p++) {
+         if (!isalnum(*p) && *p != ':'
+             && (*p != '.' || (p[0] == '.' && p[1] == '.'))) {
+ 
+             return NS_FALSE;
+         }
+     }
+ 
+     return NS_TRUE;
+ }

Index: pathname.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/pathname.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pathname.c	10 Jun 2005 20:53:13 -0000	1.4
--- pathname.c	13 Jun 2005 01:55:14 -0000	1.5
***************
*** 48,52 ****
                        Tcl_Obj *CONST objv[], int cmd);
  static char *MakePath(Ns_DString *dest, va_list *pap);
! static char *ServerRoot(Ns_DString *dest, NsServer *servPtr, char *host);
  
  
--- 48,52 ----
                        Tcl_Obj *CONST objv[], int cmd);
  static char *MakePath(Ns_DString *dest, va_list *pap);
! static char *ServerRoot(Ns_DString *dest, NsServer *servPtr, CONST char *host);
  
  
***************
*** 231,235 ****
  {
      CONST char *p = string;
!     int   i;
  
      for (i = 0; i < levels; ++i) {
--- 231,235 ----
  {
      CONST char *p = string;
!     int         i;
  
      for (i = 0; i < levels; ++i) {
***************
*** 476,480 ****
  
  char *
! NsPageRoot(Ns_DString *dest, NsServer *servPtr, char *host)
  {
      char *path;
--- 476,480 ----
  
  char *
! NsPageRoot(Ns_DString *dest, NsServer *servPtr, CONST char *host)
  {
      char *path;
***************
*** 702,706 ****
  
  char *
! NsTclServerRoot(Ns_DString *dest, char *host, void *arg)
  {
      Ns_TclCallback *cbPtr = arg;
--- 702,706 ----
  
  char *
! NsTclServerRoot(Ns_DString *dest, CONST char *host, void *arg)
  {
      Ns_TclCallback *cbPtr = arg;
***************
*** 782,790 ****
  
  static char *
! ServerRoot(Ns_DString *dest, NsServer *servPtr, char *host)
  {
!     char     *p, *path, *port = NULL;
!     Ns_Conn  *conn;
!     Ns_Set   *headers;
  
      if (servPtr->vhost.serverRootProc != NULL) {
--- 782,791 ----
  
  static char *
! ServerRoot(Ns_DString *dest, NsServer *servPtr, CONST char *rawhost)
  {
!     char       *safehost, *path, *p;
!     Ns_Conn    *conn;
!     Ns_Set     *headers;
!     Ns_DString  ds;
  
      if (servPtr->vhost.serverRootProc != NULL) {
***************
*** 794,798 ****
           */
  
!         path = (servPtr->vhost.serverRootProc)(dest, host, servPtr->vhost.serverRootArg);
          if (path == NULL) {
              goto defpath;
--- 795,799 ----
           */
  
!         path = (servPtr->vhost.serverRootProc)(dest, rawhost, servPtr->vhost.serverRootArg);
          if (path == NULL) {
              goto defpath;
***************
*** 800,842 ****
  
      } else if (servPtr->vhost.enabled
!                && (host != NULL
                     || ((conn = Ns_GetConn()) != NULL
                         && (headers = Ns_ConnHeaders(conn)) != NULL
!                        && (host = Ns_SetIGet(headers, "Host")) != NULL))
!                && *host != '\0') {
  
          /*
!          * Bail out if there are suspicious characters.
           */
  
!         for (p = host; *p != '\0'; p++) {
!             if (isslash(*p) || isspace(*p) || (p[0] == '.' && p[1] == '.')) {
!                 goto defpath;
!             }
          }
-         host = Ns_StrToLower(host);
  
!         path = Ns_MakePath(dest, servPtr->fastpath.serverdir,
!                            servPtr->vhost.hostprefix, NULL);
  
!         if (servPtr->vhost.opts & NSD_STRIP_WWW) {
!             if (strncmp(host, "www.", 4) == 0) {
!                 host = &host[4];
!             }
          }
!         if (servPtr->vhost.opts & NSD_STRIP_PORT) {
!             if ((port = strrchr(host, ':')) != NULL) {
!                 *port = '\0';
!             }
          }
  
!         if (servPtr->vhost.hosthashlevel > 0) {
!             Ns_HashPath(dest, host, servPtr->vhost.hosthashlevel);
!         }
!         Ns_NormalizePath(dest, host);
  
!         if (port != NULL) {
!             *port = ':';
          }
  
      } else {
--- 801,846 ----
  
      } else if (servPtr->vhost.enabled
!                && (rawhost != NULL
                     || ((conn = Ns_GetConn()) != NULL
                         && (headers = Ns_ConnHeaders(conn)) != NULL
!                        && (rawhost = Ns_SetIGet(headers, "Host")) != NULL))
!                && *rawhost != '\0') {
  
          /*
!          * Bail out if there are suspicious characters in the unprocessed Host.
           */
  
!         if (!Ns_StrIsHost(rawhost)) {
!             goto defpath;
          }
  
!         /*
!          * Normalize the Host string.
!          */
  
!         Ns_DStringInit(&ds);
!         safehost = Ns_DStringAppend(&ds, rawhost);
! 
!         Ns_StrToLower(safehost);
!         if (servPtr->vhost.opts & NSD_STRIP_WWW
!             && strncmp(safehost, "www.", 4) == 0) {
!             safehost = &safehost[4];
          }
!         if (servPtr->vhost.opts & NSD_STRIP_PORT
!             && (p = strrchr(safehost, ':')) != NULL) {
!             *p = '\0';
          }
  
!         /*
!          * Build the final path.
!          */
  
!         path = Ns_MakePath(dest, servPtr->fastpath.serverdir,
!                            servPtr->vhost.hostprefix, NULL);
!         if (servPtr->vhost.hosthashlevel > 0) {
!             Ns_HashPath(dest, safehost, servPtr->vhost.hosthashlevel);
          }
+         Ns_NormalizePath(dest, safehost);
+         Ns_DStringFree(&ds);
  
      } else {

Index: server.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** server.c	10 Jun 2005 20:53:13 -0000	1.5
--- server.c	13 Jun 2005 01:55:14 -0000	1.6
***************
*** 439,443 ****
      }
      if (servPtr->vhost.enabled) {
!         NsPageRoot(&ds, servPtr, ns_strdup("www.example.com:80"));
          Ns_Log(Notice, "vhost[%s]: www.example.com:80 -> %s",
                 server, ds.string);
--- 439,443 ----
      }
      if (servPtr->vhost.enabled) {
!         NsPageRoot(&ds, servPtr, "www.example.com:80");
          Ns_Log(Notice, "vhost[%s]: www.example.com:80 -> %s",
                 server, ds.string);

Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** driver.c	11 Jun 2005 10:00:18 -0000	1.10
--- driver.c	13 Jun 2005 01:55:14 -0000	1.11
***************
*** 1,2 ****
--- 1,3 ----
+ 
  /*
   * The contents of this file are subject to the AOLserver Public License
***************
*** 252,260 ****
  
      if (init->opts & NS_DRIVER_SSL) {
! 	defproto = "https";
! 	defport = 443;
      } else {
! 	defproto = "http";
! 	defport = 80;
      }
  
--- 253,261 ----
  
      if (init->opts & NS_DRIVER_SSL) {
!         defproto = "https";
!         defport = 443;
      } else {
!         defproto = "http";
!         defport = 80;
      }
  
***************
*** 347,367 ****
       * Determine the port and then set the HTTP location string either
       * as specified in the config file or constructed from the
!      * hostname and port.
       */
      drvPtr->address = ns_strdup(address);
      if (!Ns_ConfigGetInt(path, "port", &drvPtr->port)) {
! 	drvPtr->port = defport;
      }
      drvPtr->location = Ns_ConfigGetValue(path, "location");
!     if (drvPtr->location != NULL) {
! 	drvPtr->location = ns_strdup(drvPtr->location);
      } else {
!     	Ns_DStringInit(&ds);
! 	Ns_DStringVarAppend(&ds, defproto, "://", host, NULL);
! 	if (drvPtr->port != defport) {
! 	    Ns_DStringPrintf(&ds, ":%d", drvPtr->port);
! 	}
! 	drvPtr->location = Ns_DStringExport(&ds);
      }
      drvPtr->nextPtr = firstDrvPtr;
      firstDrvPtr = drvPtr;
--- 348,371 ----
       * Determine the port and then set the HTTP location string either
       * as specified in the config file or constructed from the
!      * protocol, hostname and port.
       */
+ 
+     drvPtr->protocol = ns_strdup(defproto);
      drvPtr->address = ns_strdup(address);
      if (!Ns_ConfigGetInt(path, "port", &drvPtr->port)) {
!         drvPtr->port = defport;
      }
      drvPtr->location = Ns_ConfigGetValue(path, "location");
!     if (drvPtr->location != NULL && strstr(drvPtr->location, "://")) {
!         drvPtr->location = ns_strdup(drvPtr->location);
      } else {
!         Ns_DStringInit(&ds);
!         Ns_DStringVarAppend(&ds, drvPtr->protocol, "://", host, NULL);
!         if (drvPtr->port != defport) {
!             Ns_DStringPrintf(&ds, ":%d", drvPtr->port);
!         }
!         drvPtr->location = Ns_DStringExport(&ds);
      }
+ 
      drvPtr->nextPtr = firstDrvPtr;
      firstDrvPtr = drvPtr;
***************
*** 392,396 ****
                      Ns_Log(Error, "%s: duplicate host map: %s", module, host);
                  } else {
!                     Ns_DStringVarAppend(&ds, defproto, "://", host, NULL);
                      mapPtr = ns_malloc(sizeof(ServerMap) + ds.length);
                      mapPtr->servPtr  = servPtr;
--- 396,400 ----
                      Ns_Log(Error, "%s: duplicate host map: %s", module, host);
                  } else {
!                     Ns_DStringVarAppend(&ds, drvPtr->protocol, "://", host, NULL);
                      mapPtr = ns_malloc(sizeof(ServerMap) + ds.length);
                      mapPtr->servPtr  = servPtr;

Index: conn.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** conn.c	12 Jun 2005 14:42:44 -0000	1.16
--- conn.c	13 Jun 2005 01:55:13 -0000	1.17
***************
*** 484,489 ****
      NsServer   *servPtr = connPtr->servPtr;
      Ns_Set     *headers;
!     Ns_DString  ds;
!     char       *location, *host, *p;
  
      if (servPtr->vhost.connLocationProc != NULL) {
--- 484,488 ----
      NsServer   *servPtr = connPtr->servPtr;
      Ns_Set     *headers;
!     char       *location, *host;
  
      if (servPtr->vhost.connLocationProc != NULL) {
***************
*** 518,551 ****
          /*
           * Construct a location string from the HTTP host header.
-          *
-          * We do not trust the contents of the Host header, so we scan
-          * it for new lines which may be a reponse splitting attack when
-          * used as the target of a redirect reponse, and the HTML open
-          * tag character which may be a cross-site scripting attack when
-          * embedded within HTML.
           */
  
!         for (p = host; *p != '\0'; ++p) {
!             if (*p == '\n' || *p == '\r' || *p == '<') {
!                 return NULL;
!             }
          }
  
!         /*
!          * Get the scheme from the driver location, default to http://.
!          */
! 
!         Ns_DStringInit(&ds);
!         Ns_DStringAppend(&ds, connPtr->location);
!         location = strstr(ds.string, "://");
!         if (location != NULL) {
!             Ns_DStringTrunc(&ds, (location - ds.string) + 3);
!             Ns_DStringNAppend(dest, ds.string, ds.length);
!         } else {
!             /* server missconfiguration, should begin: SCHEME:// */
!             Ns_DStringAppend(dest, "http://");
!         }
!         Ns_DStringFree(&ds);
!         location = Ns_DStringAppend(dest, host);
  
      } else {
--- 517,528 ----
          /*
           * Construct a location string from the HTTP host header.
           */
  
!         if (!Ns_StrIsHost(host)) {
!             goto deflocation;
          }
  
!         location = Ns_DStringVarAppend(dest,
!             connPtr->drvPtr->protocol, "://", host, NULL);
  
      } else {

[naviserver-commits] naviserver ChangeLog,1.113,1.114

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

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

Modified Files:
	ChangeLog 
Log Message:
        * nsd/str.c: Add new function Ns_StrIsHost.
        * include/ns.h:
        * nsd/nsd.h:
        * nsd/driver.c: Save the protocol seperate from the location in
        the driver structure and ensure the location always begins with a
        "protocol://" string.
        * nsd/server.c:
        * nsd/conn.c:
        * nsd/pathname.c: Simplify code by using protocol direct from
        driver structure and checking Host header with Ns_StrIsHost.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** ChangeLog	13 Jun 2005 01:47:18 -0000	1.113
--- ChangeLog	13 Jun 2005 01:55:13 -0000	1.114
***************
*** 1,4 ****
--- 1,15 ----
  2005-06-12  Stephen Deasey  <sd...@us...>
  
+ 	* nsd/str.c: Add new function Ns_StrIsHost.
+ 	* include/ns.h:
+ 	* nsd/nsd.h:
+ 	* nsd/driver.c: Save the protocol seperate from the location in
+ 	the driver structure and ensure the location always begins with a
+ 	"protocol://" string.
+ 	* nsd/server.c:
+ 	* nsd/conn.c:
+ 	* nsd/pathname.c: Simplify code by using protocol direct from
+ 	driver structure and checking Host header with Ns_StrIsHost.
+ 
  	* nsd/tclsock.c: Removed unused static function.
  

[naviserver-commits] naviserver/nsd tclsock.c,1.4,1.5

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

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

Modified Files:
	tclsock.c 
Log Message:
Removed unused static function.


Index: tclsock.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclsock.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tclsock.c	10 Jun 2005 20:53:13 -0000	1.4
--- tclsock.c	13 Jun 2005 01:47:18 -0000	1.5
***************
*** 70,75 ****
  static int EnterDup(Tcl_Interp *interp, SOCKET sock);
  static int EnterDupedSocks(Tcl_Interp *interp, SOCKET sock);
- static int SockSetBlocking(char *value, Tcl_Interp *interp, int argc,
- 			   	char **argv);
  static int SockSetBlockingObj(char *value, Tcl_Interp *interp, int objc, 
  				Tcl_Obj *CONST objv[]);
--- 70,73 ----
***************
*** 824,861 ****
   *----------------------------------------------------------------------
   *
-  * SockSetBlocking --
-  *
-  *	Set a socket blocking. 
-  *
-  * Results:
-  *	Tcl result. 
-  *
-  * Side effects:
-  *	None. 
-  *
-  *----------------------------------------------------------------------
-  */
- 
- static int
- SockSetBlocking(char *value, Tcl_Interp *interp, int argc, char **argv)
- {
-     Tcl_Channel chan;
- 
-     if (argc != 2) {
-         Tcl_AppendResult(interp, "wrong # args: should be \"",
-             argv[0], " sockId\"", NULL);
-         return TCL_ERROR;
-     }
-     chan = Tcl_GetChannel(interp, argv[1], NULL);
-     if (chan == NULL) {
- 	return TCL_ERROR;
-     }
-     return Tcl_SetChannelOption(interp, chan, "-blocking", value);
- }
- 
- 
- /*
-  *----------------------------------------------------------------------
-  *
   * SockSetBlockingObj --
   *
--- 822,825 ----

[naviserver-commits] naviserver ChangeLog,1.112,1.113

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

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

Modified Files:
	ChangeLog 
Log Message:
Removed unused static function.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** ChangeLog	12 Jun 2005 14:46:40 -0000	1.112
--- ChangeLog	13 Jun 2005 01:47:18 -0000	1.113
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-06-12  Stephen Deasey  <sd...@us...>
+ 
+ 	* nsd/tclsock.c: Removed unused static function.
+ 
  2005-06-12  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] modules/nsclamav nsclamav.c,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsclamav
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsclamav

Modified Files:
	nsclamav.c 
Log Message:
compiler warnings silence


Index: nsclamav.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsclamav/nsclamav.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsclamav.c	8 Jun 2005 20:03:40 -0000	1.2
--- nsclamav.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 59,70 ****
      path = Ns_ConfigGetPath(server,module,NULL);
  
!     if(!(db = Ns_ConfigGet(path,"dbdir"))) db = cl_retdbdir();
      if((rc = cl_loaddbdir(db,&ClamAvRoot,&virnum))) {
        Ns_Log(Error,"nsclamav: failed to load db: %s",cl_strerror(rc));
        return NS_ERROR;
      }
!     if((rc = cl_buildtrie(ClamAvRoot))) {
        Ns_Log(Error,"nsclamav: failed to build trie: %s",cl_strerror(rc));
!       cl_freetrie(ClamAvRoot);
        return NS_ERROR;
      }
--- 59,70 ----
      path = Ns_ConfigGetPath(server,module,NULL);
  
!     if(!(db = Ns_ConfigGet(path,"dbdir"))) db = (char*)cl_retdbdir();
      if((rc = cl_loaddbdir(db,&ClamAvRoot,&virnum))) {
        Ns_Log(Error,"nsclamav: failed to load db: %s",cl_strerror(rc));
        return NS_ERROR;
      }
!     if((rc = cl_build(ClamAvRoot))) {
        Ns_Log(Error,"nsclamav: failed to build trie: %s",cl_strerror(rc));
!       cl_free(ClamAvRoot);
        return NS_ERROR;
      }
***************
*** 89,93 ****
  ClamAvCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int rc;
      char *buf;
      const char *virname;
--- 89,93 ----
  ClamAvCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int rc,cmd,bsize;
      char *buf;
      const char *virname;
***************
*** 97,103 ****
          cmdScanBuff,
          cmdScanFile
!     } cmd;
        
!     static char *sCmd[] = {
          "scanbuff",
          "scanfile",
--- 97,103 ----
          cmdScanBuff,
          cmdScanFile
!     };
        
!     static const char *sCmd[] = {
          "scanbuff",
          "scanfile",
***************
*** 106,110 ****
  
      if(objc < 3) {
!       Tcl_AppendResult(interp, "wrong # args: should be ns_savi command ?args ...?",0);
        return TCL_ERROR;
      }
--- 106,110 ----
  
      if(objc < 3) {
!       Tcl_AppendResult(interp, "wrong # args: should be ns_clamav command ?args ...?",0);
        return TCL_ERROR;
      }
***************
*** 114,119 ****
      switch(cmd) {
       case cmdScanBuff:
!         buf = Tcl_GetStringFromObj(objv[2],(int*)&size);
!         rc = cl_scanbuff(buf,size,&virname,ClamAvRoot);
          switch(rc) {
           case CL_VIRUS:
--- 114,119 ----
      switch(cmd) {
       case cmdScanBuff:
!         buf = Tcl_GetStringFromObj(objv[2],(int*)&bsize);
!         rc = cl_scanbuff(buf,bsize,&virname,ClamAvRoot);
          switch(rc) {
           case CL_VIRUS:

[naviserver-commits] modules/nschartdir nschartdir.c,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nschartdir
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nschartdir

Modified Files:
	nschartdir.c 
Log Message:
compiler warnings silence


Index: nschartdir.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nschartdir/nschartdir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nschartdir.c	8 Jun 2005 20:03:38 -0000	1.2
--- nschartdir.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 195,199 ****
        if(now - chart->access_time > chartIdleTimeout) {
          Chart *next = chart->next;
!         Ns_Log(Notice,"ns_chartdir: GC: inactive chart %d",chart->id);
          freeChart(chart,0);
          chart = next;
--- 195,199 ----
        if(now - chart->access_time > chartIdleTimeout) {
          Chart *next = chart->next;
!         Ns_Log(Notice,"ns_chartdir: GC: inactive chart %ld",chart->id);
          freeChart(chart,0);
          chart = next;
***************
*** 457,460 ****
--- 457,461 ----
  static int XAxisCmd(int second,Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
+     int cmd;
      enum commands {
          cmdSetTitle, cmdSetLabels,
***************
*** 463,469 ****
          cmdSetWidth, cmdAddMark,
          cmdAddZone
!     } cmd;
  
!     static char *sCmd[] = {
          "settitle", "setlabels",
          "setlabelstyle", "setindent",
--- 464,470 ----
          cmdSetWidth, cmdAddMark,
          cmdAddZone
!     };
  
!     static const char *sCmd[] = {
          "settitle", "setlabels",
          "setlabelstyle", "setindent",
***************
*** 627,630 ****
--- 628,632 ----
  static int YAxisCmd(int second,Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
+     int cmd;
      enum commands {
          cmdSetTitle, cmdSetFormat,
***************
*** 635,641 ****
          cmdAddMark, cmdAddZone,
          cmdSyncYAxis, cmdSetYAxisOnRight
!     } cmd;
  
!     static char *sCmd[] = {
          "settitle", "setformat",
          "setlabelstyle", "settopmargin",
--- 637,643 ----
          cmdAddMark, cmdAddZone,
          cmdSyncYAxis, cmdSetYAxisOnRight
!     };
  
!     static const char *sCmd[] = {
          "settitle", "setformat",
          "setlabelstyle", "settopmargin",
***************
*** 857,861 ****
  static int LayerCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
!     int layer, datasetID;
      DataSet *dataset;
  
--- 859,863 ----
  static int LayerCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
!     int cmd, layer, datasetID;
      DataSet *dataset;
  
***************
*** 868,874 ****
          cmdSetBorderColor, cmdSetDataLabelStyle,
          cmdSetAggregateLabelStyle
!     } cmd;
  
!     static char *sCmd[] = {
          "create", "setlinewidth",
          "setdatasymbol", "dataset",
--- 870,876 ----
          cmdSetBorderColor, cmdSetDataLabelStyle,
          cmdSetAggregateLabelStyle
!     };
  
!     static const char *sCmd[] = {
          "create", "setlinewidth",
          "setdatasymbol", "dataset",
***************
*** 1290,1296 ****
      int fontsize = 8;
      int fontcolor = TextColor;
-     int bgcolor = Transparent;
-     int edgecolor = Transparent;
-     int border = 1;
      int vertical = 0;
      double angle = 0;
--- 1292,1295 ----
***************
*** 1315,1324 ****
  static int PieCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
      enum commands {
          cmdSetData, cmdSet3D,
          cmdSetPieSize
!     } cmd;
  
!     static char *sCmd[] = {
          "setdata", "set3d",
          "setpiesize",
--- 1314,1324 ----
  static int PieCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp)
  {
+     int cmd;
      enum commands {
          cmdSetData, cmdSet3D,
          cmdSetPieSize
!     };
  
!     static const char *sCmd[] = {
          "setdata", "set3d",
          "setpiesize",
***************
*** 1386,1390 ****
  static int ChartCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
!     int i;
      Chart *chart;
  
--- 1386,1390 ----
  static int ChartCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
!     int i,cmd;
      Chart *chart;
  
***************
*** 1408,1414 ****
          cmdSave, cmdDestroy,
          cmdImage, cmdReturn
!     } cmd;
  
!     static char *sCmd[] = {
          "gc", "charts",
          "version",
--- 1408,1414 ----
          cmdSave, cmdDestroy,
          cmdImage, cmdReturn
!     };
  
!     static const char *sCmd[] = {
          "gc", "charts",
          "version",