diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-15 01:34:53 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-15 01:34:53 +0000 |
| commit | 48c036b1eb8f866b948f33704ee6152323a5aad9 (patch) | |
| tree | 6e91e012efd9b99283cda0a0e070452f8d41eb8a /toke.c | |
| parent | ee580363108be8ac33155650c6c18d2e5cf051f3 (diff) | |
| download | perl-48c036b1eb8f866b948f33704ee6152323a5aad9.tar.gz | |
[win32] merge change#905 from maintbranch, minor fixes to get
clean build+test on Solaris
p4raw-link: @905 on //depot/maint-5.004/perl: 15e73149a8419f18d739227762eab108524cec56
p4raw-id: //depot/win32/perl@976
Diffstat (limited to 'toke.c')
| -rw-r--r-- | toke.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -4858,6 +4858,8 @@ void pmflag(U16 *pmfl, int ch) *pmfl |= PMf_MULTILINE; else if (ch == 's') *pmfl |= PMf_SINGLELINE; + else if (ch == 't') + *pmfl |= PMf_TAINTMEM; else if (ch == 'x') *pmfl |= PMf_EXTENDED; } @@ -4879,7 +4881,7 @@ scan_pat(char *start) pm = (PMOP*)newPMOP(OP_MATCH, 0); if (multi_open == '?') pm->op_pmflags |= PMf_ONCE; - while (*s && strchr("iogcmsx", *s)) + while (*s && strchr("iogcmstx", *s)) pmflag(&pm->op_pmflags,*s++); pm->op_pmpermflags = pm->op_pmflags; @@ -4924,13 +4926,15 @@ scan_subst(char *start) multi_start = first_start; /* so whole substitution is taken together */ pm = (PMOP*)newPMOP(OP_SUBST, 0); - while (*s && strchr("iogcmsex", *s)) { + while (*s) { if (*s == 'e') { s++; es++; } - else + else if (strchr("iogcmstx", *s)) pmflag(&pm->op_pmflags,*s++); + else + break; } if (es) { |