You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2004/02/16 20:00:07 UTC

cvs commit: httpd-python/src/include psp_flex.h

grisha      2004/02/16 11:00:07

  Modified:    src      psp_parser.c
               src/include psp_flex.h
  Log:
  regenerated psp_parser.c
  
  Revision  Changes    Path
  1.18      +11 -7     httpd-python/src/psp_parser.c
  
  Index: psp_parser.c
  ===================================================================
  RCS file: /home/cvs/httpd-python/src/psp_parser.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- psp_parser.c	4 Nov 2003 20:30:39 -0000	1.17
  +++ psp_parser.c	16 Feb 2004 19:00:06 -0000	1.18
  @@ -1052,7 +1052,11 @@
       filename = strchr(yytext, '"') + 1;
       filename[strchr(filename, '"')-filename] = '\0';
   
  -    if (PSP_PG(dir)) {
  +    /* XXX The absolute path check won't work on Windows,
  +     * needs to be corrected
  +     */
  +
  +    if (PSP_PG(dir) && filename[0] != '/') {
           path = malloc(strlen(filename)+strlen(PSP_PG(dir))+1);
           if (path == NULL) {
               PyErr_NoMemory();
  @@ -1081,24 +1085,24 @@
   	YY_BREAK
   case 18:
   YY_RULE_SETUP
  -#line 255 "psp_parser.l"
  +#line 259 "psp_parser.l"
   {
       BEGIN TEXT;
   }
   	YY_BREAK
   case 19:
   YY_RULE_SETUP
  -#line 259 "psp_parser.l"
  +#line 263 "psp_parser.l"
   {
       BEGIN TEXT;
   }
   	YY_BREAK
   case 20:
   YY_RULE_SETUP
  -#line 263 "psp_parser.l"
  +#line 267 "psp_parser.l"
   ECHO;
   	YY_BREAK
  -#line 1102 "psp_parser.c"
  +#line 1106 "psp_parser.c"
   case YY_STATE_EOF(INITIAL):
   case YY_STATE_EOF(PYCODE):
   case YY_STATE_EOF(INDENT):
  @@ -2218,7 +2222,7 @@
   #undef YY_DECL_IS_OURS
   #undef YY_DECL
   #endif
  -#line 263 "psp_parser.l"
  +#line 267 "psp_parser.l"
   
   
   
  
  
  
  1.9       +1 -1      httpd-python/src/include/psp_flex.h
  
  Index: psp_flex.h
  ===================================================================
  RCS file: /home/cvs/httpd-python/src/include/psp_flex.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- psp_flex.h	11 Aug 2003 20:13:03 -0000	1.8
  +++ psp_flex.h	16 Feb 2004 19:00:07 -0000	1.9
  @@ -321,7 +321,7 @@
   #undef YY_DECL_IS_OURS
   #undef YY_DECL
   #endif
  -#line 263 "psp_parser.l"
  +#line 267 "psp_parser.l"
   
   
   #line 328 "include/psp_flex.h"