Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.182
 
1.183
 
MAIN:plunky:20121029171246
 
cpp.c
_>485485                 stringbuf = osp;
 486486                 c = yylex();
 487487         }
<>488 -        if (c != STRING && c != '<')
 489 -                goto bad;
490488 
 491489         if (c == '<') {
 492490                 fn = stringbuf;
<>493 -                while ((c = sloscan()) != '>' && c != '\n') {
 494 -                        if (c == '\n') /* XXX check - cannot reach */
  491+                while ((c = sloscan()) != '>') {
  492+                        if (c == 0)
  493+                                prem();
  494+                        if (c == '\n')
495495                                 goto bad;
 496496                         savstr(yytext);
 497497                 }
     
 !
503503                 if (c != '\n')
 504504                         goto bad;
 505505                 safefn = fn;
<>506 -        } else {
  506+        } else if (c == STRING) {
507507                 usch *nm = stringbuf;
 508508 
<>509 -                yytext[strlen((char *)yytext)-1] = 0;
 510 -                fn = &yytext[1];
  509+                fn = yytext;
  510+                if (*fn++ == 'L')
  511+                        fn++;
  512+                fn[strlen((char *)fn) - 1] = 0;
511513                 /* first try to open file relative to previous file */
 512514                 /* but only if it is not an absolute path */
 513515                 if (*fn != '/') {
     
 !
528530                 if (pushfile(nm, safefn, 0, NULL) == 0)
 529531                         goto okret;
 530532                 /* XXX may lose stringbuf space */
<>531 -        }
  533+        } else
  534+                goto bad;
<_532535 
 533536         if (fsrch(safefn, 0, incdir[0]))
 534537                 goto okret;
FishEye: Open Source License registered to PCC.
Your maintenance has expired. You can renew your license at http://www.atlassian.com/fisheye/renew
Atlassian FishEye, CVS analysis. (Version:1.6.3 Build:build-336 2008-11-04) - Administration - Page generated 2014-09-03 06:53 +0200