diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-30 13:29:13 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-30 13:29:13 +0000 |
| commit | e69a2255d0db4d110e403864fcb97407ce8e4ff9 (patch) | |
| tree | d06bcf736b723222fffb9ae32c9018de2277632a /perl.c | |
| parent | 5df8692c9adbc24ad55369ec6cb2fef5fc7cdcaa (diff) | |
| download | perl-e69a2255d0db4d110e403864fcb97407ce8e4ff9.tar.gz | |
Integrate macperl patch #16868.
p4raw-id: //depot/perl@16882
p4raw-integrated: from //depot/macperl@16881 'copy in'
ext/B/B/Concise.pm ext/B/t/deparse.t ext/B/t/terse.t
ext/DynaLoader/DynaLoader_pm.PL ext/IO/lib/IO/t/io_dup.t
ext/POSIX/t/sigaction.t ext/PerlIO/t/encoding.t
ext/Socket/Socket.t lib/AutoSplit.t
lib/Net/Ping/t/110_icmp_inst.t lib/Net/hostent.t
lib/Pod/t/Usage.t lib/Pod/t/pod2html-lib.pl
lib/Test/Harness/t/callback.t lib/blib.pm lib/strict.t
lib/subs.t t/lib/filter-util.pl t/lib/warnings/doio
t/lib/warnings/mg t/x2p/s2p.t (@16123..)
lib/Test/Simple/t/exit.t (@16230..) lib/open.t lib/warnings.t
(@16255..) perl.c (@16475..) lib/Unicode/Collate.pm
lib/Unicode/UCD.t (@16651..) ext/PerlIO/t/fallback.t
lib/Test/Harness/t/strap-analyze.t
lib/Test/Harness/t/test-harness.t (@16825..)
p4raw-integrated: from //depot/macperl@16868 'copy in' lib/blib.t
(@16123..) t/lib/warnings/op (@16230..) ext/Cwd/t/cwd.t
ext/Digest/MD5/t/files.t (@16475..) 'merge in'
ext/Storable/t/utf8hash.t lib/Test/Harness/Straps.pm (@16730..)
Diffstat (limited to 'perl.c')
| -rw-r--r-- | perl.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -1648,7 +1648,9 @@ S_run_body(pTHX_ I32 oldscope) if (PL_minus_c) { #ifdef MACOS_TRADITIONAL - PerlIO_printf(Perl_error_log, "# %s syntax OK\n", MacPerl_MPWFileName(PL_origfilename)); + PerlIO_printf(Perl_error_log, "%s%s syntax OK\n", + (gMacPerl_ErrorFormat ? "# " : ""), + MacPerl_MPWFileName(PL_origfilename)); #else PerlIO_printf(Perl_error_log, "%s syntax OK\n", PL_origfilename); #endif @@ -3787,8 +3789,11 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers) p = Nullch; /* break out */ } #ifdef MACOS_TRADITIONAL - if (!strchr(SvPVX(libdir), ':')) - sv_insert(libdir, 0, 0, ":", 1); + if (!strchr(SvPVX(libdir), ':')) { + char buf[256]; + + sv_setpv(libdir, MacPerl_CanonDir(SvPVX(libdir), buf, 0)); + } if (SvPVX(libdir)[SvCUR(libdir)-1] != ':') sv_catpv(libdir, ":"); #endif |