richter 02/01/22 08:52:44
Modified: . Tag: Embperl2c epeval.c epmain.c eppriv.h
epprovider.c eputil.c
Log:
Revision Changes Path
No revision
No revision
1.23.4.17 +4 -1 embperl/epeval.c
Index: epeval.c
===================================================================
RCS file: /home/cvs/embperl/epeval.c,v
retrieving revision 1.23.4.16
retrieving revision 1.23.4.17
diff -u -r1.23.4.16 -r1.23.4.17
--- epeval.c 19 Jan 2002 14:13:41 -0000 1.23.4.16
+++ epeval.c 22 Jan 2002 16:52:43 -0000 1.23.4.17
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epeval.c,v 1.23.4.16 2002/01/19 14:13:41 richter Exp $
+# $Id: epeval.c,v 1.23.4.17 2002/01/22 16:52:43 richter Exp $
#
###################################################################################*/
@@ -228,6 +228,9 @@
tainted = 0 ;
+ if (!sName)
+ sName = "" ;
+
if (*sName)
sRef = "; \\&" ;
1.75.4.86 +2 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.85
retrieving revision 1.75.4.86
diff -u -r1.75.4.85 -r1.75.4.86
--- epmain.c 22 Jan 2002 10:59:34 -0000 1.75.4.85
+++ epmain.c 22 Jan 2002 16:52:43 -0000 1.75.4.86
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.85 2002/01/22 10:59:34 richter Exp $
+# $Id: epmain.c,v 1.75.4.86 2002/01/22 16:52:43 richter Exp $
#
###################################################################################*/
@@ -1274,7 +1274,7 @@
{
SV * pOut = NULL ;
- int bOutToMem = SvROK (pOutData) ;
+ int bOutToMem = pOutData && SvROK (pOutData) ;
SV * pCookie = NULL ;
SV * pCookie2 = NULL ;
int bError = 0 ;
1.1.2.9 +8 -8 embperl/Attic/eppriv.h
Index: eppriv.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppriv.h,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- eppriv.h 22 Jan 2002 10:59:34 -0000 1.1.2.8
+++ eppriv.h 22 Jan 2002 16:52:43 -0000 1.1.2.9
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eppriv.h,v 1.1.2.8 2002/01/22 10:59:34 richter Exp $
+# $Id: eppriv.h,v 1.1.2.9 2002/01/22 16:52:43 richter Exp $
#
###################################################################################*/
@@ -221,12 +221,12 @@
void embperl_DefaultReqConfig (/*in*/ tReqConfig *pCfg) ;
void embperl_DefaultComponentConfig (/*in*/ tComponentConfig *pCfg) ;
-void Embperl__App_new_init(aTHX_ tApp * pApp, SV * pPerlParam, int overwrite) ;
-void Embperl__Req_new_init (aTHX_ tReq * r, SV * pPerlParam, int overwrite) ;
-void Embperl__Req__Config_new_init (aTHX_ tReqConfig * r, SV * pPerlParam, int
overwrite) ;
-void Embperl__Req__Param_new_init (aTHX_ tReqParam * r, SV * pPerlParam, int
overwrite) ;
-void Embperl__Component_new_init (aTHX_ tComponent * c, SV * pPerlParam, int
overwrite) ;
-void Embperl__Component__Config_new_init (aTHX_ tComponentConfig * c, SV *
pPerlParam, int overwrite) ;
-void Embperl__Component__Param_new_init (aTHX_ tComponentParam * c, SV *
pPerlParam, int overwrite) ;
+void Embperl__App_new_init(pTHX_ tApp * pApp, SV * pPerlParam, int overwrite) ;
+void Embperl__Req_new_init (pTHX_ tReq * r, SV * pPerlParam, int overwrite) ;
+void Embperl__Req__Config_new_init (pTHX_ tReqConfig * r, SV * pPerlParam, int
overwrite) ;
+void Embperl__Req__Param_new_init (pTHX_ tReqParam * r, SV * pPerlParam, int
overwrite) ;
+void Embperl__Component_new_init (pTHX_ tComponent * c, SV * pPerlParam, int
overwrite) ;
+void Embperl__Component__Config_new_init (pTHX_ tComponentConfig * c, SV *
pPerlParam, int overwrite) ;
+void Embperl__Component__Param_new_init (pTHX_ tComponentParam * c, SV *
pPerlParam, int overwrite) ;
1.1.2.22 +4 -2 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- epprovider.c 22 Jan 2002 15:46:22 -0000 1.1.2.21
+++ epprovider.c 22 Jan 2002 16:52:43 -0000 1.1.2.22
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.21 2002/01/22 15:46:22 richter Exp $
+# $Id: epprovider.c,v 1.1.2.22 2002/01/22 16:52:43 richter Exp $
#
###################################################################################*/
@@ -831,6 +831,7 @@
SV * pSyntaxSV ;
SV * pSyntaxRV ;
SV * pSyntaxPV ;
+ tTokenTable * pSyntax ;
const char * sSyntax = GetHashValueStr (aTHX_ pParam, "syntax", r ->
Component.Config.sSyntax) ;
if ((rc = Provider_NewDependOne (r, sizeof(tProviderEpParse), "source", pItem,
pProviderClass, pParam)) != ok)
@@ -854,7 +855,8 @@
return rcUnknownSyntax ;
}
- ((tProviderEpParse *)pItem -> pProvider) -> pTokenTable =
epxs_sv2_Embperl__Syntax(pSyntaxSV) ;
+ pSyntax = epxs_sv2_Embperl__Syntax(pSyntaxRV) ;
+ ((tProviderEpParse *)pItem -> pProvider) -> pTokenTable = pSyntax ;
pItem -> bCache = FALSE ; /* do not cache, because it's cached by the compiler
*/
1.15.4.35 +2 -2 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.34
retrieving revision 1.15.4.35
diff -u -r1.15.4.34 -r1.15.4.35
--- eputil.c 18 Jan 2002 16:22:36 -0000 1.15.4.34
+++ eputil.c 22 Jan 2002 16:52:43 -0000 1.15.4.35
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.34 2002/01/18 16:22:36 richter Exp $
+# $Id: eputil.c,v 1.15.4.35 2002/01/22 16:52:43 richter Exp $
#
###################################################################################*/
@@ -1552,7 +1552,7 @@
epTHX_
if ((r -> Component.Config.bOptions & optDisableChdir) == 0 && sInputfile !=
NULL && sInputfile != '\0' &&
- !SvROK(r -> Component.Param.pInput) && !r -> Component.sResetDir[0])
+ (!r -> Component.Param.pInput || !SvROK(r -> Component.Param.pInput)) && !r ->
Component.sResetDir[0])
{
char dir[PATH_MAX];
#ifdef WIN32
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
