You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/09/09 10:15:51 UTC

cvs commit: tcl-websh/src/generic filecounter.c filecounter.h

ronnie      2005/09/09 01:15:51

  Modified:    src/generic filecounter.c filecounter.h
  Log:
  - all created files with configurable permissions
  - pass requestData to createSeqNoGenerator to support that
  
  Revision  Changes    Path
  1.7       +15 -6     tcl-websh/src/generic/filecounter.c
  
  Index: filecounter.c
  ===================================================================
  RCS file: /home/cvs/tcl-websh/src/generic/filecounter.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- filecounter.c	11 Sep 2002 13:54:01 -0000	1.6
  +++ filecounter.c	9 Sep 2005 08:15:51 -0000	1.7
  @@ -13,13 +13,13 @@
    * ------------------------------------------------------------------------- */
   
   #include "filecounter.h"
  -#include "tcl.h"
   
   /* --------------------------------------------------------------------------
    * Init
    * --------------------------------------------------------------------------*/
   int filecounter_Init(Tcl_Interp * interp)
   {
  +    RequestData * requestData = NULL;
   
       if (interp == NULL)
   	return TCL_ERROR;
  @@ -28,12 +28,17 @@
        * ClientData
        * --------------------------------------------------------------------*/
   
  +    /* we need the request data, so that we have access 
  +       to default file permissions */
  +
  +    requestData = (RequestData *) Tcl_GetAssocData(interp, WEB_REQ_ASSOC_DATA, NULL);
  +
       /* ----------------------------------------------------------------------
        * register commands
        * ------------------------------------------------------------------- */
       Tcl_CreateObjCommand(interp, "web::filecounter",
   			 (Tcl_ObjCmdProc *) filecounter,
  -			 (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
  +			 (ClientData) requestData, (Tcl_CmdDeleteProc *) NULL);
   
       /* ----------------------------------------------------------------------
        * register private data with interp
  @@ -157,6 +162,8 @@
   		int objc, Tcl_Obj * CONST objv[])
   {
   
  +    RequestData * requestData = (RequestData *) clientData;
  +
       Tcl_Obj *hnameobj, *fnameobj, *seedobj, *maxobj,
   	*minobj, *incrobj, *maskobj, *wrapobj;
       SeqNoGenerator *seqnogen = NULL;
  @@ -209,7 +216,8 @@
       /* ----------------------------------------------------------------------
        * create SeqNoGenerator
        * ------------------------------------------------------------------- */
  -    seqnogen = createSeqNoGenerator(hnameobj, fnameobj, seedobj, minobj,
  +    seqnogen = createSeqNoGenerator(requestData,
  +				    hnameobj, fnameobj, seedobj, minobj,
   				    maxobj, incrobj, maskobj, wrapobj);
   
       if (seqnogen == NULL) {
  @@ -239,7 +247,8 @@
    * Member functions of SeqNoGenerator
    * --------------------------------------------------------------------- */
   
  -SeqNoGenerator *createSeqNoGenerator(Tcl_Obj * hn, Tcl_Obj * fn,
  +SeqNoGenerator *createSeqNoGenerator(RequestData * requestData,
  +				     Tcl_Obj * hn, Tcl_Obj * fn,
   				     Tcl_Obj * seed, Tcl_Obj * min,
   				     Tcl_Obj * max, Tcl_Obj * incr, 
   				     Tcl_Obj * mask, Tcl_Obj * wrap)
  @@ -272,7 +281,7 @@
       else if (Tcl_GetIntFromObj(NULL, incr, &(seqnogen->incrValue)) == TCL_ERROR)
   	err++;
       if (mask == NULL)
  -       seqnogen->mask = WEB_FILECOUNTER_MASK;
  +       seqnogen->mask = requestData->filePermissions;
       else if (Tcl_GetIntFromObj(NULL, mask, &(seqnogen->mask)) == TCL_ERROR)
           err++;
       if (wrap == NULL)
  
  
  
  1.5       +4 -3      tcl-websh/src/generic/filecounter.h
  
  Index: filecounter.h
  ===================================================================
  RCS file: /home/cvs/tcl-websh/src/generic/filecounter.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- filecounter.h	7 Mar 2002 10:56:28 -0000	1.4
  +++ filecounter.h	9 Sep 2005 08:15:51 -0000	1.5
  @@ -16,6 +16,7 @@
   #include "args.h"
   #include "filelock.h"
   #include "log.h"
  +#include "request.h"
   #include "tcl.h"
   
   #ifndef FILECOUNTER_H
  @@ -23,7 +24,6 @@
   
   #define WEB_FILECOUNTER_MAXVAL 2147483647
   #define WEB_FILECOUNTER_MINVAL 0
  -#define WEB_FILECOUNTER_MASK 0644
   #define WEB_FILECOUNTER_INCR 1
   #define WEB_FILECOUNTER_SEED 0
   #define WEB_FILECOUNTER_WRAP 0
  @@ -47,7 +47,8 @@
   }
   SeqNoGenerator;
   
  -SeqNoGenerator *createSeqNoGenerator(Tcl_Obj * hn, Tcl_Obj * fn,
  +SeqNoGenerator *createSeqNoGenerator(RequestData * requestData,
  +				     Tcl_Obj * hn, Tcl_Obj * fn,
   				     Tcl_Obj * seed, Tcl_Obj * min,
   				     Tcl_Obj * max, Tcl_Obj * incr,
   				     Tcl_Obj * mask, Tcl_Obj * wrap);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org