diff options
| author | Chris Nandor <pudge@pobox.com> | 2001-02-12 19:02:43 -0500 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-02-13 14:22:50 +0000 |
| commit | 084592ab0b76f3cbd4d089afb08ccea7ba1c9dd8 (patch) | |
| tree | 8a175b8128ee3a57f4f96b96a3290adb0eb07399 /pp_ctl.c | |
| parent | 67127a85e86d9ef67c9a136224ffce237c7df32b (diff) | |
| download | perl-084592ab0b76f3cbd4d089afb08ccea7ba1c9dd8.tar.gz | |
buncha MacPerl patches for bleadperl
Message-Id: <p05010404b6ae6f85e07a@[10.0.1.177]>
p4raw-id: //depot/perl@8792
Diffstat (limited to 'pp_ctl.c')
| -rw-r--r-- | pp_ctl.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -3110,22 +3110,27 @@ PP(pp_require) /* prepare to compile file */ +#ifdef MACOS_TRADITIONAL if (PERL_FILE_IS_ABSOLUTE(name) - || (*name == '.' && (name[1] == '/' || - (name[1] == '.' && name[2] == '/')))) + || (*name == ':' && name[1] != ':' && strchr(name+2, ':'))) { tryname = name; tryrsfp = doopen_pmc(name,PERL_SCRIPT_MODE); -#ifdef MACOS_TRADITIONAL /* We consider paths of the form :a:b ambiguous and interpret them first as global then as local */ - if (!tryrsfp && name[0] == ':' && name[1] != ':' && strchr(name+2, ':')) + if (!tryrsfp && *name == ':' && name[1] != ':' && strchr(name+2, ':')) goto trylocal; } else trylocal: { #else + if (PERL_FILE_IS_ABSOLUTE(name) + || (*name == '.' && (name[1] == '/' || + (name[1] == '.' && name[2] == '/')))) + { + tryname = name; + tryrsfp = doopen_pmc(name,PERL_SCRIPT_MODE); } else { #endif |