diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-10-27 22:15:10 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-10-27 22:15:10 +0000 |
| commit | 23ea4b99ccf7af7822f8d0962ac2875da1f8225b (patch) | |
| tree | 15837a449e01b57e8f8d9da804c6da2d4c07fd6d /gnu/usr.bin/perl | |
| parent | ee0ec985db7a78bbce065c25b928ac9ceacef770 (diff) | |
stock perl 5.8.0 from CPAN
Diffstat (limited to 'gnu/usr.bin/perl')
43 files changed, 159 insertions, 157 deletions
diff --git a/gnu/usr.bin/perl/NetWare/CLIBsdio.h b/gnu/usr.bin/perl/NetWare/CLIBsdio.h index b2db369c4ae..76aba02d601 100644 --- a/gnu/usr.bin/perl/NetWare/CLIBsdio.h +++ b/gnu/usr.bin/perl/NetWare/CLIBsdio.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/CLIBstr.h b/gnu/usr.bin/perl/NetWare/CLIBstr.h index 4b26fc987b3..e025c0428ca 100644 --- a/gnu/usr.bin/perl/NetWare/CLIBstr.h +++ b/gnu/usr.bin/perl/NetWare/CLIBstr.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/CLIBstuf.c b/gnu/usr.bin/perl/NetWare/CLIBstuf.c index 26a4a4b5022..0e649dce976 100644 --- a/gnu/usr.bin/perl/NetWare/CLIBstuf.c +++ b/gnu/usr.bin/perl/NetWare/CLIBstuf.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/CLIBstuf.h b/gnu/usr.bin/perl/NetWare/CLIBstuf.h index 78671fd1826..90f3557989c 100644 --- a/gnu/usr.bin/perl/NetWare/CLIBstuf.h +++ b/gnu/usr.bin/perl/NetWare/CLIBstuf.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/Main.c b/gnu/usr.bin/perl/NetWare/Main.c index 5116cbcfe1b..d23ce6843bd 100644 --- a/gnu/usr.bin/perl/NetWare/Main.c +++ b/gnu/usr.bin/perl/NetWare/Main.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/NWTInfo.c b/gnu/usr.bin/perl/NetWare/NWTInfo.c index b057d56b2ad..4180fa796f6 100644 --- a/gnu/usr.bin/perl/NetWare/NWTInfo.c +++ b/gnu/usr.bin/perl/NetWare/NWTInfo.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/NWUtil.c b/gnu/usr.bin/perl/NetWare/NWUtil.c index 6d60dfbabdb..f23774a6688 100644 --- a/gnu/usr.bin/perl/NetWare/NWUtil.c +++ b/gnu/usr.bin/perl/NetWare/NWUtil.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -11,7 +11,7 @@ * FILENAME : NWUtil.c * DESCRIPTION : Utility functions for NetWare implementation of Perl. * Author : HYAK - * Date : January 2001. + * Date : Januray 2001. * */ @@ -517,8 +517,8 @@ void fnAppendArgument(PCOMMANDLINEPARSER pclp, char *new_arg) char *fnSkipToken(char *s, char *r) { - char *t=NULL; - char quote = '\0'; // NULL, single quote, or double quote + register char *t=NULL; + register char quote = '\0'; // NULL, single quote, or double quote char ch = '\0'; for (t=s; t[0]; t++) @@ -577,11 +577,11 @@ char *fnSkipToken(char *s, char *r) char *fnScanToken(char *x, char *r) { - char *s = x; // input string position - char *t = x; // output string position - char quote = '\0'; // either NULL, or single quote, or double quote - char ch = '\0'; - char c = '\0'; + register char *s = x; // input string position + register char *t = x; // output string position + register char quote = '\0'; // either NULL, or single quote, or double quote + register char ch = '\0'; + register char c = '\0'; while (*s) { diff --git a/gnu/usr.bin/perl/NetWare/Nwmain.c b/gnu/usr.bin/perl/NetWare/Nwmain.c index 0b9728a8ac8..b49fc80f70b 100644 --- a/gnu/usr.bin/perl/NetWare/Nwmain.c +++ b/gnu/usr.bin/perl/NetWare/Nwmain.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -169,7 +169,7 @@ void main(int argc, char *argv[]) // Create the file NUL if not present. This is done only once per NLM load. // This is required for -e. - // Earlier versions were creating temporary files (in perl.c file) for -e. + // Earlier verions were creating temporary files (in perl.c file) for -e. // Now, the technique of creating temporary files are removed since they were // fragile or insecure or slow. It now uses the memory by setting // the BIT_BUCKET to "nul" on Win32, which is equivalent to /dev/nul of Unix. diff --git a/gnu/usr.bin/perl/NetWare/Nwpipe.c b/gnu/usr.bin/perl/NetWare/Nwpipe.c index ce9c19800d6..9caf2daa4a9 100644 --- a/gnu/usr.bin/perl/NetWare/Nwpipe.c +++ b/gnu/usr.bin/perl/NetWare/Nwpipe.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/config_h.PL b/gnu/usr.bin/perl/NetWare/config_h.PL index 67d5bc3f0b4..d0eb05a30f0 100644 --- a/gnu/usr.bin/perl/NetWare/config_h.PL +++ b/gnu/usr.bin/perl/NetWare/config_h.PL @@ -19,7 +19,7 @@ $patchlevel =~ s|~VERSION~|$Config{version}|g; $patchlevel ||= $Config{version}; $patchlevel = qq["$patchlevel"]; -open(SH,'<',$name) || die "Cannot open $name:$!"; +open(SH,"<$name") || die "Cannot open $name:$!"; while (<SH>) { last if /^sed/; @@ -42,7 +42,7 @@ eval $str; die "$str:$@" if $@; -open(H,'>',"$file.new") || die "Cannot open $file.new:$!"; +open(H,">$file.new") || die "Cannot open $file.new:$!"; binmode H; # no CRs (which cause a spurious rebuild) while (<SH>) { diff --git a/gnu/usr.bin/perl/NetWare/config_sh.PL b/gnu/usr.bin/perl/NetWare/config_sh.PL index d2daf0ecc16..0e1d351c1a8 100644 --- a/gnu/usr.bin/perl/NetWare/config_sh.PL +++ b/gnu/usr.bin/perl/NetWare/config_sh.PL @@ -18,7 +18,7 @@ sub loadopts { shift @ARGV; my $optfile = shift @ARGV; local (*F); - open OPTF, '<', $optfile or die "Can't open $optfile: $!\n"; + open OPTF, $optfile or die "Can't open $optfile: $!\n"; my @opts; chomp(my $line = <OPTF>); my @vars = split(/\t+~\t+/, $line); @@ -43,7 +43,7 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) { my $pl_h = '../patchlevel.h'; if (-e $pl_h) { - open PL, '<', $pl_h or die "Can't open $pl_h: $!"; + open PL, "<$pl_h" or die "Can't open $pl_h: $!"; while (<PL>) { if (/^#\s*define\s+(PERL_\w+)\s+([\d.]+)/) { $opt{$1} = $2; diff --git a/gnu/usr.bin/perl/NetWare/deb.h b/gnu/usr.bin/perl/NetWare/deb.h index e79a8f41a76..ece19c2d432 100644 --- a/gnu/usr.bin/perl/NetWare/deb.h +++ b/gnu/usr.bin/perl/NetWare/deb.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/intdef.h b/gnu/usr.bin/perl/NetWare/intdef.h index 4c566c4e45b..ca8474691c4 100644 --- a/gnu/usr.bin/perl/NetWare/intdef.h +++ b/gnu/usr.bin/perl/NetWare/intdef.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/interface.c b/gnu/usr.bin/perl/NetWare/interface.c index 1d298854c9f..0788e3aab89 100644 --- a/gnu/usr.bin/perl/NetWare/interface.c +++ b/gnu/usr.bin/perl/NetWare/interface.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -78,10 +78,10 @@ ClsPerlHost::PerlRun(PerlInterpreter *my_perl) return(perl_run(my_perl)); // Run Perl. } -int +void ClsPerlHost::PerlDestroy(PerlInterpreter *my_perl) { - return(perl_destruct(my_perl)); // Destructor for Perl. + perl_destruct(my_perl); // Destructor for Perl. } void @@ -126,10 +126,10 @@ int RunPerl(int argc, char **argv, char **env) PerlInterpreter *new_perl = NULL; // defined in Perl.h #ifdef PERL_GLOBAL_STRUCT - #define PERLVAR(prefix,var,type) - #define PERLVARA(prefix,var,type) - #define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init; - #define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init; + #define PERLVAR(var,type) + #define PERLVARA(var,type) + #define PERLVARI(var,type,init) PL_Vars.var = init; + #define PERLVARIC(var,type,init) PL_Vars.var = init; #include "perlvars.h" @@ -148,18 +148,19 @@ int RunPerl(int argc, char **argv, char **env) { PL_perl_destruct_level = 0; - if(!nlm.PerlParse(my_perl, argc, argv, env)) + exitstatus = nlm.PerlParse(my_perl, argc, argv, env); + if(exitstatus == 0) { #if defined(TOP_CLONE) && defined(USE_ITHREADS) // XXXXXX testing new_perl = perl_clone(my_perl, 1); - (void) perl_run(new_perl); // Run Perl. + exitstatus = perl_run(new_perl); // Run Perl. PERL_SET_THX(my_perl); #else - (void) nlm.PerlRun(my_perl); + exitstatus = nlm.PerlRun(my_perl); #endif } - exitstatus = nlm.PerlDestroy(my_perl); + nlm.PerlDestroy(my_perl); } if(my_perl) nlm.PerlFree(my_perl); @@ -168,7 +169,7 @@ int RunPerl(int argc, char **argv, char **env) if (new_perl) { PERL_SET_THX(new_perl); - exitstatus = nlm.PerlDestroy(new_perl); + nlm.PerlDestroy(new_perl); nlm.PerlFree(my_perl); } #endif diff --git a/gnu/usr.bin/perl/NetWare/interface.cpp b/gnu/usr.bin/perl/NetWare/interface.cpp index b08d6c249eb..b0f3cb3328a 100644 --- a/gnu/usr.bin/perl/NetWare/interface.cpp +++ b/gnu/usr.bin/perl/NetWare/interface.cpp @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -69,12 +69,11 @@ ClsPerlHost::PerlRun(PerlInterpreter *my_perl) return(perl_run(my_perl)); // Run Perl. } -int +void ClsPerlHost::PerlDestroy(PerlInterpreter *my_perl) { - int ret = perl_destruct(my_perl); // Destructor for Perl. + perl_destruct(my_perl); // Destructor for Perl. //// perl_free(my_perl); // Free the memory allocated for Perl. - return(ret); } void @@ -121,10 +120,10 @@ int RunPerl(int argc, char **argv, char **env) //__asm{int 3}; #ifdef PERL_GLOBAL_STRUCT - #define PERLVAR(prefix,var,type) - #define PERLVARA(prefix,var,type) - #define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init; - #define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init; + #define PERLVAR(var,type) + #define PERLVARA(var,type) + #define PERLVARI(var,type,init) PL_Vars.var = init; + #define PERLVARIC(var,type,init) PL_Vars.var = init; #include "perlvars.h" @@ -143,7 +142,8 @@ int RunPerl(int argc, char **argv, char **env) { PL_perl_destruct_level = 0; - if(!nlm.PerlParse(my_perl, argc, argv, env)) + exitstatus = nlm.PerlParse(my_perl, argc, argv, env); + if(exitstatus == 0) { #if defined(TOP_CLONE) && defined(USE_ITHREADS) // XXXXXX testing # ifdef PERL_OBJECT @@ -164,13 +164,13 @@ int RunPerl(int argc, char **argv, char **env) new_perl = perl_clone(my_perl, 1); # endif - (void) perl_run(new_perl); // Run Perl. + exitstatus = perl_run(new_perl); // Run Perl. PERL_SET_THX(my_perl); #else - (void) nlm.PerlRun(my_perl); + exitstatus = nlm.PerlRun(my_perl); #endif } - exitstatus = nlm.PerlDestroy(my_perl); + nlm.PerlDestroy(my_perl); } if(my_perl) nlm.PerlFree(my_perl); @@ -179,7 +179,7 @@ int RunPerl(int argc, char **argv, char **env) if (new_perl) { PERL_SET_THX(new_perl); - exitstatus = nlm.PerlDestroy(new_perl); + nlm.PerlDestroy(new_perl); nlm.PerlFree(my_perl); } #endif diff --git a/gnu/usr.bin/perl/NetWare/interface.h b/gnu/usr.bin/perl/NetWare/interface.h index 2c9d46d75d5..b6dd4a076e4 100644 --- a/gnu/usr.bin/perl/NetWare/interface.h +++ b/gnu/usr.bin/perl/NetWare/interface.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -35,7 +35,7 @@ public: int PerlCreate(PerlInterpreter *my_perl); int PerlParse(PerlInterpreter *my_perl, int argc, char** argv, char** env); int PerlRun(PerlInterpreter *my_perl); - int PerlDestroy(PerlInterpreter *my_perl); + void PerlDestroy(PerlInterpreter *my_perl); void PerlFree(PerlInterpreter *my_perl); //bool RegisterWithThreadTable(void); diff --git a/gnu/usr.bin/perl/NetWare/iperlhost.h b/gnu/usr.bin/perl/NetWare/iperlhost.h index fe3dab7a34a..3204c2cca99 100644 --- a/gnu/usr.bin/perl/NetWare/iperlhost.h +++ b/gnu/usr.bin/perl/NetWare/iperlhost.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -33,7 +33,7 @@ public: virtual int PerlCreate(PerlInterpreter *my_perl) = 0; virtual int PerlParse(PerlInterpreter *my_perl,int argc, char** argv, char** env) = 0; virtual int PerlRun(PerlInterpreter *my_perl) = 0; - virtual int PerlDestroy(PerlInterpreter *my_perl) = 0; + virtual void PerlDestroy(PerlInterpreter *my_perl) = 0; virtual void PerlFree(PerlInterpreter *my_perl) = 0; //virtual bool RegisterWithThreadTable(void)=0; diff --git a/gnu/usr.bin/perl/NetWare/netware.h b/gnu/usr.bin/perl/NetWare/netware.h index c106476e28d..18089d58d58 100644 --- a/gnu/usr.bin/perl/NetWare/netware.h +++ b/gnu/usr.bin/perl/NetWare/netware.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nw5.c b/gnu/usr.bin/perl/NetWare/nw5.c index 46642a4d597..488111ce94f 100644 --- a/gnu/usr.bin/perl/NetWare/nw5.c +++ b/gnu/usr.bin/perl/NetWare/nw5.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -57,7 +57,7 @@ In this code, wherever there is a FILE *, the error condition is checked; and o then the corresponding operation is done. Otherwise the error value is returned. This is done because the file operations like "open" in the Perl code returns the FILE *, returning a valid value if the file is found or NULL when the particular file is not found. -Now, if the return value is NULL, then an operation say "fgets", "fopen" etc. using this NULL value +Now, if the return value is NULL, then an operation say "fgets", "fopen" etc. using this this NULL value for FILE * will abend the server. If the check is made then an operation on a non existing file does not abend the server. **/ @@ -318,7 +318,7 @@ nw_crypt(const char *txt, const char *salt) return des_fcrypt(txt, salt, w32_crypt_buffer); #else Perl_croak(aTHX_ "The crypt() function is not implemented on NetWare\n"); - return NULL; + return Nullch; #endif } @@ -567,7 +567,7 @@ nw_rmdir(const char *dir) } DIR * -nw_opendir(const char *filename) +nw_opendir(char *filename) { char *buff = NULL; int len = 0; @@ -843,7 +843,7 @@ sys_intern_clear(pTHX) void sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst) { - PERL_ARGS_ASSERT_SYS_INTERN_DUP; + } #endif /* HAVE_INTERP_INTERN */ @@ -870,6 +870,12 @@ perl_clone_host(PerlInterpreter* proto_perl, UV flags) // Some more functions: +char * +nw_get_sitelib(const char *pl) +{ + return (NULL); +} + int execv(char *cmdname, char **argv) { @@ -916,8 +922,8 @@ do_aspawn(void *vreally, void **vmark, void **vsp) return -1; nw_perlshell_items = 0; // No Shell -// Newx(argv, (sp - mark) + nw_perlshell_items + 3, char*); // In the old code of 5.6.1 - Newx(argv, (sp - mark) + nw_perlshell_items + 2, char*); +// New(1306, argv, (sp - mark) + nw_perlshell_items + 3, char*); // In the old code of 5.6.1 + New(1306, argv, (sp - mark) + nw_perlshell_items + 2, char*); if (SvNIOKp(*(mark+1)) && !SvPOKp(*(mark+1))) { ++mark; @@ -981,8 +987,8 @@ do_spawn2(char *cmd, int exectype) /* Save an extra exec if possible. See if there are shell * metacharacters in it */ if (!has_shell_metachars(cmd)) { - Newx(argv, strlen(cmd) / 2 + 2, char*); - Newx(cmd2, strlen(cmd) + 1, char); + New(1301,argv, strlen(cmd) / 2 + 2, char*); + New(1302,cmd2, strlen(cmd) + 1, char); strcpy(cmd2, cmd); a = argv; for (s = cmd2; *s;) { @@ -995,7 +1001,7 @@ do_spawn2(char *cmd, int exectype) if (*s) *s++ = '\0'; } - *a = NULL; + *a = Nullch; if (argv[0]) { switch (exectype) { case EXECF_SPAWN: @@ -1021,11 +1027,11 @@ do_spawn2(char *cmd, int exectype) char **argv = NULL; int i = -1; - Newx(argv, nw_perlshell_items + 2, char*); + New(1306, argv, nw_perlshell_items + 2, char*); while (++i < nw_perlshell_items) argv[i] = nw_perlshell_vec[i]; argv[i++] = cmd; - argv[i] = NULL; + argv[i] = Nullch; switch (exectype) { case EXECF_SPAWN: status = nw_spawnvp(P_WAIT, argv[0], (char **)argv); diff --git a/gnu/usr.bin/perl/NetWare/nw5iop.h b/gnu/usr.bin/perl/NetWare/nw5iop.h index 0026b321811..27cd0a11ebd 100644 --- a/gnu/usr.bin/perl/NetWare/nw5iop.h +++ b/gnu/usr.bin/perl/NetWare/nw5iop.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -191,6 +191,14 @@ END_EXTERN_C #undef uname #undef wait +#ifdef __BORLANDC__ +#undef ungetc +#undef getc +#undef putc +#undef getchar +#undef putchar +#undef fileno +#endif #define environ (*nw_environ()) diff --git a/gnu/usr.bin/perl/NetWare/nw5sck.c b/gnu/usr.bin/perl/NetWare/nw5sck.c index 35dee92bf12..46069a3ab28 100644 --- a/gnu/usr.bin/perl/NetWare/nw5sck.c +++ b/gnu/usr.bin/perl/NetWare/nw5sck.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nw5sck.h b/gnu/usr.bin/perl/NetWare/nw5sck.h index afe2f9369c2..5c0e333da4e 100644 --- a/gnu/usr.bin/perl/NetWare/nw5sck.h +++ b/gnu/usr.bin/perl/NetWare/nw5sck.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nw5thread.c b/gnu/usr.bin/perl/NetWare/nw5thread.c index abedb5c2da1..7ed18bbeafb 100644 --- a/gnu/usr.bin/perl/NetWare/nw5thread.c +++ b/gnu/usr.bin/perl/NetWare/nw5thread.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -32,7 +32,7 @@ __declspec(thread) void *PL_current_context = NULL; void Perl_set_context(void *t) { -#if defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) # ifdef USE_DECLSPEC_THREAD Perl_current_context = t; # else @@ -45,7 +45,7 @@ Perl_set_context(void *t) void * Perl_get_context(void) { -#if defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) # ifdef USE_DECLSPEC_THREAD return Perl_current_context; # else @@ -61,7 +61,7 @@ Perl_get_context(void) BOOL Remove_Thread_Ctx(void) { -#if defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) # ifdef USE_DECLSPEC_THREAD return TRUE; # else diff --git a/gnu/usr.bin/perl/NetWare/nw5thread.h b/gnu/usr.bin/perl/NetWare/nw5thread.h index b1a2534b683..c4e17d15cf4 100644 --- a/gnu/usr.bin/perl/NetWare/nw5thread.h +++ b/gnu/usr.bin/perl/NetWare/nw5thread.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -32,7 +32,7 @@ typedef long perl_key; // Ananth, 3 Sept 2001 typedef struct nw_cond { long waiters; unsigned int sem; } perl_cond; -#if defined (USE_ITHREADS) && defined(MPK_ON) +#if (defined (USE_ITHREADS) || defined (USE_5005THREADS)) && defined(MPK_ON) #ifdef __cplusplus extern "C" { @@ -154,7 +154,7 @@ typedef unsigned long perl_mutex; #endif //#if 0 //Following has to be defined CHKSGP -#if defined(PERLDLL) && defined(USE_DECLSPEC_THREAD) +#if defined(PERLDLL) && defined(USE_DECLSPEC_THREAD) && (!defined(__BORLANDC__) || defined(_DLL)) extern __declspec(thread) void *PL_current_context; #define PERL_SET_CONTEXT(t) (PL_current_context = t) #define PERL_GET_CONTEXT PL_current_context diff --git a/gnu/usr.bin/perl/NetWare/nwhashcls.cpp b/gnu/usr.bin/perl/NetWare/nwhashcls.cpp index aaf5a5c0be6..1c582a59ad9 100644 --- a/gnu/usr.bin/perl/NetWare/nwhashcls.cpp +++ b/gnu/usr.bin/perl/NetWare/nwhashcls.cpp @@ -1,5 +1,5 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -97,7 +97,7 @@ NWPerlHashList::remove(void *ldata) } -void NWPerlHashList::forAll( void (*user_fn)(void *, void*), void *data ) const +void NWPerlHashList::forAll( register void (*user_fn)(void *, void*), void *data ) const { for(int i=0; i<BUCKET_SIZE; i++) @@ -210,7 +210,7 @@ NWPerlKeyHashList::remove(void *key) } -void NWPerlKeyHashList::forAll( void (*user_fn)(void *, void*), void *data ) const +void NWPerlKeyHashList::forAll( register void (*user_fn)(void *, void*), void *data ) const { for(int i=0; i<BUCKET_SIZE; i++) diff --git a/gnu/usr.bin/perl/NetWare/nwhashcls.h b/gnu/usr.bin/perl/NetWare/nwhashcls.h index 55ff2002203..88956afb865 100644 --- a/gnu/usr.bin/perl/NetWare/nwhashcls.h +++ b/gnu/usr.bin/perl/NetWare/nwhashcls.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nwperlhost.h b/gnu/usr.bin/perl/NetWare/nwperlhost.h index c69e554489b..002bc676e05 100644 --- a/gnu/usr.bin/perl/NetWare/nwperlhost.h +++ b/gnu/usr.bin/perl/NetWare/nwperlhost.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -441,14 +441,14 @@ PerlStdIOGetc(struct IPerlStdIO* piPerl, PerlIO* pf) return nw_getc((FILE*)pf); } -STDCHAR* +char* PerlStdIOGetBase(struct IPerlStdIO* piPerl, PerlIO* pf) { #ifdef FILE_base FILE *f = (FILE*)pf; return FILE_base(f); #else - return NULL; + return Nullch; #endif } @@ -474,14 +474,14 @@ PerlStdIOGetCnt(struct IPerlStdIO* piPerl, PerlIO* pf) #endif } -STDCHAR* +char* PerlStdIOGetPtr(struct IPerlStdIO* piPerl, PerlIO* pf) { #ifdef USE_STDIO_PTR FILE *f = (FILE*)pf; return FILE_ptr(f); #else - return NULL; + return Nullch; #endif } @@ -568,7 +568,7 @@ PerlStdIOSetCnt(struct IPerlStdIO* piPerl, PerlIO* pf, int n) } void -PerlStdIOSetPtrCnt(struct IPerlStdIO* piPerl, PerlIO* pf, STDCHAR * ptr, int n) +PerlStdIOSetPtrCnt(struct IPerlStdIO* piPerl, PerlIO* pf, char * ptr, int n) { #ifdef STDIO_PTR_LVALUE FILE *f = (FILE*)pf; @@ -890,7 +890,7 @@ PerlLIOUnlink(struct IPerlLIO* piPerl, const char *filename) } int -PerlLIOUtime(struct IPerlLIO* piPerl, const char *filename, struct utimbuf *times) +PerlLIOUtime(struct IPerlLIO* piPerl, char *filename, struct utimbuf *times) { return nw_utime(filename, times); } @@ -961,7 +961,7 @@ PerlDirClose(struct IPerlDir* piPerl, DIR *dirp) } DIR* -PerlDirOpen(struct IPerlDir* piPerl, const char *filename) +PerlDirOpen(struct IPerlDir* piPerl, char *filename) { return nw_opendir(filename); } diff --git a/gnu/usr.bin/perl/NetWare/nwperlsys.c b/gnu/usr.bin/perl/NetWare/nwperlsys.c index 32c15cb4380..9eca5225f7f 100644 --- a/gnu/usr.bin/perl/NetWare/nwperlsys.c +++ b/gnu/usr.bin/perl/NetWare/nwperlsys.c @@ -1,5 +1,5 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nwperlsys.h b/gnu/usr.bin/perl/NetWare/nwperlsys.h index 3d82dd1c8dd..0d731d1fcf2 100644 --- a/gnu/usr.bin/perl/NetWare/nwperlsys.h +++ b/gnu/usr.bin/perl/NetWare/nwperlsys.h @@ -1,5 +1,5 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -184,7 +184,7 @@ PerlDirClose(struct IPerlDir* piPerl, DIR *dirp) } DIR* -PerlDirOpen(struct IPerlDir* piPerl, const char *filename) +PerlDirOpen(struct IPerlDir* piPerl, char *filename) { return nw_opendir(filename); } @@ -335,14 +335,14 @@ PerlStdIOGetc(struct IPerlStdIO* piPerl, FILE* pf) return nw_getc(pf); } -STDCHAR* +char* PerlStdIOGetBase(struct IPerlStdIO* piPerl, FILE* pf) { #ifdef FILE_base FILE *f = pf; return FILE_base(f); #else - return NULL; + return Nullch; #endif } @@ -368,14 +368,14 @@ PerlStdIOGetCnt(struct IPerlStdIO* piPerl, FILE* pf) #endif } -STDCHAR* +char* PerlStdIOGetPtr(struct IPerlStdIO* piPerl, FILE* pf) { #ifdef USE_STDIO_PTR FILE *f = pf; return FILE_ptr(f); #else - return NULL; + return Nullch; #endif } @@ -461,7 +461,7 @@ PerlStdIOSetCnt(struct IPerlStdIO* piPerl, FILE* pf, int n) } void -PerlStdIOSetPtr(struct IPerlStdIO* piPerl, FILE* pf, STDCHAR * ptr) +PerlStdIOSetPtr(struct IPerlStdIO* piPerl, FILE* pf, char * ptr) { #ifdef STDIO_PTR_LVALUE FILE *f = pf; @@ -780,7 +780,7 @@ PerlLIOUnlink(struct IPerlLIO* piPerl, const char *filename) } int -PerlLIOUtime(struct IPerlLIO* piPerl, const char *filename, struct utimbuf *times) +PerlLIOUtime(struct IPerlLIO* piPerl, char *filename, struct utimbuf *times) { return nw_utime(filename, times); } diff --git a/gnu/usr.bin/perl/NetWare/nwpipe.h b/gnu/usr.bin/perl/NetWare/nwpipe.h index 462a73dcf42..4e9354a4155 100644 --- a/gnu/usr.bin/perl/NetWare/nwpipe.h +++ b/gnu/usr.bin/perl/NetWare/nwpipe.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nwplglob.c b/gnu/usr.bin/perl/NetWare/nwplglob.c index 6810fd5e697..c7a210458cb 100644 --- a/gnu/usr.bin/perl/NetWare/nwplglob.c +++ b/gnu/usr.bin/perl/NetWare/nwplglob.c @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -9,7 +9,7 @@ /* * FILENAME : nwplglob.c - * DESCRIPTION : Perl globbing support for NetWare. Other platforms have usually launched + * DESCRIPTION : Perl globbing support for NetWare. Other platforms have usually lauched * a separate executable for this in order to take advantage of their * shell's capability for generating a list of files from a given * wildcard file spec. On NetWare, we don't have that luxury. diff --git a/gnu/usr.bin/perl/NetWare/nwplglob.h b/gnu/usr.bin/perl/NetWare/nwplglob.h index cf60e731696..1c9d9e4b583 100644 --- a/gnu/usr.bin/perl/NetWare/nwplglob.h +++ b/gnu/usr.bin/perl/NetWare/nwplglob.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nwstdio.h b/gnu/usr.bin/perl/NetWare/nwstdio.h index 50ab6f3d43c..1ddadb550b7 100644 --- a/gnu/usr.bin/perl/NetWare/nwstdio.h +++ b/gnu/usr.bin/perl/NetWare/nwstdio.h @@ -1,5 +1,5 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -52,7 +52,7 @@ #ifdef HAS_SETLINEBUF #define PerlIO_setlinebuf(f) (*PL_StdIO->pSetlinebuf)(PL_StdIO, (f)) #else -#define PerlIO_setlinebuf(f) setvbuf(f, NULL, _IOLBF, 0) +#define PerlIO_setlinebuf(f) setvbuf(f, Nullch, _IOLBF, 0) #endif #define PerlIO_isutf8(f) 0 diff --git a/gnu/usr.bin/perl/NetWare/nwtinfo.h b/gnu/usr.bin/perl/NetWare/nwtinfo.h index a08d060422c..25d78a720fb 100644 --- a/gnu/usr.bin/perl/NetWare/nwtinfo.h +++ b/gnu/usr.bin/perl/NetWare/nwtinfo.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nwutil.h b/gnu/usr.bin/perl/NetWare/nwutil.h index ff05d1830f3..6c8f14489f1 100644 --- a/gnu/usr.bin/perl/NetWare/nwutil.h +++ b/gnu/usr.bin/perl/NetWare/nwutil.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/nwvmem.h b/gnu/usr.bin/perl/NetWare/nwvmem.h index e82eaeef8b5..5999d88381e 100644 --- a/gnu/usr.bin/perl/NetWare/nwvmem.h +++ b/gnu/usr.bin/perl/NetWare/nwvmem.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -13,7 +13,7 @@ * Watcom's hash table is used to store memory pointers. * All malloc's, realloc's, free's go through this. * Author : HYAK, SGP - * Date : January 2001. + * Date : Januray 2001. * */ diff --git a/gnu/usr.bin/perl/NetWare/perllib.cpp b/gnu/usr.bin/perl/NetWare/perllib.cpp index 32f8ed2aae7..a9eb8248608 100644 --- a/gnu/usr.bin/perl/NetWare/perllib.cpp +++ b/gnu/usr.bin/perl/NetWare/perllib.cpp @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/NetWare/sv_nw.c b/gnu/usr.bin/perl/NetWare/sv_nw.c index 85a33f071de..0051363e967 100644 --- a/gnu/usr.bin/perl/NetWare/sv_nw.c +++ b/gnu/usr.bin/perl/NetWare/sv_nw.c @@ -3,12 +3,13 @@ #include <perl.h> #include <regcomp.h> -#define SV_CHECK_THINKFIRST(sv) if (SvTHINKFIRST(sv)) sv_force_normal_flags(sv, 0) +#define FCALL *f +#define SV_CHECK_THINKFIRST(sv) if (SvTHINKFIRST(sv)) sv_force_normal(sv) void -Perl_sv_catsv(pTHX_ SV *dstr, SV *sstr) +Perl_sv_catsv(pTHX_ SV *dstr, register SV *sstr) { sv_catsv_flags(dstr, sstr, SV_GMAGIC); } @@ -21,13 +22,13 @@ Perl_sv_catpvn(pTHX_ SV *dsv, const char* sstr, STRLEN slen) } void -Perl_sv_setsv(pTHX_ SV *dstr, SV *sstr) +Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr) { sv_setsv_flags(dstr, sstr, SV_GMAGIC); } char * -Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp) +Perl_sv_2pv(pTHX_ register SV *sv, STRLEN *lp) { return sv_2pv_flags(sv, lp, SV_GMAGIC); } diff --git a/gnu/usr.bin/perl/NetWare/t/NWModify.pl b/gnu/usr.bin/perl/NetWare/t/NWModify.pl index fa58b47e820..4e9817448d4 100644 --- a/gnu/usr.bin/perl/NetWare/t/NWModify.pl +++ b/gnu/usr.bin/perl/NetWare/t/NWModify.pl @@ -85,7 +85,7 @@ sub Process_File # Do the processing only if the file has '.t' extension. if($ext eq '.t') { - open(FH, '+<', $FileToProcess) or die "Unable to open the file, $FileToProcess for reading and writing.\n"; + open(FH, "+< $FileToProcess") or die "Unable to open the file, $FileToProcess for reading and writing.\n"; @ARRAY = <FH>; # Get the contents of the file into an array. foreach $Line(@ARRAY) # Get each line of the file. diff --git a/gnu/usr.bin/perl/NetWare/t/NWScripts.pl b/gnu/usr.bin/perl/NetWare/t/NWScripts.pl index 5f21244fd90..a594dac6979 100644 --- a/gnu/usr.bin/perl/NetWare/t/NWScripts.pl +++ b/gnu/usr.bin/perl/NetWare/t/NWScripts.pl @@ -24,13 +24,13 @@ foreach $DirItem(@Dirs) if(-d $DirItem1) { # If an item is a folder, then open it further. - # Intermediary automated script like base.pl, lib.pl, cmd.pl etc. + # Intemediary automated script like base.pl, lib.pl, cmd.pl etc. $IntAutoScript = "t/".$DirItem.".pl"; # Open once in write mode since later files are opened in append mode, # and if there already exists a file with the same name, all further opens # will append to that file!! - open(FHW, '>', $IntAutoScript) or die "Unable to open the file, $IntAutoScript for writing.\n"; + open(FHW, "> $IntAutoScript") or die "Unable to open the file, $IntAutoScript for writing.\n"; seek(FHW, 0, 0); # seek to the beginning of the file. close FHW; # close the file. } @@ -39,7 +39,7 @@ foreach $DirItem(@Dirs) print "Generating t/nwauto.pl ...\n\n\n"; -open(FHWA, '>', 't/nwauto.pl') or die "Unable to open the file, t/nwauto.pl for writing.\n"; +open(FHWA, "> t/nwauto.pl") or die "Unable to open the file, t/nwauto.pl for writing.\n"; seek(FHWA, 0, 0); # seek to the beginning of the file. $version = sprintf("%vd",$^V); @@ -61,13 +61,13 @@ foreach $FileName(@DirNames) { $DirItem = $DirItem1; - # Intermediary automated script like base.pl, lib.pl, cmd.pl etc. + # Intemediary automated script like base.pl, lib.pl, cmd.pl etc. $IntAutoScript = "t/".$DirItem.".pl"; } } # Write into the intermediary auto script. - open(FHW, '>>', $IntAutoScript) or die "Unable to open the file, $IntAutoScript for appending.\n"; + open(FHW, ">> $IntAutoScript") or die "Unable to open the file, $IntAutoScript for appending.\n"; seek(FHW, 0, 2); # seek to the end of the file. $pos = tell(FHW); @@ -160,11 +160,11 @@ foreach $DirItem(@Dirs) { # The folder not empty. - # Intermediary automated script like base.pl, lib.pl, cmd.pl etc. + # Intemediary automated script like base.pl, lib.pl, cmd.pl etc. $IntAutoScript = "t/".$DirItem.".pl"; # Write into the intermediary auto script. - open(FHW, '>>', $IntAutoScript) or die "Unable to open the file, $IntAutoScript for appending.\n"; + open(FHW, ">> $IntAutoScript") or die "Unable to open the file, $IntAutoScript for appending.\n"; seek(FHW, 0, 2); # seek to the end of the file. # Write into the intermediary auto script. diff --git a/gnu/usr.bin/perl/NetWare/win32ish.h b/gnu/usr.bin/perl/NetWare/win32ish.h index f6603d50f44..a8fcbcde258 100644 --- a/gnu/usr.bin/perl/NetWare/win32ish.h +++ b/gnu/usr.bin/perl/NetWare/win32ish.h @@ -1,6 +1,6 @@ /* - * Copyright © 2001 Novell, Inc. All Rights Reserved. + * Copyright © 2001 Novell, Inc. All Rights Reserved. * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/gnu/usr.bin/perl/Porting/check83.pl b/gnu/usr.bin/perl/Porting/check83.pl index fbe56555898..7006d23c1fe 100644 --- a/gnu/usr.bin/perl/Porting/check83.pl +++ b/gnu/usr.bin/perl/Porting/check83.pl @@ -1,6 +1,4 @@ -#!/usr/bin/perl -w - -use strict; +#!/usr/local/bin/perl # Check whether there are naming conflicts when names are truncated to # the DOSish case-ignoring 8.3 format, plus other portability no-nos. @@ -11,30 +9,25 @@ use strict; # "no filename shall be longer than eight and a suffix if present # not longer than three". -# The 8-level depth rule is for older VMS systems that likely won't -# even be able to unpack the tarball if more than eight levels -# (including the top of the source tree) are present. - -my %seen; -my $maxl = 30; # make up a limit for a maximum filename length +# TODO: this doesn't actually check for *directory entries*, what this +# does is to check for *MANIFEST entries*, which are only files, not +# directories. In other words, a 8.3 conflict between a directory +# "abcdefghx" and a file "abcdefghy" wouldn't be noticed-- or even for +# a directory "abcdefgh" and a file "abcdefghy". sub eight_dot_three { - return () if $seen{$_[0]}++; - my ($dir, $base, $ext) = ($_[0] =~ m{^(?:(.+)/)?([^/.]*)(?:\.([^/.]+))?$}); - my $file = $base . ( defined $ext ? ".$ext" : "" ); + my ($dir, $base, $ext) = ($_[0] =~ m!^(?:(.+)/)?([^/.]+)(?:\.([^/.]+))?$!); + my $file = $base . defined $ext ? ".$ext" : ""; $base = substr($base, 0, 8); $ext = substr($ext, 0, 3) if defined $ext; - if (defined $dir && $dir =~ /\./) { - print "directory name contains '.': $dir\n"; - } - if ($base eq "") { - print "filename starts with dot: $_[0]\n"; + if ($dir =~ /\./) { + warn "$dir: directory name contains '.'\n"; } if ($file =~ /[^A-Za-z0-9\._-]/) { - print "filename contains non-portable characters: $_[0]\n"; + warn "$file: filename contains non-portable characters\n"; } - if (length $file > $maxl) { - print "filename longer than $maxl characters: $file\n"; + if (length $file > 30) { + warn "$file: filename longer than 30 characters\n"; # make up a limit } if (defined $dir) { return ($dir, defined $ext ? "$dir/$base.$ext" : "$dir/$base"); @@ -45,28 +38,21 @@ sub eight_dot_three { my %dir; -if (open(MANIFEST, '<', 'MANIFEST')) { +if (open(MANIFEST, "MANIFEST")) { while (<MANIFEST>) { chomp; s/\s.+//; unless (-f) { - print "missing: $_\n"; + warn "$_: missing\n"; next; } if (tr/././ > 1) { - print "more than one dot: $_\n"; + print "$_: more than one dot\n"; next; } - if ((my $slashes = $_ =~ tr|\/|\/|) > 7) { - print "more than eight levels deep: $_\n"; - next; - } - while (m!/|\z!g) { - my ($dir, $edt) = eight_dot_three("$`"); - next unless defined $dir; - ($dir, $edt) = map { lc } ($dir, $edt); - push @{$dir{$dir}->{$edt}}, $_; - } + my ($dir, $edt) = eight_dot_three($_); + ($dir, $edt) = map { lc } ($dir, $edt); + push @{$dir{$dir}->{$edt}}, $_; } } else { die "$0: MANIFEST: $!\n"; @@ -74,9 +60,9 @@ if (open(MANIFEST, '<', 'MANIFEST')) { for my $dir (sort keys %dir) { for my $edt (keys %{$dir{$dir}}) { - my @files = @{$dir{$dir}{$edt}}; + my @files = @{$dir{$dir}->{$edt}}; if (@files > 1) { - print "conflict on filename $edt:\n", map " $_\n", @files; + print "@files: directory $dir conflict $edt\n"; } } } diff --git a/gnu/usr.bin/perl/djgpp/djgpp.h b/gnu/usr.bin/perl/djgpp/djgpp.h index bb792e204e5..a020ae91a1a 100644 --- a/gnu/usr.bin/perl/djgpp/djgpp.h +++ b/gnu/usr.bin/perl/djgpp/djgpp.h @@ -34,7 +34,7 @@ int do_spawn (pTHX_ char *cmd); bool -Perl_do_exec (pTHX_ const char *cmd); +Perl_do_exec (pTHX_ char *cmd); void Perl_init_os_extras(pTHX); |