summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changes177
-rwxr-xr-xConfigure8
-rwxr-xr-xMakefile.SH2
-rwxr-xr-xPorting/makerel7
-rw-r--r--ext/DynaLoader/DynaLoader.pm6
-rw-r--r--hints/hpux.sh6
-rw-r--r--hints/sunos_4_1.sh2
-rwxr-xr-xinstallhtml4
-rw-r--r--lib/ExtUtils/MM_Unix.pm2
-rw-r--r--lib/blib.pm2
-rw-r--r--os2/diff.configure8
-rw-r--r--patchlevel.h2
-rw-r--r--perl.c16
-rw-r--r--pod/perldiag.pod2
-rw-r--r--pod/perlop.pod2
-rwxr-xr-xt/pragma/locale.t43
-rw-r--r--toke.c4
-rw-r--r--win32/bin/pl2bat.bat103
-rw-r--r--win32/bin/runperl.bat76
-rw-r--r--win32/bin/search.bat1873
-rw-r--r--win32/bin/test.bat143
-rw-r--r--win32/bin/webget.bat1099
22 files changed, 253 insertions, 3334 deletions
diff --git a/Changes b/Changes
index b30c33e1a7..1675e311b8 100644
--- a/Changes
+++ b/Changes
@@ -48,6 +48,183 @@ And the Keepers of the Patch Pumpkin:
----------------
+Version 5.004_03 Maintenance release 3 for 5.004
+----------------
+
+"To err is human, to forgive divine."
+ -- Alexander Pope
+
+
+ HEADLINES FOR THIS MAINTENANCE RELEASE
+
+ Fixed 5.004_02 compilation failure on VMS.
+ Fixed Configure (non)errors being displayed to user.
+ Better support for Windows 95.
+ Assorted documentation and hint file improvements.
+ perl --foo no longer silently ignored.
+
+
+ ------ BUILD PROCESS ------
+
+ Title: "Show Configure failure reason even with -s"
+ From: Andy Dougherty <doughera@newton.phys.lafayette.edu>
+ Msg-ID: <Pine.SUN.3.96.970812141623.14256K-100000@newton.phys>
+ Files: Configure
+
+ Title: "Configure can stop without fully explaining itself"
+ From: Jim Anderson <jander@ml.com>
+ Msg-ID: <199708111328.JAA28976@nsd15.ny-swaps-develop.ml.com>,
+ <199708111952.PAA29346@nsd15.ny-swaps-develop.ml.com>
+ Files: Configure
+
+ ------ CORE LANGUAGE ------
+
+ Title: "typos in perl -h output"
+ From: "Richard A. Wells" <Rwells@uhs.harvard.edu>
+ Msg-ID: <6D0BF914BC@gateuhs.harvard.edu>
+ Files: perl.c
+
+ Title: "Some perldb -> PERLDB_* macro changes were missed"
+ From: Ilya Zakharevich <ilya@math.ohio-state.edu>
+ Msg-ID: <199708100323.XAA27155@monk.mps.ohio-state.edu>
+ Files: pp_ctl.c
+
+ Title: "Further fix to lseek's in lockf_emulate_flock"
+ From: Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
+ Msg-ID: <199708060031.CAA07387@bombur2.uio.no>,
+ <199708102225.AAA16970@bombur2.uio.no>
+ Files: pp_sys.c
+
+ Title: "GNU style perl --version (or any other --foo) ignored"
+ From: "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Kenneth Albanowski
+ <kjahds@kjahds.com>, Stephen McCamant <alias@mcs.com>
+ Msg-ID: <E0wx8MO-0007BS-00@ursa.cus.cam.ac.uk>,
+ <Pine.LNX.3.93.970813122557.9443C-100000@kjahds.com>,
+ <m0wy8nl-000EYgC@alias-2.pr.mcs.net>
+ Files: pod/perldiag.pod perl.c
+
+ Title: "seen_dot declaration in perl.c needed for VMS"
+ From: Gurusamy Sarathy <gsar@engin.umich.edu>
+ Msg-ID: <199708072033.QAA09167@aatma.engin.umich.edu>
+ Files: perl.c
+
+ ------ DOCUMENTATION ------
+
+ Title: "[PATCH] -D info in perlrun", "[PATCH] Re: -D info in perlrun"
+ From: Stephen McCamant <alias@mcs.com>, ilya@math.ohio-state.edu (Ilya
+ Zakharevich)
+ Msg-ID: <1997Aug10.195832.2224477@hmivax.humgen.upenn.edu>,
+ <m0wxNNL-000EYgC@alias-2.pr.mcs.net>,
+ <m0wxz6l-000EYgC@alias-2.pr.mcs.net>
+ Files: pod/perlrun.pod
+
+ Title: "perlop pod inconsistent in presentation of regexp options"
+ From: "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Hans Mulder <hansm@icgned.nl>,
+ jmr@whirlwind.fmr.com
+ Msg-ID: <199708061404.KAA06717@whirlwind.fmr.com>,
+ <199708081505.LAA09810@whirlwind.fmr.com>,
+ <1997Aug7.160530.2196011@hmivax.humgen.upenn.edu>,
+ <E0wwnqc-00057s-00@ursa.cus.cam.ac.uk>,
+ <E0wwswg-00017x-00@ursa.cus.cam.ac.uk>
+ Files: pod/perlop.pod
+
+ Title: "pod2man generated .IX lines upset whatis on Solaris"
+ From: "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, jmr@whirlwind.fmr.com (John
+ Redford)
+ Msg-ID: <E0wxoUZ-0006Ee-00@ursa.cus.cam.ac.uk>
+ Files: pod/pod2man.PL
+
+ Title: "The description of the \Q metacharacter is confusing to novices"
+ From: aml@world.std.com (Andrew M. Langmead)
+ Msg-ID: <199708101946.AA06339@world.std.com>
+ Files: pod/perlre.pod
+
+ Title: "doc patch for pack("p",undef) packing a NULL pointer"
+ From: pmarquess@bfsec.bt.co.uk (Paul Marquess)
+ Msg-ID: <9708102159.AA11726@claudius.bfsec.bt.co.uk>
+ Files: pod/perldelta.pod pod/perlfunc.pod
+
+ Title: "perlfunc.pod error"
+ From: Tom Christiansen <tchrist@jhereg.perl.com>
+ Msg-ID: <199708102235.QAA18420@jhereg.perl.com>
+ Files: pod/perlfunc.pod
+
+ ------ LIBRARY AND EXTENSIONS ------
+
+ Title: "patch for documentation error in FileCache.pm"
+ From: Mike Stok <mike@stok.co.uk>, mikebo@tellabs.com
+ Msg-ID: <Pine.LNX.3.95.970810143321.437C-100000@stok.co.uk>
+ Files: lib/FileCache.pm
+
+ Title: "[PATCH] 5.004_02: Complex/Trig: update"
+ From: Jarkko Hietaniemi <jhi@iki.fi>
+ Msg-ID: <199708081842.VAA31214@alpha.hut.fi>
+ Files: lib/Math/Complex.pm lib/Math/Trig.pm t/lib/complex.t
+
+ Title: "CPAN Use of uninitialized value in newest perl"
+ From: tom@amber.ssd.hcsc.com (Tom Horsley)
+ Msg-ID: <9708091738.AA16435@amber.ssd.hcsc.com>
+ Files: lib/CPAN.pm
+
+ ------ PORTABILITY - WIN32 ------
+
+ Title: "[PATCH] /x is not a valid shell switch on Win95"
+ From: Gurusamy Sarathy <gsar@engin.umich.edu>
+ Msg-ID: <199708121720.NAA14760@aatma.engin.umich.edu>
+ Files: win32/win32.c
+
+ Title: "[PATCH] Win95-proofing pl2bat"
+ From: Gurusamy Sarathy <gsar@engin.umich.edu>
+ Msg-ID: <199708121733.NAA14888@aatma.engin.umich.edu>
+ Files: MANIFEST win32/Makefile win32/makefile.mk win32/bin/pl2bat.pl
+ win32/bin/runperl.pl win32/bin/search.pl
+ win32/bin/webget.pl
+
+ Title: "[PATCH] [OK] Perl5.004_02 on Alpha NT"
+ From: wmiddlet@adobe.com (William Middleton)
+ Msg-ID: <199708072100.OAA13141@ducks>
+ Files: win32/win32.c
+
+ ------ PORTABILITY - OTHER ------
+
+ Title: "Improve dual-universe comments in hints/sunos_4_1.sh"
+ From: Andy Dougherty <doughera@newton.phys.lafayette.edu>
+ Msg-ID: <Pine.SUN.3.96.970812170358.14488E-100000@newton.phys>
+ Files: hints/sunos_4_1.sh
+
+ Title: "Dynamic Loading on MkLinux (osname=linux,archname=ppc-linux)"
+ From: Chris Nandor <pudge@pobox.com>, Shimpei Yamashita
+ <shimpei@socrates.patnet.caltech.edu>
+ Msg-ID: <33EF1634.B36B6500@pobox.com>
+ Files: hints/linux.sh
+
+ Title: "5.004_02 Configure - worrying but normal errors displayed to user"
+ From: Paul Marquess <pmarquess@bfsec.bt.co.uk>, pmarquess@bfsec.bt.co.uk
+ (Paul Marquess)
+ Msg-ID: <01BCA3DE.E257BFC0.pmarquess@bfsec.bt.co.uk>,
+ <9708102159.AA11726@claudius.bfsec.bt.co.uk>
+ Files: Configure os2/diff.configure
+
+ Title: "Minor glitch with Perl 5.004_01 on SunOS 4.1.3 (groupstype)"
+ From: thad@thadlabs.com (Thad Floryan)
+ Msg-ID: <9708111415.AA03808@thadlabs.com>
+ Files: hints/sunos_4_1.sh
+
+ Title: "SCO Openserver 5.0.4 - add comment to hint file re compiler bug"
+ From: Bill Glicker <billg@burrelles.com>
+ Msg-ID: <Pine.SCO.3.96.970811153021.18457A-100000@laura.burrelles.com>
+ Files: hints/sco.sh
+
+ ------ UTILITIES ------
+
+ Title: "perlbug -d non-interactive (with patch)"
+ From: Ted Ashton <ashted@southern.edu>
+ Msg-ID: <199708071418.KAA15711@ns.southern.edu>
+ Files: utils/perlbug.PL
+
+
+
+----------------
Version 5.004_02 Maintenance release 2 for 5.004
----------------
diff --git a/Configure b/Configure
index e1cf655457..13f37eff95 100755
--- a/Configure
+++ b/Configure
@@ -3813,12 +3813,12 @@ if sh -c "$cc $optimize $ccflags -o try try.c $ldflags $libs" >>try.msg 2>&1; th
dflt=n
else
echo "The program compiled OK, but exited with status $?." >>try.msg
- rp="You have a problem. Shall I abort Configure"
+ rp="You have a problem. Shall I abort Configure (and explain the problem)"
dflt=y
fi
else
echo "I can't compile the test program." >>try.msg
- rp="You have a BIG problem. Shall I abort Configure"
+ rp="You have a BIG problem. Shall I abort Configure (and explain the problem)"
dflt=y
fi
case "$dflt" in
@@ -6381,7 +6381,7 @@ main() {
EOCP
: check sys/file.h first to get FREAD on Sun
if $test `./findhdr sys/file.h` && \
- $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs ; then
+ $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
h_sysfile=true;
echo "<sys/file.h> defines the O_* constants..." >&4
if ./open3; then
@@ -6392,7 +6392,7 @@ if $test `./findhdr sys/file.h` && \
val="$undef"
fi
elif $test `./findhdr fcntl.h` && \
- $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs ; then
+ $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
h_fcntl=true;
echo "<fcntl.h> defines the O_* constants..." >&4
if ./open3; then
diff --git a/Makefile.SH b/Makefile.SH
index b941bb0522..86fd6ed02e 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -362,7 +362,7 @@ install.man: all installman
# XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values.
install.html: all installhtml
- ./installhtml \
+ ./perl installhtml \
--podroot=. --podpath=. --recurse \
--htmldir=$(privlib)/html \
--htmlroot=$(privlib)/html \
diff --git a/Porting/makerel b/Porting/makerel
index 0476ab52b3..bc472eee36 100755
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -35,6 +35,13 @@ print "Cross-checking the MANIFEST...\n";
($missfile, $missentry) = fullcheck();
warn "Can't make a release with MANIFEST files missing.\n" if @$missfile;
warn "Can't make a release with files not listed in MANIFEST.\n" if @$missentry;
+if ("@$missentry" =~ m/\.orig\b/) {
+ # Handy listing of find command and .orig files from patching work.
+ # I tend to run 'xargs rm' and copy and paste the file list.
+ my $cmd = "find . -name '*.orig' -print";
+ print "$cmd\n";
+ system($cmd);
+}
die "Aborted.\n" if @$missentry or @$missfile;
print "\n";
diff --git a/ext/DynaLoader/DynaLoader.pm b/ext/DynaLoader/DynaLoader.pm
index 67043102a5..04404b7ee9 100644
--- a/ext/DynaLoader/DynaLoader.pm
+++ b/ext/DynaLoader/DynaLoader.pm
@@ -335,9 +335,9 @@ etc and also allow pseudo-dynamic linking (using C<ld -A> at runtime).
It must be stressed that the DynaLoader, by itself, is practically
useless for accessing non-Perl libraries because it provides almost no
Perl-to-C 'glue'. There is, for example, no mechanism for calling a C
-library function or supplying arguments. It is anticipated that any
-glue that may be developed in the future will be implemented in a
-separate dynamically loaded module.
+library function or supplying arguments. A ExtUtils::DynaLib module
+is available from CPAN sites which performs that function for some
+common system types.
DynaLoader Interface Summary
diff --git a/hints/hpux.sh b/hints/hpux.sh
index ab04e9b82e..c2500d0c37 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -1,7 +1,7 @@
#! /bin/sh
# hints/hpux.sh
-# Perl Configure hints file for Hewlett Packard HP-UX 9.x and 10.x
+# Perl Configure hints file for Hewlett-Packard's HP-UX 9.x and 10.x
# (Hopefully, 7.x through 11.x.)
#
# This file is based on hints/hpux_9.sh, Perl Configure hints file for
@@ -21,7 +21,7 @@
# Don't assume every OS != 10 is < 10, (e.g., 11).
# From: Chuck Phillips <cdp@fc.hp.com>
-# This version: April 27, 1997
+# This version: August 15, 1997
# Current maintainer: Jeff Okamoto <okamoto@corp.hp.com>
#--------------------------------------------------------------------
@@ -121,6 +121,7 @@ else
# ASSUMPTION: Only CPU identifiers contain no lowercase letters.
archname=`getcontext | tr ' ' '\012' | grep -v '[a-z]' | grep -v MC688 |
sed -e 's/HP-//' -e 1q`;
+ selecttype='int *'
fi
@@ -151,7 +152,6 @@ ccdlflags="-Wl,-E -Wl,-B,deferred $ccdlflags"
usemymalloc='y'
alignbytes=8
-selecttype='int *'
# For native nm, you need "-p" to produce BSD format output.
nm_opt='-p'
diff --git a/hints/sunos_4_1.sh b/hints/sunos_4_1.sh
index 5e4429e84d..07cd89fc7b 100644
--- a/hints/sunos_4_1.sh
+++ b/hints/sunos_4_1.sh
@@ -57,7 +57,7 @@ POSIX_cflags='ccflags="$ccflags -DSTRUCT_TM_HASZONE"'
# manually set groupstype='gid_t' and add explicit references to
# /usr/5lib when Configure prompts you for where to look for libraries.
#
-# check if user is in a bsd or system 5 type environment
+# Check if user is in a bsd or system 5 type environment
if cat -b /dev/null 2>/dev/null
then # bsd
groupstype='int'
diff --git a/installhtml b/installhtml
index 6fa22ca791..b677cc29db 100755
--- a/installhtml
+++ b/installhtml
@@ -1,4 +1,6 @@
-#!/usr/bin/perl -w
+#!./perl -w
+
+# This file should really be a extracted from a .PL
use lib 'lib'; # use source library if present
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 7669167d68..85b0c1bbe5 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -1151,7 +1151,7 @@ sub fixin { # stolen from the pink Camel book, more or less
}
$shb .= qq{
eval 'exec $interpreter $arg -S \$0 \${1+"\$\@"}'
- if \$running_under_some_shell;
+ if 0; # not running under some shell
};
} else {
warn "Can't find $cmd in PATH, $file unchanged"
diff --git a/lib/blib.pm b/lib/blib.pm
index 8af1727d8f..2dd7802f4b 100644
--- a/lib/blib.pm
+++ b/lib/blib.pm
@@ -38,6 +38,8 @@ Nick Ing-Simmons nik@tiuk.ti.com
use Cwd;
+use vars qw($VERSION);
+$VERSION = '1.00';
sub import
{
diff --git a/os2/diff.configure b/os2/diff.configure
index 39baf3ff51..9f42dc139f 100644
--- a/os2/diff.configure
+++ b/os2/diff.configure
@@ -162,8 +162,8 @@
EOCP
: check sys/file.h first to get FREAD on Sun
if $test `./findhdr sys/file.h` && \
-- $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs ; then
-+ $cc $ldflags $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs ; then
+- $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
++ $cc $ldflags $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
h_sysfile=true;
echo "<sys/file.h> defines the O_* constants..." >&4
if ./open3; then
@@ -171,8 +171,8 @@
val="$undef"
fi
elif $test `./findhdr fcntl.h` && \
-- $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs ; then
-+ $cc $ldflags $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs ; then
+- $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
++ $cc $ldflags $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
h_fcntl=true;
echo "<fcntl.h> defines the O_* constants..." >&4
if ./open3; then
diff --git a/patchlevel.h b/patchlevel.h
index ca94321c1f..7881ec90c9 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1,5 +1,5 @@
#define PATCHLEVEL 4
-#define SUBVERSION 2
+#define SUBVERSION 3
/*
local_patches -- list of locally applied less-than-subversion patches.
diff --git a/perl.c b/perl.c
index c52f2cc04a..69b5c0edcc 100644
--- a/perl.c
+++ b/perl.c
@@ -694,12 +694,23 @@ print \" \\@INC:\\n @INC\\n\";");
cddir = savepv(s);
break;
case '-':
+ if (*++s) { /* catch use of gnu style long options */
+ if (strEQ(s, "version")) {
+ s = "v";
+ goto reswitch;
+ }
+ if (strEQ(s, "help")) {
+ s = "h";
+ goto reswitch;
+ }
+ croak("Unrecognized switch: --%s (-h will show valid options)",s);
+ }
argc--,argv++;
goto switch_end;
case 0:
break;
default:
- croak("Unrecognized switch: -%s",s);
+ croak("Unrecognized switch: -%s (-h will show valid options)",s);
}
}
switch_end:
@@ -1310,7 +1321,7 @@ char *name;
printf("\n -U allow unsafe operations");
printf("\n -v print version number and patchlevel of perl");
printf("\n -V[:variable] print perl configuration information");
- printf("\n -w TURN WARNINGS ON FOR COMPILATION OF YOUR SCRIPT.");
+ printf("\n -w TURN WARNINGS ON FOR COMPILATION OF YOUR SCRIPT. Recommended.");
printf("\n -x[directory] strip off text before #!perl line and perhaps cd to directory\n");
}
@@ -2323,6 +2334,7 @@ static void
init_lexer()
{
tmpfp = rsfp;
+ rsfp = Nullfp;
lex_start(linestr);
rsfp = tmpfp;
subname = newSVpv("main",4);
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 0d9ee55eb8..a4d9356977 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -2536,7 +2536,7 @@ script, a binary program, or a directory as a Perl program.
(F) You specified a signal name to the kill() function that was not recognized.
Say C<kill -l> in your shell to see the valid signal names on your system.
-=item Unrecognized switch: -%s
+=item Unrecognized switch: -%s (-h will show valid options)
(F) You specified an illegal option to Perl. Don't do that.
(If you think you didn't do that, check the #! line to see if it's
diff --git a/pod/perlop.pod b/pod/perlop.pod
index 439e761328..56859029bf 100644
--- a/pod/perlop.pod
+++ b/pod/perlop.pod
@@ -702,7 +702,7 @@ each time it matches, and FALSE when it eventually runs out of matches.
the search at that point. You can actually find the current match
position of a string or set it using the pos() function; see
L<perlfunc/pos>.) A failed match normally resets the search position to
-the beginning of the string, but you can avoid that by adding the C<c>
+the beginning of the string, but you can avoid that by adding the C</c>
modifier (e.g. C<m//gc>). Modifying the target string also resets the
search position.
diff --git a/t/pragma/locale.t b/t/pragma/locale.t
index d4b73b8f91..e1ec5a800f 100755
--- a/t/pragma/locale.t
+++ b/t/pragma/locale.t
@@ -395,10 +395,14 @@ for (map { chr } 0..255) {
print "ok 101\n";
# The @Locale should be internally consistent.
+# Thanks to Hallvard Furuseth <h.b.furuseth@usit.uio.no>
+# for inventing a way to test for ordering consistency
+# without requiring any particular order.
+# ++$jhi;#@iki.fi
print "# testing 102\n";
{
- my ($from, $to, $lesser, $greater, @test, %test, $test);
+ my ($from, $to, $lesser, $greater, @test, %test, $test, $yes, $no, $sign);
for (0..9) {
# Select a slice.
@@ -410,24 +414,25 @@ print "# testing 102\n";
$from++; $to++;
$to = $#Locale if ($to > $#Locale);
$greater = join('', @Locale[$from..$to]);
+ ($yes, $no, $sign) = ($lesser lt $greater
+ ? (" ", "not ", 1)
+ : ("not ", " ", -1));
+ # all these tests should FAIL (return 0).
@test =
(
- 'not ($lesser lt $greater)', # 0
- 'not ($lesser le $greater)', # 1
- 'not ($lesser ne $greater)', # 2
- ' ($lesser eq $greater)', # 3
- ' ($lesser ge $greater)', # 4
- ' ($lesser gt $greater)', # 5
- ' ($greater lt $lesser )', # 6
- ' ($greater le $lesser )', # 7
- 'not ($greater ne $lesser )', # 8
- ' ($greater eq $lesser )', # 9
- 'not ($greater ge $lesser )', # 10
- 'not ($greater gt $lesser )', # 11
- # Well, these two are sort of redundant
- # because @Locale was derived using cmp.
- 'not (($lesser cmp $greater) == -1)', # 12
- 'not (($greater cmp $lesser ) == 1)' # 13
+ $no.' ($lesser lt $greater)', # 0
+ $no.' ($lesser le $greater)', # 1
+ $no.' ($lesser ne $greater)', # 2
+ $yes.' ($lesser eq $greater)', # 3
+ $yes.' ($lesser ge $greater)', # 4
+ $yes.' ($lesser gt $greater)', # 5
+ $yes.' ($greater lt $lesser )', # 6
+ $yes.' ($greater le $lesser )', # 7
+ $no.' ($greater ne $lesser )', # 8
+ $yes.' ($greater eq $lesser )', # 9
+ $no.' ($greater ge $lesser )', # 10
+ $no.' ($greater gt $lesser )', # 11
+ 'not (($lesser cmp $greater) == -$sign)' # 12
);
@test{@test} = 0 x @test;
$test = 0;
@@ -436,6 +441,8 @@ print "# testing 102\n";
print "# failed 102 at:\n";
print "# lesser = '$lesser'\n";
print "# greater = '$greater'\n";
+ print "# lesser cmp greater = ", $lesser cmp $greater, "\n";
+ print "# greater cmp lesser = ", $greater cmp $lesser, "\n";
print "# (greater) from = $from, to = $to\n";
for my $ti (@test) {
printf("# %-40s %-4s", $ti,
@@ -452,3 +459,5 @@ print "# testing 102\n";
}
}
print "ok 102\n";
+
+# eof
diff --git a/toke.c b/toke.c
index 819e0b6abf..276ebbb556 100644
--- a/toke.c
+++ b/toke.c
@@ -385,6 +385,8 @@ register char *s;
PerlIO_clearerr(rsfp);
else
(void)PerlIO_close(rsfp);
+ if (e_fp == rsfp)
+ e_fp = Nullfp;
rsfp = Nullfp;
return s;
}
@@ -1545,6 +1547,8 @@ yylex()
PerlIO_clearerr(rsfp);
else
(void)PerlIO_close(rsfp);
+ if (e_fp == rsfp)
+ e_fp = Nullfp;
rsfp = Nullfp;
}
if (!in_eval && (minus_n || minus_p)) {
diff --git a/win32/bin/pl2bat.bat b/win32/bin/pl2bat.bat
deleted file mode 100644
index 0b7bf32ee1..0000000000
--- a/win32/bin/pl2bat.bat
+++ /dev/null
@@ -1,103 +0,0 @@
-@rem = '--*-Perl-*--
-@echo off
-perl -x -S %0 %*
-goto endofperl
-@rem ';
-#!perl -w
-#line 8
-(my $head = <<'--end--') =~ s/^\t//gm;
- @rem = '--*-Perl-*--
- @echo off
- perl -x -S %0 %*
- goto endofperl
- @rem ';
---end--
-my $headlines = 2 + ($head =~ tr/\n/\n/);
-my $tail = "__END__\n:endofperl\n";
-
-@ARGV = ('-') unless @ARGV;
-
-process(@ARGV);
-
-sub process {
- LOOP:
- foreach ( @_ ) {
- my $myhead = $head;
- my $linedone = 0;
- my $linenum = $headlines;
- my $line;
- open( FILE, $_ ) or die "Can't open $_: $!";
- @file = <FILE>;
- foreach $line ( @file ) {
- $linenum++;
- if ( $line =~ /^:endofperl/) {
- warn "$_ has already been converted to a batch file!\n";
- next LOOP;
- }
- if ( not $linedone and $line =~ /^#!.*perl/ ) {
- $line .= "#line $linenum\n";
- $linedone++;
- }
- }
- close( FILE );
- s/\.pl$//;
- $_ .= '.bat' unless /\.bat$/ or /^-$/;
- open( FILE, ">$_" ) or die "Can't open $_: $!";
- print FILE $myhead;
- print FILE "#!perl\n#line " . ($headlines+1) . "\n" unless $linedone;
- print FILE @file, $tail;
- close( FILE );
- }
-}
-__END__
-
-=head1 NAME
-
-pl2bat.bat - a batch file to wrap perl code into a batch file
-
-=head1 SYNOPSIS
-
- C:\> pl2bat foo.pl bar
- [..creates foo.bat, bar.bat..]
-
- C:\> pl2bat < somefile > another.bat
-
- C:\> pl2bat > another.bat
- print scalar reverse "rekcah lrep rehtona tsuj\n";
- ^Z
- [..another.bat is now a certified japh application..]
-
-=head1 DESCRIPTION
-
-This utility converts a perl script into a batch file that can be
-executed on DOS-like operating systems.
-
-Note that the ".pl" suffix will be stripped before adding a
-".bat" suffix to the supplied file names.
-
-The batch file created makes use of the C<%*> construct to refer
-to all the command line arguments that were given to the batch file,
-so you'll need to make sure that works on your variant of the
-command shell. It is known to work in the cmd.exe shell under
-WindowsNT. 4DOS/NT users will want to put a C<ParameterChar = *>
-line in their initialization file, or execute C<setdos /p*> in
-the shell startup file.
-
-=head1 BUGS
-
-C<$0> will contain the full name, including the ".bat" suffix.
-If you don't like this, see runperl.bat for an alternative way to
-invoke perl scripts.
-
-Perl is invoked with the -S flag, so it will search the PATH to find
-the script. This may have undesirable effects.
-
-=head1 SEE ALSO
-
-perl, perlwin32, runperl.bat
-
-=cut
-
-__END__
-:endofperl
-
diff --git a/win32/bin/runperl.bat b/win32/bin/runperl.bat
deleted file mode 100644
index cca69e89e0..0000000000
--- a/win32/bin/runperl.bat
+++ /dev/null
@@ -1,76 +0,0 @@
-@rem = '--*-Perl-*--
-@echo off
-perl -x -S %0 %*
-goto endofperl
-@rem ';
-#!perl -w
-#line 8
-$0 =~ s|\.bat||i;
-unless (-f $0) {
- $0 =~ s|.*[/\\]||;
- for (".", split ';', $ENV{PATH}) {
- $_ = "." if $_ eq "";
- $0 = "$_/$0" , goto doit if -f "$_/$0";
- }
- die "`$0' not found.\n";
-}
-doit: exec "perl", "-x", $0, @ARGV;
-die "Failed to exec `$0': $!";
-__END__
-
-=head1 NAME
-
-runperl.bat - an "universal" batch file to run perl scripts
-
-=head1 SYNOPSIS
-
- C:\> copy runperl.bat foo.bat
- C:\> foo
- [..runs the perl script `foo'..]
-
- C:\> foo.bat
- [..runs the perl script `foo'..]
-
-
-=head1 DESCRIPTION
-
-This file can be copied to any file name ending in the ".bat" suffix.
-When executed on a DOS-like operating system, it will invoke the perl
-script of the same name, but without the ".bat" suffix. It will
-look for the script in the same directory as itself, and then in
-the current directory, and then search the directories in your PATH.
-
-It relies on the C<exec()> operator, so you will need to make sure
-that works in your perl.
-
-This method of invoking perl scripts has some advantages over
-batch-file wrappers like C<pl2bat.bat>: it avoids duplication
-of all the code; it ensures C<$0> contains the same name as the
-executing file, without any egregious ".bat" suffix; it allows
-you to separate your perl scripts from the wrapper used to
-run them; since the wrapper is generic, you can use symbolic
-links to simply link to C<runperl.bat>, if you are serving your
-files on a filesystem that supports that.
-
-On the other hand, if the batch file is invoked with the ".bat"
-suffix, it does an extra C<exec()>. This may be a performance
-issue. You can avoid this by running it without specifying
-the ".bat" suffix.
-
-Perl is invoked with the -x flag, so the script must contain
-a C<#!perl> line. Any flags found on that line will be honored.
-
-=head1 BUGS
-
-Perl is invoked with the -S flag, so it will search the PATH to find
-the script. This may have undesirable effects.
-
-=head1 SEE ALSO
-
-perl, perlwin32, pl2bat.bat
-
-=cut
-
-__END__
-:endofperl
-
diff --git a/win32/bin/search.bat b/win32/bin/search.bat
deleted file mode 100644
index 88e83e5040..0000000000
--- a/win32/bin/search.bat
+++ /dev/null
@@ -1,1873 +0,0 @@
-@rem = '--*-Perl-*--';
-@rem = '
-@echo off
-perl -S %0.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto endofperl
-@rem ';
-#!/usr/local/bin/perl -w
-'di';
-'ig00';
-##############################################################################
-##
-## search
-##
-## Jeffrey Friedl (jfriedl@omron.co.jp), Dec 1994.
-## Copyright 19.... ah hell, just take it.
-##
-## BLURB:
-## A combo of find and grep -- more or less do a 'grep' on a whole
-## directory tree. Fast, with lots of options. Much more powerful than
-## the simple "find ... | xargs grep ....". Has a full man page.
-## Powerfully customizable.
-##
-## This file is big, but mostly comments and man page.
-##
-## See man page for usage info.
-## Return value: 2=error, 1=nothing found, 0=something found.
-##
-
-$version = "950918.5";
-##
-## "950918.5";
-## Changed all 'sysread' to 'read' because Linux perl's don't seem
-## to like sysread()
-##
-## "941227.4";
-## Added -n, -u
-##
-## "941222.3"
-## Added -nice (due to Lionel Cons <Lionel.Cons@cern.ch>)
-## Removed any leading "./" from name.
-## Added default flags for ~/.search, including TTY, -nice, -list, etc.
-## Program name now has path removed when printed in diagnostics.
-## Added simple tilde-expansion to -dir arg.
-## Added -dskip, etc. Fixed -iregex bug.
-## Changed -dir to be additive, adding -ddir.
-## Now screen out devices, pipes, and sockets.
-## More tidying and lots of expanding of the man page
-##
-##
-## "941217.2";
-## initial release.
-
-$stripped=0;
-
-&init;
-$rc_file = join('/', $ENV{'HOME'}, ".search");
-
-&check_args;
-
-## Make sure we've got a regex.
-## Don't need one if -find or -showrc was specified.
-$!=2, die "expecting regex arguments.\n"
- if $FIND_ONLY == 0 && $showrc == 0 && @ARGV == 0;
-
-&prepare_to_search($rc_file);
-
-&import_program if !defined &dodir; ## BIG key to speed.
-
-## do search while there are directories to be done.
-&dodir(shift(@todo)) while @todo;
-
-&clear_message if $VERBOSE && $STDERR_IS_TTY;
-exit($retval);
-###############################################################################
-
-sub init
-{
- ## initialize variables that might be reset by command-line args
- $DOREP=0; ## set true by -dorep (redo multi-hardlink files)
- $DO_SORT=0; ## set by -sort (sort files in a dir before checking)
- $FIND_ONLY=0; ## set by -find (don't search files)
- $LIST_ONLY=0; ## set true by -l (list filenames only)
- $NEWER=0; ## set by -newer, "-mtime -###"
- $NICE=0; ## set by -nice (print human-readable output)
- $NOLINKS=0; ## set true by -nolinks (don't follow symlinks)
- $OLDER=0; ## set by -older, "-mtime ###"
- $PREPEND_FILENAME=1; ## set false by -h (don't prefix lines with filename)
- $REPORT_LINENUM=0; ## set true by -n (show line numbers)
- $VERBOSE=0; ## set to a value by -v, -vv, etc. (verbose messages)
- $WHY=0; ## set true by -why, -vvv+ (report why skipped)
- $XDEV=0; ## set true by -xdev (stay on one filesystem)
- $all=0; ## set true by -all (don't skip many kinds of files)
- $iflag = ''; ## set to 'i' by -i (ignore case);
- $norc=0; ## set by -norc (don't load rc file)
- $showrc=0; ## set by -showrc (show what happens with rc file)
- $underlineOK=0; ## set true by -u (watch for underline stuff)
- $words=0; ## set true by -w (match whole-words only)
- $DELAY=0; ## inter-file delay (seconds)
- $retval=1; ## will set to 0 if we find anything.
-
- ## various elements of stat() that we might access
- $STAT_DEV = 1;
- $STAT_INODE = 2;
- $STAT_MTIME = 9;
-
- $VV_PRINT_COUNT = 50; ## with -vv, print every VV_PRINT_COUNT files, or...
- $VV_SIZE = 1024*1024; ## ...every VV_SIZE bytes searched
- $vv_print = $vv_size = 0; ## running totals.
-
- ## set default options, in case the rc file wants them
- $opt{'TTY'}= 1 if -t STDOUT;
-
- ## want to know this for debugging message stuff
- $STDERR_IS_TTY = -t STDERR ? 1 : 0;
- $STDERR_SCREWS_STDOUT = ($STDERR_IS_TTY && -t STDOUT) ? 1 : 0;
-
- $0 =~ s,.*/,,; ## clean up $0 for any diagnostics we'll be printing.
-}
-
-##
-## Check arguments.
-##
-sub check_args
-{
- while (@ARGV && $ARGV[0] =~ m/^-/)
- {
- $arg = shift(@ARGV);
-
- if ($arg eq '-version' || ($VERBOSE && $arg eq '-help')) {
- print qq/Jeffrey's file search, version "$version".\n/;
- exit(0) unless $arg eq '-help';
- }
- if ($arg eq '-help') {
- print <<INLINE_LITERAL_TEXT;
-usage: $0 [options] [-e] [PerlRegex ....]
-OPTIONS TELLING *WHERE* TO SEARCH:
- -dir DIR start search at the named directory (default is current dir).
- -xdev stay on starting file system.
- -sort sort the files in each directory before processing.
- -nolinks don't follow symbolic links.
-OPTIONS TELLING WHICH FILES TO EVEN CONSIDER:
- -mtime # consider files modified > # days ago (-# for < # days old)
- -newer FILE consider files modified more recently than FILE (also -older)
- -name GLOB consider files whose name matches pattern (also -regex).
- -skip GLOB opposite of -name: identifies files to not consider.
- -path GLOB like -name, but for files whose whole path is described.
- -dpath/-dregex/-dskip versions for selecting or pruning directories.
- -all don't skip any files marked to be skipped by the startup file.
- -x<SPECIAL> (see manual, and/or try -showrc).
- -why report why a file isn't checked (also implied by -vvvv).
-OPTIONS TELLING WHAT TO DO WITH FILES THAT WILL BE CONSIDERED:
- -f | -find just list files (PerlRegex ignored). Default is to grep them.
- -ff | -ffind Does a faster -find (implies -find -all -dorep)
-OPTIONS CONTROLLING HOW THE SEARCH IS DONE (AND WHAT IS PRINTED):
- -l | -list only list files with matches, not the lines themselves.
- -nice | -nnice print more "human readable" output.
- -n prefix each output line with its line number in the file.
- -h don't prefix output lines with file name.
- -u also look "inside" manpage-style underlined text
- -i do case-insensitive searching.
- -w match words only (as defined by perl's \\b).
-OTHER OPTIONS:
- -v, -vv, -vvv various levels of message verbosity.
- -e end of options (in case a regex looks like an option).
- -showrc show what the rc file sets, then exit.
- -norc don't load the rc file.
- -dorep check files with multiple hard links multiple times.
-INLINE_LITERAL_TEXT
- print "Use -v -help for more verbose help.\n" unless $VERBOSE;
- print "This script file is also a man page.\n" unless $stripped;
- print <<INLINE_LITERAL_TEXT if $VERBOSE;
-
-If -f (or -find) given, PerlRegex is optional and ignored.
-Otherwise, will search for files with lines matching any of the given regexes.
-
-Combining things like -name and -mtime implies boolean AND.
-However, duplicating things (such as -name '*.c' -name '*.txt') implies OR.
-
--mtime may be given floating point (i.e. 1.5 is a day and a half).
--iskip/-idskip/-ipath/... etc are case-insensitive versions.
-
-If any letter in -newer/-older is upper case, "or equal" is
-inserted into the test.
-
-You can always find the latest version on the World Wide Web in
- http://www.wg.omron.co.jp/~jfriedl/perl/
-INLINE_LITERAL_TEXT
- exit(0);
- }
- $DOREP=1, next if $arg eq '-dorep'; ## do repeats
- $DO_SORT=1, next if $arg eq '-sort'; ## sort files
- $NOLINKS=1, next if $arg eq '-nolinks'; ## no sym. links
- $PREPEND_FILENAME=0, next if $arg eq '-h'; ## no filename prefix
- $REPORT_LINENUM=1, next if $arg eq '-n'; ## show line numbers
- $WHY=1, next if $arg eq '-why'; ## tell why skipped
- $XDEV=1, next if $arg eq '-xdev'; ## don't leave F.S.
- $all=1,$opt{'-all'}=1,next if $arg eq '-all'; ## don't skip *.Z, etc
- $iflag='i', next if $arg eq '-i'; ## ignore case
- $norc=1, next if $arg eq '-norc'; ## don't load rc file
- $showrc=1, next if $arg eq '-showrc'; ## show rc file
- $underlineOK=1, next if $arg eq '-u'; ## look throuh underln.
- $words=1, next if $arg eq '-w'; ## match "words" only
- &strip if $arg eq '-strip'; ## dump this program
- last if $arg eq '-e';
- $DELAY=$1, next if $arg =~ m/-delay(\d+)/;
-
- $FIND_ONLY=1, next if $arg =~/^-f(ind)?$/;## do "find" only
-
- $FIND_ONLY=1, $DOREP=1, $all=1,
- next if $arg =~/^-ff(ind)?$/;## fast -find
- $LIST_ONLY=1,$opt{'-list'}=1,
- next if $arg =~/^-l(ist)?$/;## only list files
-
- if ($arg =~ m/^-(v+)$/) { ## verbosity
- $VERBOSE =length($1);
- foreach $len (1..$VERBOSE) { $opt{'-'.('v' x $len)}=1 }
- next;
- }
- if ($arg =~ m/^-(n+)ice$/) { ## "nice" output
- $NICE =length($1);
- foreach $len (1..$NICE) { $opt{'-'.('n' x $len).'ice'}=1 }
- next;
- }
-
- if ($arg =~ m/^-(i?)(d?)skip$/) {
- local($i) = $1 eq 'i';
- local($d) = $2 eq 'd';
- $! = 2, die qq/$0: expecting glob arg to -$arg\n/ unless @ARGV;
- foreach (split(/\s+/, shift @ARGV)) {
- if ($d) {
- $idskip{$_}=1 if $i;
- $dskip{$_}=1;
- } else {
- $iskip{$_}=1 if $i;
- $skip{$_}=1;
- }
- }
- next;
- }
-
-
- if ($arg =~ m/^-(i?)(d?)(regex|path|name)$/) {
- local($i) = $1 eq 'i';
- $! = 2, die qq/$0: expecting arg to -$arg\n/ unless @ARGV;
- foreach (split(/\s+/, shift @ARGV)) {
- $iname{join(',', $arg, $_)}=1 if $i;
- $name{join(',', $arg, $_)}=1;
- }
- next;
- }
-
- if ($arg =~ m/^-d?dir$/) {
- $opt{'-dir'}=1;
- $! = 2, die qq/$0: expecting filename arg to -$arg\n/ unless @ARGV;
- $start = shift(@ARGV);
- $start =~ s#^~(/+|$)#$ENV{'HOME'}$1# if defined $ENV{'HOME'};
- $! = 2, die qq/$0: can't find ${arg}'s "$start"\n/ unless -e $start;
- $! = 2, die qq/$0: ${arg}'s "$start" not a directory.\n/ unless -d _;
- undef(@todo), $opt{'-ddir'}=1 if $arg eq '-ddir';
- push(@todo, $start);
- next;
- }
-
- if ($arg =~ m/^-(new|old)er$/i) {
- $! = 2, die "$0: expecting filename arg to -$arg\n" unless @ARGV;
- local($file, $time) = shift(@ARGV);
- $! = 2, die qq/$0: can't stat -${arg}'s "$file"./
- unless $time = (stat($file))[$STAT_MTIME];
- local($upper) = $arg =~ tr/A-Z//;
- if ($arg =~ m/new/i) {
- $time++ unless $upper;
- $NEWER = $time if $NEWER < $time;
- } else {
- $time-- unless $upper;
- $OLDER = $time if $OLDER == 0 || $OLDER > $time;
- }
- next;
- }
-
- if ($arg =~ m/-mtime/) {
- $! = 2, die "$0: expecting numerical arg to -$arg\n" unless @ARGV;
- local($days) = shift(@ARGV);
- $! = 2, die qq/$0: inappropriate arg ($days) to $arg\n/ if $days==0;
- $days *= 3600 * 24;
- if ($days < 0) {
- local($time) = $^T + $days;
- $NEWER = $time if $NEWER < $time;
- } else {
- local($time) = $^T - $days;
- $OLDER = $time if $OLDER == 0 || $OLDER > $time;
- }
- next;
- }
-
- ## special user options
- if ($arg =~ m/^-x(.+)/) {
- foreach (split(/[\s,]+/, $1)) { $user_opt{$_} = $opt{$_}= 1; }
- next;
- }
-
- $! = 2, die "$0: unknown arg [$arg]\n";
- }
-}
-
-##
-## Given a filename glob, return a regex.
-## If the glob has no globbing chars (no * ? or [..]), then
-## prepend an effective '*' to it.
-##
-sub glob_to_regex
-{
- local($glob) = @_;
- local(@parts) = $glob =~ m/\\.|[*?]|\[]?[^]]*]|[^[\\*?]+/g;
- local($trueglob)=0;
- foreach (@parts) {
- if ($_ eq '*' || $_ eq '?') {
- $_ = ".$_";
- $trueglob=1; ## * and ? are a real glob
- } elsif (substr($_, 0, 1) eq '[') {
- $trueglob=1; ## [..] is a real glob
- } else {
- s/^\\//; ## remove any leading backslash;
- s/\W/\\$&/g; ## now quote anything dangerous;
- }
- }
- unshift(@parts, '.*') unless $trueglob;
- join('', '^', @parts, '$');
-}
-
-sub prepare_to_search
-{
- local($rc_file) = @_;
-
- $HEADER_BYTES=0; ## Might be set nonzero in &read_rc;
- $last_message_length = 0; ## For &message and &clear_message.
-
- &read_rc($rc_file, $showrc) unless $norc;
- exit(0) if $showrc;
-
- $NEXT_DIR_ENTRY = $DO_SORT ? 'shift @files' : 'readdir(DIR)';
- $WHY = 1 if $VERBOSE > 3; ## Arg -vvvv or above implies -why.
- @todo = ('.') if @todo == 0; ## Where we'll start looking
-
- ## see if any user options were specified that weren't accounted for
- foreach $opt (keys %user_opt) {
- next if defined $seen_opt{$opt};
- warn "warning: -x$opt never considered.\n";
- }
-
- die "$0: multiple time constraints exclude all possible files.\n"
- if ($NEWER && $OLDER) && ($NEWER > $OLDER);
-
- ##
- ## Process any -skip/-iskip args that had been given
- ##
- local(@skip_test);
- foreach $glob (keys %skip) {
- $i = defined($iskip{$glob}) ? 'i': '';
- push(@skip_test, '$name =~ m/'. &glob_to_regex($glob). "/$i");
- }
- if (@skip_test) {
- $SKIP_TEST = join('||',@skip_test);
- $DO_SKIP_TEST = 1;
- } else {
- $DO_SKIP_TEST = $SKIP_TEST = 0;
- }
-
- ##
- ## Process any -dskip/-idskip args that had been given
- ##
- local(@dskip_test);
- foreach $glob (keys %dskip) {
- $i = defined($idskip{$glob}) ? 'i': '';
- push(@dskip_test, '$name =~ m/'. &glob_to_regex($glob). "/$i");
- }
- if (@dskip_test) {
- $DSKIP_TEST = join('||',@dskip_test);
- $DO_DSKIP_TEST = 1;
- } else {
- $DO_DSKIP_TEST = $DSKIP_TEST = 0;
- }
-
-
- ##
- ## Process any -name, -path, -regex, etc. args that had been given.
- ##
- undef @name_test;
- undef @dname_test;
- foreach $key (keys %name) {
- local($type, $pat) = split(/,/, $key, 2);
- local($i) = defined($iname{$key}) ? 'i' : '';
- if ($type =~ /regex/) {
- $pat =~ s/!/\\!/g;
- $test = "\$name =~ m!^$pat\$!$i";
- } else {
- local($var) = $type eq 'name' ? '$name' : '$file';
- $test = "$var =~ m/". &glob_to_regex($pat). "/$i";
- }
- if ($type =~ m/^-i?d/) {
- push(@dname_test, $test);
- } else {
- push(@name_test, $test);
- }
- }
- if (@name_test) {
- $GLOB_TESTS = join('||', @name_test);
-
- $DO_GLOB_TESTS = 1;
- } else {
- $GLOB_TESTS = $DO_GLOB_TESTS = 0;
- }
- if (@dname_test) {
- $DGLOB_TESTS = join('||', @dname_test);
- $DO_DGLOB_TESTS = 1;
- } else {
- $DGLOB_TESTS = $DO_DGLOB_TESTS = 0;
- }
-
-
- ##
- ## Process any 'magic' things from the startup file.
- ##
- if (@magic_tests && $HEADER_BYTES) {
- ## the $magic' one is for when &dodir is not inlined
- $tests = join('||',@magic_tests);
- $MAGIC_TESTS = " { package magic; \$val = ($tests) }";
- $DO_MAGIC_TESTS = 1;
- } else {
- $MAGIC_TESTS = 1;
- $DO_MAGIC_TESTS = 0;
- }
-
- ##
- ## Prepare regular expressions.
- ##
- {
- local(@regex_tests);
-
- if ($LIST_ONLY) {
- $mflag = '';
- ## need to have $* set, but perl5 just won''t shut up about it.
- if ($] >= 5) {
- $mflag = 'm';
- } else {
- eval ' $* = 1 ';
- }
- }
-
- ##
- ## Until I figure out a better way to deal with it,
- ## We have to worry about a regex like [^xyz] when doing $LIST_ONLY.
- ## Such a regex *will* match \n, and if I'm pulling in multiple
- ## lines, it can allow lines to match that would otherwise not match.
- ##
- ## Therefore, if there is a '[^' in a regex, we can NOT take a chance
- ## an use the fast listonly.
- ##
- $CAN_USE_FAST_LISTONLY = $LIST_ONLY;
-
- local(@extra);
- local($underline_glue) = ($] >= 5) ? '(:?_\cH)?' : '(_\cH)?';
- while (@ARGV) {
- $regex = shift(@ARGV);
- ##
- ## If watching for underlined things too, add another regex.
- ##
- if ($underlineOK) {
- if ($regex =~ m/[?*+{}()\\.|^\$[]/) {
- warn "$0: warning, can't underline-safe ``$regex''.\n";
- } else {
- $regex = join($underline_glue, split(//, $regex));
- }
- }
-
- ## If nothing special in the regex, just use index...
- ## is quite a bit faster.
- if (($iflag eq '') && ($words == 0) &&
- $regex !~ m/[?*+{}()\\.|^\$[]/)
- {
- push(@regex_tests, "(index(\$_, q+$regex+)>=0)");
-
- } else {
- $regex =~ s#[\$\@\/]\w#\\$&#;
- if ($words) {
- if ($regex =~ m/\|/) {
- ## could be dangerous -- see if we can wrap in parens.
- if ($regex =~ m/\\\d/) {
- warn "warning: -w and a | in a regex is dangerous.\n"
- } else {
- $regex = join($regex, '(', ')');
- }
- }
- $regex = join($regex, '\b', '\b');
- }
- $CAN_USE_FAST_LISTONLY = 0 if substr($regex, "[^") >= 0;
- push(@regex_tests, "m/$regex/$iflag$mflag");
- }
-
- ## If we're done, but still have @extra to do, get set for that.
- if (@ARGV == 0 && @extra) {
- @ARGV = @extra; ## now deal with the extra stuff.
- $underlineOK = 0; ## but no more of this.
- undef @extra; ## or this.
- }
- }
- if (@regex_tests) {
- $REGEX_TEST = join('||', @regex_tests);
- ## print STDERR $REGEX_TEST, "\n"; exit;
- } else {
- ## must be doing -find -- just give something syntactically correct.
- $REGEX_TEST = 1;
- }
- }
-
- ##
- ## Make sure we can read the first item(s).
- ##
- foreach $start (@todo) {
- $! = 2, die qq/$0: can't stat "$start"\n/
- unless ($dev,$inode) = (stat($start))[$STAT_DEV,$STAT_INODE];
-
- if (defined $dir_done{"$dev,$inode"}) {
- ## ignore the repeat.
- warn(qq/ignoring "$start" (same as "$dir_done{"$dev,$inode"}").\n/)
- if $VERBOSE;
- next;
- }
-
- ## if -xdev was given, remember the device.
- $xdev{$dev} = 1 if $XDEV;
-
- ## Note that we won't want to do it again
- $dir_done{"$dev,$inode"} = $start;
- }
-}
-
-
-##
-## See the comment above the __END__ above the 'sub dodir' below.
-##
-sub import_program
-{
- sub bad {
- print STDERR "$0: internal error (@_)\n";
- exit 2;
- }
-
- ## Read from data, up to next __END__. This will be &dodir.
- local($/) = "\n__END__";
- $prog = <DATA>;
- close(DATA);
-
- $prog =~ s/\beval\b//g; ## remove any 'eval'
-
- ## Inline uppercase $-variables by their current values.
- if ($] >= 5) {
- $prog =~ s/\$([A-Z][A-Z0-9_]{2,}\b)/
- &bad($1) if !defined ${$main::{$1}}; ${$main::{$1}};/eg;
- } else {
- $prog =~ s/\$([A-Z][A-Z0-9_]{2,}\b)/local(*VAR) = $_main{$1};
- &bad($1) if !defined $VAR; $VAR;/eg;
- }
-
- eval $prog; ## now do it. This will define &dodir;
- $!=2, die "$0 internal error: $@\n" if $@;
-}
-
-###########################################################################
-
-##
-## Read the .search file:
-## Blank lines and lines that are only #-comments ignored.
-## Newlines may be escaped to create long lines
-## Other lines are directives.
-##
-## A directive may begin with an optional tag in the form <...>
-## Things inside the <...> are evaluated as with:
-## <(this || that) && must>
-## will be true if
-## -xmust -xthis or -xmust -xthat
-## were specified on the command line (order doesn't matter, though)
-## A directive is not done if there is a tag and it's false.
-## Any characters but whitespace and &|()>,! may appear after an -x
-## (although "-xdev" is special). -xmust,this is the same as -xmust -xthis.
-## Something like -x~ would make <~> true, and <!~> false.
-##
-## Directives are in the form:
-## option: STRING
-## magic : NUMBYTES : EXPR
-##
-## With option:
-## The STRING is parsed like a Bourne shell command line, and the
-## options are used as if given on the command line.
-## No comments are allowed on 'option' lines.
-## Examples:
-## # skip objects and libraries
-## option: -skip '.o .a'
-## # skip emacs *~ and *# files, unless -x~ given:
-## <!~> option: -skip '~ #'
-##
-## With magic:
-## EXPR can be pretty much any perl (comments allowed!).
-## If it evaluates to true for any particular file, it is skipped.
-## The only info you'll have about a file is the variable $H, which
-## will have at least the first NUMBYTES of the file (less if the file
-## is shorter than that, of course, and maybe more). You'll also have
-## any variables you set in previous 'magic' lines.
-## Examples:
-## magic: 6 : ($x6 = substr($H, 0, 6)) eq 'GIF87a'
-## magic: 6 : $x6 eq 'GIF89a'
-##
-## magic: 6 : (($x6 = substr($H, 0, 6)) eq 'GIF87a' ## old gif \
-## || $x6 eq 'GIF89a' ## new gif
-## (the above two sets are the same)
-## ## Check the first 32 bytes for "binarish" looking bytes.
-## ## Don't blindly dump on any high-bit set, as non-ASCII text
-## ## often has them set. \x80 and \xff seem to be special, though.
-## ## Require two in a row to not get things like perl's $^T.
-## ## This is known to get *.Z, *.gz, pkzip, *.elc and about any
-## ## executable you'll find.
-## magic: 32 : $H =~ m/[\x00-\x06\x10-\x1a\x1c-\x1f\x80\xff]{2}/
-##
-sub read_rc
-{
- local($file, $show) = @_;
- local($line_num, $ln, $tag) = 0;
- local($use_default, @default) = 0;
-
- { package magic; $ = 0; } ## turn off warnings for when we run EXPR's
-
- unless (open(RC, "$file")) {
- $use_default=1;
- $file = "<internal default startup file>";
- ## no RC file -- use this default.
- @default = split(/\n/,<<'--------INLINE_LITERAL_TEXT');
- magic: 32 : $H =~ m/[\x00-\x06\x10-\x1a\x1c-\x1f\x80\xff]{2}/
- option: -skip '.a .COM .elc .EXE .gz .o .pbm .xbm .dvi'
- option: -iskip '.tarz .zip .z .lzh .jpg .jpeg .gif .uu'
- <!~> option: -skip '~ #'
---------INLINE_LITERAL_TEXT
- }
-
- ##
- ## Make an eval error pretty.
- ##
- sub clean_eval_error {
- local($_) = @_;
- s/ in file \(eval\) at line \d+,//g; ## perl4-style error
- s/ at \(eval \d+\) line \d+,//g; ## perl5-style error
- $_ = $` if m/\n/; ## remove all but first line
- "$_\n";
- }
-
- print "reading RC file: $file\n" if $show;
-
- while (defined($_ = ($use_default ? shift(@default) : <RC>))) {
- $ln = ++$line_num; ## note starting line num.
- $_ .= <RC>, $line_num++ while s/\\\n?$/\n/; ## allow continuations
- next if /^\s*(#.*)?$/; ## skip blank or comment-only lines.
- $do = '';
-
- ## look for an initial <...> tag.
- if (s/^\s*<([^>]*)>//) {
- ## This simple s// will make the tag ready to eval.
- ($tag = $msg = $1) =~
- s/[^\s&|(!)]+/
- $seen_opt{$&}=1; ## note seen option
- "defined(\$opt{q>$&>})" ## (q>> is safe quoting here)
- /eg;
-
- ## see if the tag is true or not, abort this line if not.
- $dothis = (eval $tag);
- $!=2, die "$file $ln <$msg>: $_".&clean_eval_error($@) if $@;
-
- if ($show) {
- $msg =~ s/[^\s&|(!)]+/-x$&/;
- $msg =~ s/\s*!\s*/ no /g;
- $msg =~ s/\s*&&\s*/ and /g;
- $msg =~ s/\s*\|\|\s*/ or /g;
- $msg =~ s/^\s+//; $msg =~ s/\s+$//;
- $do = $dothis ? "(doing because $msg)" :
- "(do if $msg)";
- } elsif (!$dothis) {
- next;
- }
- }
-
- if (m/^\s*option\s*:\s*/) {
- next if $all && !$show; ## -all turns off these checks;
- local($_) = $';
- s/\n$//;
- local($orig) = $_;
- print " $do option: $_\n" if $show;
- local($0) = "$0 ($file)"; ## for any error message.
- local(@ARGV);
- local($this);
- ##
- ## Parse $_ as a Bourne shell line -- fill @ARGV
- ##
- while (length) {
- if (s/^\s+//) {
- push(@ARGV, $this) if defined $this;
- undef $this;
- next;
- }
- $this = '' if !defined $this;
- $this .= $1 while s/^'([^']*)'// ||
- s/^"([^"]*)"// ||
- s/^([^'"\s\\]+)//||
- s/^(\\[\D\d])//;
- die "$file $ln: error parsing $orig at $_\n" if m/^\S/;
- }
- push(@ARGV, $this) if defined $this;
- &check_args;
- die qq/$file $ln: unused arg "@ARGV".\n/ if @ARGV;
- next;
- }
-
- if (m/^\s*magic\s*:\s*(\d+)\s*:\s*/) {
- next if $all && !$show; ## -all turns off these checks;
- local($bytes, $check) = ($1, $');
-
- if ($show) {
- $check =~ s/\n?$/\n/;
- print " $do contents: $check";
- }
- ## Check to make sure the thing at least compiles.
- eval "package magic; (\$H = '1'x \$main'bytes) && (\n$check\n)\n";
- $! = 2, die "$file $ln: ".&clean_eval_error($@) if $@;
-
- $HEADER_BYTES = $bytes if $bytes > $HEADER_BYTES;
- push(@magic_tests, "(\n$check\n)");
- next;
- }
- $! = 2, die "$file $ln: unknown command\n";
- }
- close(RC);
-}
-
-sub message
-{
- if (!$STDERR_IS_TTY) {
- print STDERR $_[0], "\n";
- } else {
- local($text) = @_;
- $thislength = length($text);
- if ($thislength >= $last_message_length) {
- print STDERR $text, "\r";
- } else {
- print STDERR $text, ' 'x ($last_message_length-$thislength),"\r";
- }
- $last_message_length = $thislength;
- }
-}
-
-sub clear_message
-{
- print STDERR ' ' x $last_message_length, "\r" if $last_message_length;
- $vv_print = $vv_size = $last_message_length = 0;
-}
-
-##
-## Output a copy of this program with comments, extra whitespace, and
-## the trailing man page removed. On an ultra slow machine, such a copy
-## might load faster (but I can't tell any difference on my machine).
-##
-sub strip {
- seek(DATA, 0, 0) || die "$0: can't reset internal pointer.\n";
- while(<DATA>) {
- print, next if /INLINE_LITERAL_TEXT/.../INLINE_LITERAL_TEXT/;
- ## must mention INLINE_LITERAL_TEXT on this line!
- s/\#\#.*|^\s+|\s+$//; ## remove cruft
- last if $_ eq '.00;';
- next if ($_ eq '') || ($_ eq "'di'") || ($_ eq "'ig00'");
- s/\$stripped=0;/\$stripped=1;/;
- s/\s\s+/ /; ## squish multiple whitespaces down to one.
- print $_, "\n";
- }
- exit(0);
-}
-
-##
-## Just to shut up -w. Never executed.
-##
-sub dummy {
-
- 1 || &dummy || &dir_done || &bad || &message || $NEXT_DIR_ENTRY ||
- $DELAY || $VV_SIZE || $VV_PRINT_COUNT || $STDERR_SCREWS_STDOUT ||
- @files || @files || $magic'H || $magic'H || $xdev{''} || &clear_message;
-
-}
-
-##
-## If the following __END__ is in place, what follows will be
-## inlined when the program first starts up. Any $ variable name
-## all in upper case, specifically, any string matching
-## \$([A-Z][A-Z0-9_]{2,}\b
-## will have the true value for that variable inlined. Also, any 'eval' is
-## removed
-##
-## The idea is that when the whole thing is then eval'ed to define &dodir,
-## the perl optimizer will make all the decisions that are based upon
-## command-line options (such as $VERBOSE), since they'll be inlined as
-## constants
-##
-## Also, and here's the big win, the tests for matching the regex, and a
-## few others, are all inlined. Should be blinding speed here.
-##
-## See the read from <DATA> above for where all this takes place.
-## But all-in-all, you *want* the __END__ here. Comment it out only for
-## debugging....
-##
-
-__END__
-
-##
-## Given a directory, check all "appropriate" files in it.
-## Shove any subdirectories into the global @todo, so they'll be done
-## later.
-##
-## Be careful about adding any upper-case variables, as they are subject
-## to being inlined. See comments above the __END__ above.
-##
-sub dodir
-{
- local($dir) = @_;
- $dir =~ s,/+$,,; ## remove any trailing slash.
- unless (opendir(DIR, "$dir/.")) {
- &clear_message if $VERBOSE && $STDERR_SCREWS_STDOUT;
- warn qq($0: can't opendir "$dir/".\n);
- return;
- }
-
- if ($VERBOSE) {
- &message($dir);
- $vv_print = $vv_size = 0;
- }
-
- @files = sort readdir(DIR) if $DO_SORT;
-
- while (defined($name = eval $NEXT_DIR_ENTRY))
- {
- next if $name eq '.' || $name eq '..'; ## never follow these.
-
- ## create full relative pathname.
- $file = $dir eq '.' ? $name : "$dir/$name";
-
- ## if link and skipping them, do so.
- if ($NOLINKS && -l $file) {
- warn qq/skip (symlink): $file\n/ if $WHY;
- next;
- }
-
- ## skip things unless files or directories
- unless (-f $file || -d _) {
- if ($WHY) {
- $why = (-S _ && "socket") ||
- (-p _ && "pipe") ||
- (-b _ && "block special")||
- (-c _ && "char special") || "somekinda special";
- warn qq/skip ($why): $file\n/;
- }
- next;
- }
-
- ## skip things we can't read
- unless (-r _) {
- if ($WHY) {
- $why = (-l $file) ? "follow" : "read";
- warn qq/skip (can't $why): $file\n/;
- }
- next;
- }
-
- ## skip things that are empty
- unless (-s _) {
- warn qq/skip (empty): $file\n/ if $WHY;
- next;
- }
-
- ## Note file device & inode. If -xdev, skip if appropriate.
- ($dev, $inode) = (stat(_))[$STAT_DEV, $STAT_INODE];
- if ($XDEV && defined $xdev{$dev}) {
- warn qq/skip (other device): $file\n/ if $WHY;
- next;
- }
- $id = "$dev,$inode";
-
- ## special work for a directory
- if (-d _) {
- ## Do checks for directory file endings.
- if ($DO_DSKIP_TEST && (eval $DSKIP_TEST)) {
- warn qq/skip (-dskip): $file\n/ if $WHY;
- next;
- }
- ## do checks for -name/-regex/-path tests
- if ($DO_DGLOB_TESTS && !(eval $DGLOB_TESTS)) {
- warn qq/skip (dirname): $file\n/ if $WHY;
- next;
- }
-
- ## _never_ redo a directory
- if (defined $dir_done{$id}) {
- warn qq/skip (did as "$dir_done{$id}"): $file\n/ if $WHY;
- next;
- }
- $dir_done{$id} = $file; ## mark it done.
- unshift(@todo, $file); ## add to the list to do.
- next;
- }
- if ($WHY == 0 && $VERBOSE > 1) {
- if ($VERBOSE>2||$vv_print++>$VV_PRINT_COUNT||($vv_size+=-s _)>$VV_SIZE){
- &message($file);
- $vv_print = $vv_size = 0;
- }
- }
-
- ## do time-related tests
- if ($NEWER || $OLDER) {
- $_ = (stat(_))[$STAT_MTIME];
- if ($NEWER && $_ < $NEWER) {
- warn qq/skip (too old): $file\n/ if $WHY;
- next;
- }
- if ($OLDER && $_ > $OLDER) {
- warn qq/skip (too new): $file\n/ if $WHY;
- next;
- }
- }
-
- ## do checks for file endings
- if ($DO_SKIP_TEST && (eval $SKIP_TEST)) {
- warn qq/skip (-skip): $file\n/ if $WHY;
- next;
- }
-
- ## do checks for -name/-regex/-path tests
- if ($DO_GLOB_TESTS && !(eval $GLOB_TESTS)) {
- warn qq/skip (filename): $file\n/ if $WHY;
- next;
- }
-
-
- ## If we're not repeating files,
- ## skip this one if we've done it, or note we're doing it.
- unless ($DOREP) {
- if (defined $file_done{$id}) {
- warn qq/skip (did as "$file_done{$id}"): $file\n/ if $WHY;
- next;
- }
- $file_done{$id} = $file;
- }
-
- if ($DO_MAGIC_TESTS) {
- if (!open(FILE_IN, $file)) {
- &clear_message if $VERBOSE && $STDERR_SCREWS_STDOUT;
- warn qq/$0: can't open: $file\n/;
- next;
- }
- unless (read(FILE_IN, $magic'H, $HEADER_BYTES)) {
- &clear_message if $VERBOSE && $STDERR_SCREWS_STDOUT;
- warn qq/$0: can't read from "$file"\n"/;
- close(FILE_IN);
- next;
- }
-
- eval $MAGIC_TESTS;
- if ($magic'val) {
- close(FILE_IN);
- warn qq/skip (magic): $file\n/ if $WHY;
- next;
- }
- seek(FILE_IN, 0, 0); ## reset for later <FILE_IN>
- }
-
- if ($WHY != 0 && $VERBOSE > 1) {
- if ($VERBOSE>2||$vv_print++>$VV_PRINT_COUNT||($vv_size+=-s _)>$VV_SIZE){
- &message($file);
- $vv_print = $vv_size = 0;
- }
- }
-
- if ($DELAY) {
- sleep($DELAY);
- }
-
- if ($FIND_ONLY) {
- &clear_message if $VERBOSE && $STDERR_SCREWS_STDOUT;
- print $file, "\n";
- $retval=0; ## we've found something
- close(FILE_IN) if $DO_MAGIC_TESTS;
- next;
- } else {
- ## if we weren't doing magic tests, file won't be open yet...
- if (!$DO_MAGIC_TESTS && !open(FILE_IN, $file)) {
- &clear_message if $VERBOSE && $STDERR_SCREWS_STDOUT;
- warn qq/$0: can't open: $file\n/;
- next;
- }
- if ($LIST_ONLY && $CAN_USE_FAST_LISTONLY) {
- ##
- ## This is rather complex, but buys us a LOT when we're just
- ## listing files and not the individual internal lines.
- ##
- local($size) = 4096; ## block-size in which to do reads
- local($nl); ## will point to $_'s ending newline.
- local($read); ## will be how many bytes read.
- local($_) = ''; ## Starts out empty
- local($hold); ## (see below)
-
- while (($read = read(FILE_IN,$_,$size,length($_)))||length($_))
- {
- undef @parts;
- ## if read a full block, but no newline, need to read more.
- while ($read == $size && ($nl = rindex($_, "\n")) < 0) {
- push(@parts, $_); ## save that part
- $read = read(FILE_IN, $_, $size); ## keep trying
- }
-
- ##
- ## If we had to save parts, must now combine them together.
- ## adjusting $nl to reflect the now-larger $_. This should
- ## be a lot more efficient than using any kind of .= in the
- ## loop above.
- ##
- if (@parts) {
- local($lastlen) = length($_); #only need if $nl >= 0
- $_ = join('', @parts, $_);
- $nl = length($_) - ($lastlen - $nl) if $nl >= 0;
- }
-
- ##
- ## If we're at the end of the file, then we can use $_ as
- ## is. Otherwise, we need to remove the final partial-line
- ## and save it so that it'll be at the beginning of the
- ## next read (where the rest of the line will be layed in
- ## right after it). $hold will be what we should save
- ## until next time.
- ##
- if ($read != $size || $nl < 0) {
- $hold = '';
- } else {
- $hold = substr($_, $nl + 1);
- substr($_, $nl + 1) = '';
- }
-
- ##
- ## Now have a bunch of full lines in $_. Use it.
- ##
- if (eval $REGEX_TEST) {
- &clear_message if $VERBOSE && $STDERR_SCREWS_STDOUT;
- print $file, "\n";
- $retval=0; ## we've found something
-
- last;
- }
-
- ## Prepare for next read....
- $_ = $hold;
- }
-
- } else { ## else not using faster block scanning.....
-
- $lines_printed = 0 if $NICE;
- while (<FILE_IN>) {
- study;
- next unless (eval $REGEX_TEST);
-
- ##
- ## We found a matching line.
- ##
- $retval=0;
- &clear_message if $VERBOSE && $STDERR_SCREWS_STDOUT;
- if ($LIST_ONLY) {
- print $file, "\n";
- last;
- } else {
- ## prepare to print line.
- if ($NICE && $lines_printed++ == 0) {
- print '-' x 70, "\n" if $NICE > 1;
- print $file, ":\n";
- }
-
- ##
- ## Print all the prelim stuff. This looks less efficient
- ## than it needs to be, but that's so that when the eval
- ## is compiled (and the tests are optimized away), the
- ## result will be less actual PRINTs than the more natural
- ## way of doing these tests....
- ##
- if ($NICE) {
- if ($REPORT_LINENUM) {
- print " line $.: ";
- } else {
- print " ";
- }
- } elsif ($REPORT_LINENUM && $PREPEND_FILENAME) {
- print "$file,:$.: ";
- } elsif ($PREPEND_FILENAME) {
- print "$file: ";
- } elsif ($REPORT_LINENUM) {
- print "$.: ";
- }
- print $_;
- print "\n" unless m/\n$/;
- }
- }
- print "\n" if ($NICE > 1) && $lines_printed;
- }
- close(FILE_IN);
- }
- }
- closedir(DIR);
-}
-
-__END__
-.00; ## finish .ig
-
-'di \" finish diversion--previous line must be blank
-.nr nl 0-1 \" fake up transition to first page again
-.nr % 0 \" start at page 1
-.\"__________________NORMAL_MAN_PAGE_BELOW_________________
-.ll+10n
-.TH search 1 "Dec 17, 1994"
-.SH SEARCH
-search \- search files (a'la grep) in a whole directory tree.
-.SH SYNOPSIS
-search [ grep-like and find-like options] [regex ....]
-.SH DESCRIPTION
-.I Search
-is more or less a combo of 'find' and 'grep' (although the regular
-expression flavor is that of the perl being used, which is closer to
-egrep's than grep's).
-
-.I Search
-does generally the same kind of thing that
-.nf
- find <blah blah> | xargs egrep <blah blah>
-.fi
-does, but is
-.I much
-more powerful and efficient (and intuitive, I think).
-
-This manual describes
-.I search
-as of version "941227.4". You can always find the latest version at
-.nf
- http://www.wg.omron.co.jp/~jfriedl/perl/index.html
-.fi
-
-.SH "QUICK EXAMPLE"
-Basic use is simple:
-.nf
- % search jeff
-.fi
-will search files in the current directory, and all sub directories, for
-files that have "jeff" in them. The lines will be listed with the
-containing file's name prepended.
-.PP
-If you list more than one regex, such as with
-.nf
- % search jeff Larry Randal+ 'Stoc?k' 'C.*son'
-.fi
-then a line containing any of the regexes will be listed.
-This makes it effectively the same as
-.nf
- % search 'jeff|Larry|Randal+|Stoc?k|C.*son'
-.fi
-However, listing them separately is much more efficient (and is easier
-to type).
-.PP
-Note that in the case of these examples, the
-.B \-w
-(list whole-words only) option would be useful.
-.PP
-Normally, various kinds of files are automatically removed from consideration.
-If it has has a certain ending (such as ".tar", ".Z", ".o", .etc), or if
-the beginning of the file looks like a binary, it'll be excluded.
-You can control exactly how this works -- see below. One quick way to
-override this is to use the
-.B \-all
-option, which means to consider all the files that would normally be
-automatically excluded.
-Or, if you're curious, you can use
-.B \-why
-to have notes about what files are skipped (and why) printed to stderr.
-
-.SH "BASIC OVERVIEW"
-Normally, the search starts in the current directory, considering files in
-all subdirectories.
-
-You can use the
-.I ~/.search
-file to control ways to automatically exclude files.
-If you don't have this file, a default one will kick in, which automatically
-add
-.nf
- -skip .o .Z .gif
-.fi
-(among others) to exclude those kinds of files (which you probably want to
-skip when searching for text, as is normal).
-Files that look to be be binary will also be excluded.
-
-Files ending with "#" and "~" will also be excluded unless the
-.B -x~
-option is given.
-
-You can use
-.B -showrc
-to show what kinds of files will normally be skipped.
-See the section on the startup file
-for more info.
-
-You can use the
-.B -all
-option to indicate you want to consider all files that would otherwise be
-skipped by the startup file.
-
-Based upon various other flags (see "WHICH FILES TO CONSIDER" below),
-more files might be removed from consideration. For example
-.nf
- -mtime 3
-.fi
-will exclude files that aren't at least three days old (change the 3 to -3
-to exclude files that are more than three days old), while
-.nf
- -skip .*
-.fi
-would exclude any file beginning with a dot (of course, '.' and '..' are
-special and always excluded).
-
-If you'd like to see what files are being excluded, and why, you can get the
-list via the
-.B \-why
-option.
-
-If a file makes it past all the checks, it is then "considered".
-This usually means it is greped for the regular expressions you gave
-on the command line.
-
-If any of the regexes match a line, the line is printed.
-However, if
-.B -list
-is given, just the filename is printed. Or, if
-.B -nice
-is given, a somewhat more (human-)readable output is generated.
-
-If you're searching a huge tree and want to keep informed about how
-the search is progressing,
-.B -v
-will print (to stderr) the current directory being searched.
-Using
-.B -vv
-will also print the current file "every so often", which could be useful
-if a directory is huge. Using
-.B -vvv
-will print the update with every file.
-
-Below is the full listing of options.
-
-.SH "OPTIONS TELLING *WHERE* TO SEARCH"
-.TP
-.BI -dir " DIR"
-Start searching at the named directory instead of the current directory.
-If multiple
-.B -dir
-arguments are given, multiple trees will be searched.
-.TP
-.BI -ddir " DIR"
-Like
-.B -dir
-except it flushes any previous
-.B -dir
-directories (i.e. "-dir A -dir B -dir C" will search A, B, and C, while
-"-dir A -ddir B -dir C" will search only B and C. This might be of use
-in the startup file (see that section below).
-.TP
-.B -xdev
-Stay on the same filesystem as the starting directory/directories.
-.TP
-.B -sort
-Sort the items in a directory before processing them.
-Normally they are processed in whatever order they happen to be read from
-the directory.
-.TP
-.B -nolinks
-Don't follow symbolic links. Normally they're followed.
-
-.SH "OPTIONS CONTROLLING WHICH FILES TO CONSIDER AND EXCLUDE"
-.TP
-.BI -mtime " NUM"
-Only consider files that were last changed more than
-.I NUM
-days ago
-(less than
-.I NUM
-days if
-.I NUM
-has '-' prepended, i.e. "-mtime -2.5" means to consider files that
-have been changed in the last two and a half days).
-.TP
-.B -older FILE
-Only consider files that have not changed since
-.I FILE
-was last changed.
-If there is any upper case in the "-older", "or equal" is added to the sense
-of the test. Therefore, "search -older ./file regex" will never consider
-"./file", while "search -Older ./file regex" will.
-
-If a file is a symbolic link, the time used is that of the file and not the
-link.
-.TP
-.BI -newer " FILE"
-Opposite of
-.BR -older .
-.TP
-.BI -name " GLOB"
-Only consider files that match the shell filename pattern
-.IR GLOB .
-The check is only done on a file's name (use
-.B -path
-to check the whole path, and use
-.B -dname
-to check directory names).
-
-Multiple specifications can be given by separating them with spaces, a'la
-.nf
- -name '*.c *.h'
-.fi
-to consider C source and header files.
-If
-.I GLOB
-doesn't contain any special pattern characters, a '*' is prepended.
-This last example could have been given as
-.nf
- -name '.c .h'
-.fi
-It could also be given as
-.nf
- -name .c -name .h
-.fi
-or
-.nf
- -name '*.c' -name '*.h'
-.fi
-or
-.nf
- -name '*.[ch]'
-.fi
-(among others)
-but in this last case, you have to be sure to supply the leading '*'.
-.TP
-.BI -path " GLOB"
-Like
-.B -name
-except the entire path is checked against the pattern.
-.TP
-.B -regex " REGEX"
-Considers files whose names (not paths) match the given perl regex
-exactly.
-.TP
-.BI -iname " GLOB"
-Case-insensitive version of
-.BR -name .
-.TP
-.BI -ipath " GLOB"
-Case-insensitive version of
-.BR -path .
-.TP
-.BI -iregex " REGEX"
-Case-insensitive version of
-.BR -regex .
-
-.TP
-.BI -dpath " GLOB"
-Only search down directories whose path matches the given pattern (this
-doesn't apply to the initial directory given by
-.BI -dir ,
-of course).
-Something like
-.nf
- -dir /usr/man -dpath /usr/man/man*
-.fi
-would completely skip
-"/usr/man/cat1", "/usr/man/cat2", etc.
-.TP
-.BI -dskip " GLOB"
-Skips directories whose name (not path) matches the given pattern.
-Something like
-.nf
- -dir /usr/man -dskip cat*
-.fi
-would completely skip any directory in the tree whose name begins with "cat"
-(including "/usr/man/cat1", "/usr/man/cat2", etc.).
-.TP
-.BI -dregex " REGEX"
-Like
-.BI -dpath ,
-but the pattern is a full perl regex. Note that this quite different
-from
-.B -regex
-which considers only file names (not paths). This option considers
-full directory paths (not just names). It's much more useful this way.
-Sorry if it's confusing.
-.TP
-.BI -dpath " GLOB"
-This option exists, but is probably not very useful. It probably wants to
-be like the '-below' or something I mention in the "TODO" section.
-.TP
-.BI -idpath " GLOB"
-Case-insensitive version of
-.BR -dpath .
-.TP
-.BI -idskip " GLOB"
-Case-insensitive version of
-.BR -dskip .
-.TP
-.BI -idregex " REGEX"
-Case-insensitive version of
-.BR -dregex .
-.TP
-.B -all
-Ignore any 'magic' or 'option' lines in the startup file.
-The effect is that all files that would otherwise be automatically
-excluded are considered.
-.TP
-.BI -x SPECIAL
-Arguments starting with
-.B -x
-(except
-.BR -xdev ,
-explained elsewhere) do special interaction with the
-.I ~/.search
-startup file. Something like
-.nf
- -xflag1 -xflag2
-.fi
-will turn on "flag1" and "flag2" in the startup file (and is
-the same as "-xflag1,flag2"). You can use this to write your own
-rules for what kinds of files are to be considered.
-
-For example, the internal-default startup file contains the line
-.nf
- <!~> option: -skip '~ #'
-.fi
-This means that if the
-.B -x~
-flag is
-.I not
-seen, the option
-.nf
- -skip '~ #'
-.fi
-should be done.
-The effect is that emacs temp and backup files are not normally
-considered, but you can included them with the -x~ flag.
-
-You can write your own rules to customize
-.I search
-in powerful ways. See the STARTUP FILE section below.
-.TP
-.B -why
-Print a message (to stderr) when and why a file is not considered.
-
-.SH "OPTIONS TELLING WHAT TO DO WITH FILES THAT WILL BE CONSIDERED"
-.TP
-.B -find
-(you can use
-.B -f
-as well).
-This option changes the basic action of
-.IR search .
-
-Normally, if a file is considered, it is searched
-for the regular expressions as described earlier. However, if this option
-is given, the filename is printed and no searching takes place. This turns
-.I search
-into a 'find' of some sorts.
-
-In this case, no regular expressions are needed on the command line
-(any that are there are silently ignored).
-
-This is not intended to be a replacement for the 'find' program,
-but to aid
-you in understanding just what files are getting past the exclusion checks.
-If you really want to use it as a sort of replacement for the 'find' program,
-you might want to use
-.B -all
-so that it doesn't waste time checking to see if the file is binary, etc
-(unless you really want that, of course).
-
-If you use
-.BR -find ,
-none of the "GREP-LIKE OPTIONS" (below) matter.
-
-As a replacement for 'find',
-.I search
-is probably a bit slower (or in the case of GNU find, a lot slower --
-GNU find is
-.I unbelievably
-fast).
-However, "search -ffind"
-might be more useful than 'find' when options such as
-.B -skip
-are used (at least until 'find' gets such functionality).
-.TP
-.B -ffind
-(or
-.BR -ff )
-A faster more 'find'-like find. Does
-.nf
- -find -all -dorep
-.fi
-.SH "GREP-LIKE OPTIONS"
-These options control how a searched file is accessed,
-and how things are printed.
-.TP
-.B -i
-Ignore letter case when matching.
-.TP
-.B -w
-Consider only whole-word matches ("whole word" as defined by perl's "\\b"
-regex).
-.TP
-.B -u
-If the regex(es) is/are simple, try to modify them so that they'll work
-in manpage-like underlined text (i.e. like _^Ht_^Hh_^Hi_^Hs).
-This is very rudimentary at the moment.
-.TP
-.B -list
-(you can use
-.B -l
-too).
-Don't print matching lines, but the names of files that contain matching
-lines. This will likely be *much* faster, as special optimizations are
-made -- particularly with large files.
-.TP
-.B -n
-Pepfix each line by its line number.
-.TP
-.B -nice
-Not a grep-like option, but similar to
-.BR -list ,
-so included here.
-.B -nice
-will have the output be a bit more human-readable, with matching lines printed
-slightly indented after the filename, a'la
-.nf
-
- % search foo
- somedir/somefile: line with foo in it
- somedir/somefile: some food for thought
- anotherdir/x: don't be a buffoon!
- %
-
-.fi
-will become
-.nf
-
- % search -nice foo
- somedir/somefile:
- line with foo in it
- some food for thought
- anotherdir/x:
- don't be a buffoon!
- %
-
-.fi
-This option due to Lionel Cons.
-.TP
-.B -nnice
-Be a bit nicer than
-.BR -nice .
-Prefix each file's output by a rule line, and follow with an extra blank line.
-.TP
-.B -h
-Don't prepend each output line with the name of the file
-(meaningless when
-.B -find
-or
-.B -l
-are given).
-
-.SH "OTHER OPTIONS"
-.TP
-.B -help
-Print the usage information.
-.TP
-.B -version
-Print the version information and quit.
-.TP
-.B -v
-Set the level of message verbosity.
-.B -v
-will print a note whenever a new directory is entered.
-.B -vv
-will also print a note "every so often". This can be useful to see
-what's happening when searching huge directories.
-.B -vvv
-will print a new with every file.
-.B -vvvv
-is
--vvv
-plus
-.BR -why .
-.TP
-.B -e
-This ends the options, and can be useful if the regex begins with '-'.
-.TP
-.B -showrc
-Shows what is being considered in the startup file, then exits.
-.TP
-.B -dorep
-Normally, an identical file won't be checked twice (even with multiple
-hard or symbolic links). If you're just trying to do a fast
-.BR -find ,
-the bookkeeping to remember which files have been seen is not desirable,
-so you can eliminate the bookkeeping with this flag.
-
-.SH "STARTUP FILE"
-When
-.I search
-starts up, it processes the directives in
-.IR ~/.search .
-If no such file exists, a default
-internal version is used.
-
-The internal version looks like:
-.nf
-
- magic: 32 : $H =~ m/[\ex00-\ex06\ex10-\ex1a\ex1c-\ex1f\ex80\exff]{2}/
- option: -skip '.a .COM .elc .EXE .gz .o .pbm .xbm .dvi'
- option: -iskip '.tarz .zip .z .lzh .jpg .jpeg .gif .uu'
- <!~> option: -skip '~ #'
-
-.fi
-If you wish to create your own "~/.search",
-you might consider copying the above, and then working from there.
-
-There are two kinds of directives in a startup file: "magic" and "option".
-.RS 0n
-.TP
-OPTION
-Option lines will automatically do the command-line options given.
-For example, the line
-.nf
- option: -v
-.fi
-in you startup file will turn on -v every time, without needing to type it
-on the command line.
-
-The text on the line after the "option:" directive is processed
-like the Bourne shell, so make sure to pay attention to quoting.
-.nf
- option: -skip .exe .com
-.fi
-will give an error (".com" by itself isn't a valid option), while
-.nf
- option: -skip ".exe .com"
-.fi
-will properly include it as part of -skip's argument.
-
-.TP
-MAGIC
-Magic lines are used to determine if a file should be considered a binary
-or not (the term "magic" refers to checking a file's magic number). These
-are described in more detail below.
-.RE
-
-Blank lines and comments (lines beginning with '#') are allowed.
-
-If a line begins with <...>, then it's a check to see if the
-directive on the line should be done or not. The stuff inside the <...>
-can contain perl's && (and), || (or), ! (not), and parens for grouping,
-along with "flags" that might be indicated by the user with
-.BI -x flag
-options.
-
-For example, using "-xfoo" will cause "foo" to be true inside the <...>
-blocks. Therefore, a line beginning with "<foo>" would be done only when
-"-xfoo" had been specified, while a line beginning with "<!foo>" would be
-done only when "-xfoo" is not specified (of course, a line without any <...>
-is done in either case).
-
-A realistic example might be
-.nf
- <!v> -vv
-.fi
-This will cause -vv messages to be the default, but allow "-xv" to override.
-
-There are a few flags that are set automatically:
-.RS
-.TP
-.B TTY
-true if the output is to the screen (as opposed to being redirected to a file).
-You can force this (as with all the other automatic flags) with -xTTY.
-.TP
-.B -v
-True if -v was specified. If -vv was specified, both
-.B -v
-and
-.B -vv
-flags are true (and so on).
-.TP
-.B -nice
-True if -nice was specified. Same thing about -nnice as for -vv.
-.PP
-.TP
-.B -list
-true if -list (or -l) was given.
-.TP
-.B -dir
-true if -dir was given.
-.RE
-
-Using this info, you might change the last example to
-.nf
-
- <!v && !-v> option: -vv
-
-.fi
-The added "&& !-v" means "and if the '-v' option not given".
-This will allow you to use "-v" alone on the command line, and not
-have this directive add the more verbose "-vv" automatically.
-
-.RS 0
-Some other examples:
-.TP
-<!-dir && !here> option: -dir ~/
-Effectively make the default directory your home directory (instead of the
-current directory). Using -dir or -xhere will undo this.
-.TP
-<tex> option: -name .tex -dir ~/pub
-Create '-xtex' to search only "*.tex" files in your ~/pub directory tree.
-Actually, this could be made a bit better. If you combine '-xtex' and '-dir'
-on the command line, this directive will add ~/pub to the list, when you
-probably want to use the -dir directory only. You could do
-.nf
-
- <tex> option: -name .tex
- <tex && !-dir> option: -dir ~/pub
-.fi
-
-to will allow '-xtex' to work as before, but allow a command-line "-dir"
-to take precedence with respect to ~/pub.
-.TP
-<fluff> option: -nnice -sort -i -vvv
-Combine a few user-friendly options into one '-xfluff' option.
-.TP
-<man> option: -ddir /usr/man -v -w
-When the '-xman' option is given, search "/usr/man" for whole-words
-(of whatever regex or regexes are given on the command line), with -v.
-.RE
-
-The lines in the startup file are executed from top to bottom, so something
-like
-.nf
-
- <both> option: -xflag1 -xflag2
- <flag1> option: ...whatever...
- <flag2> option: ...whatever...
-
-.fi
-will allow '-xboth' to be the same as '-xflag1 -xflag2' (or '-xflag1,flag2'
-for that matter). However, if you put the "<both>" line below the others,
-they will not be true when encountered, so the result would be different
-(and probably undesired).
-
-The "magic" directives are used to determine if a file looks to be binary
-or not. The form of a magic line is
-.nf
- magic: \fISIZE\fP : \fIPERLCODE\fP
-.fi
-where
-.I SIZE
-is the number of bytes of the file you need to check, and
-.I PERLCODE
-is the code to do the check. Within
-.IR PERLCODE ,
-the variable $H will hold at least the first
-.I SIZE
-bytes of the file (unless the file is shorter than that, of course).
-It might hold more bytes. The perl should evaluate to true if the file
-should be considered a binary.
-
-An example might be
-.nf
- magic: 6 : substr($H, 0, 6) eq 'GIF87a'
-.fi
-to test for a GIF ("-iskip .gif" is better, but this might be useful
-if you have images in files without the ".gif" extension).
-
-Since the startup file is checked from top to bottom, you can be a bit
-efficient:
-.nf
- magic: 6 : ($x6 = substr($H, 0, 6)) eq 'GIF87a'
- magic: 6 : $x6 eq 'GIF89a'
-.fi
-You could also write the same thing as
-.nf
- magic: 6 : (($x6 = substr($H, 0, 6)) eq 'GIF87a') || ## an old gif, or.. \e
- $x6 eq 'GIF89a' ## .. a new one.
-.fi
-since newlines may be escaped.
-
-The default internal startup file includes
-.nf
- magic: 32 : $H =~ m/[\ex00-\ex06\ex10-\ex1a\ex1c-\ex1f\ex80\exff]{2}/
-.fi
-which checks for certain non-printable characters, and catches a large
-number of binary files, including most system's executables, linkable
-objects, compressed, tarred, and otherwise folded, spindled, and mutilated
-files.
-
-Another example might be
-.nf
- ## an archive library
- magic: 17 : substr($H, 0, 17) eq "!<arch>\en__.SYMDEF"
-.fi
-
-.SH "RETURN VALUE"
-.I Search
-returns zero if lines (or files, if appropriate) were found,
-or if no work was requested (such as with
-.BR -help ).
-Returns 1 if no lines (or files) were found.
-Returns 2 on error.
-
-.SH TODO
-Things I'd like to add some day:
-.nf
- + show surrounding lines (context).
- + highlight matched portions of lines.
- + add '-and', which can go between regexes to override
- the default logical or of the regexes.
- + add something like
- -below GLOB
- which will examine a tree and only consider files that
- lie in a directory deeper than one named by the pattern.
- + add 'warning' and 'error' directives.
- + add 'help' directive.
-.fi
-.SH BUGS
-If -xdev and multiple -dir arguments are given, any file in any of the
-target filesystems are allowed. It would be better to allow each filesystem
-for each separate tree.
-
-Multiple -dir args might also cause some confusing effects. Doing
-.nf
- -dir some/dir -dir other
-.fi
-will search "some/dir" completely, then search "other" completely. This
-is good. However, something like
-.nf
- -dir some/dir -dir some/dir/more/specific
-.fi
-will search "some/dir" completely *except for* "some/dir/more/specific",
-after which it will return and be searched. Not really a bug, but just sort
-of odd.
-
-File times (for -newer, etc.) of symbolic links are for the file, not the
-link. This could cause some misunderstandings.
-
-Probably more. Please let me know.
-.SH AUTHOR
-Jeffrey Friedl, Omron Corp (jfriedl@omron.co.jp)
-.br
-http://www.wg.omron.co.jp/cgi-bin/j-e/jfriedl.html
-
-.SH "LATEST SOURCE"
-See http://www.wg.omron.co.jp/~jfriedl/perl/index.html
-__END__
-:endofperl
diff --git a/win32/bin/test.bat b/win32/bin/test.bat
deleted file mode 100644
index e6b7b38160..0000000000
--- a/win32/bin/test.bat
+++ /dev/null
@@ -1,143 +0,0 @@
-@rem = '
-@echo off
-if exist perl.exe goto perlhere
-echo Cannot run without perl.exe in current directory!! Did you build it?
-pause
-goto endofperl
-:perlhere
-if exist perlglob.exe goto perlglobhere
-echo Cannot run without perlglob.exe in current directory!! Did you build it?
-pause
-goto endofperl
-:perlglobhere
-perl %0.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto endofperl
-@rem ';
-
-#Portions (C) 1995 Microsoft Corporation. All rights reserved.
-# Developed by hip communications inc., http://info.hip.com/info/
-
-
-# This is written in a peculiar style, since we're trying to avoid
-# most of the constructs we'll be testing for.
-
-$| = 1;
-
-if ($ARGV[0] eq '-v') {
- $verbose = 1;
- shift;
-}
-
-
-# WYT 1995-05-02
-chdir 't' if -f 't/TESTNT';
-
-
-if ($ARGV[0] eq '') {
-# @ARGV = split(/[ \n]/,
-# `echo base/*.t comp/*.t cmd/*.t io/*.t; echo op/*.t lib/*.t`);
-# `ls base/*.t comp/*.t cmd/*.t io/*.t op/*.t lib/*.t`);
-
-# WYT 1995-05-02 wildcard expansion,
-# `perl -e "print( join( ' ', \@ARGV ) )" base/*.t comp/*.t cmd/*.t io/*.t op/*.t lib/*.t nt/*.t`);
-
-# WYT 1995-06-01 removed all dependency on perlglob
-# WYT 1995-11-28 hacked up to cope with braindead Win95 console.
- push( @ARGV, `dir/s/b base` );
- push( @ARGV, `dir/s/b comp` );
- push( @ARGV, `dir/s/b cmd` );
- push( @ARGV, `dir/s/b io` );
- push( @ARGV, `dir/s/b op` );
- push( @ARGV, `dir/s/b lib` );
- push( @ARGV, `dir/s/b nt` );
-
- grep( chomp, @ARGV );
- @ARGV = grep( /\.t$/, @ARGV );
- grep( s/.*t\\//, @ARGV );
-}
-
-$sharpbang = 0;
-
-$bad = 0;
-$good = 0;
-$total = @ARGV;
-while ($test = shift) {
- if ($test =~ /^$/) {
- next;
- }
- $te = $test;
-# chop off 't' extension
- chop($te);
- print "$te" . '.' x (15 - length($te));
- if ($sharpbang) {
- open(results,"./$test |") || (print "can't run.\n");
- } else {
- $switch = '';
-# open(results,"./perl$switch $test |") || (print "can't run.\n");
- open(results,"perl$switch $test |") || (print "can't run.\n");
- }
- $ok = 0;
- $next = 0;
- while (<results>) {
- if ($verbose) {
- print $_;
- }
- unless (/^#/||/^$/) {
- if (/^1\.\.([0-9]+)/) {
- $max = $1;
- $totmax += $max;
- $files += 1;
- $next = 1;
- $ok = 1;
- } else {
- $next = $1, $ok = 0, last if /^not ok ([0-9]*)/;
- if (/^ok (.*)/ && $1 == $next) {
- $next = $next + 1;
- } else {
- $ok = 0;
- }
- }
- }
- }
- $next = $next - 1;
- if ($ok && $next == $max) {
- print "ok\n";
- $good = $good + 1;
- } else {
- $next += 1;
- print "FAILED on test $next\n";
- $bad = $bad + 1;
- $_ = $test;
- if (/^base/) {
- die "Failed a basic test--cannot continue.\n";
- }
- }
-}
-
-if ($bad == 0) {
- if ($ok) {
- print "All tests successful.\n";
- } else {
- die "FAILED--no tests were run for some reason.\n";
- }
-} else {
- $pct = sprintf("%.2f", $good / $total * 100);
- if ($bad == 1) {
- warn "Failed 1 test, $pct% okay.\n";
- } else {
- die "Failed $bad/$total tests, $pct% okay.\n";
- }
-}
-
-
-# WYT 1995-05-03 times not implemented.
-#($user,$sys,$cuser,$csys) = times;
-#print sprintf("u=%g s=%g cu=%g cs=%g files=%d tests=%d\n",
-# $user,$sys,$cuser,$csys,$files,$totmax);
-
-#`del /f Cmd_while.tmp Comp.try null 2>NULL`;
-
-unlink 'Cmd_while.tmp', 'Comp.try', 'null';
-
-__END__
-:endofperl
diff --git a/win32/bin/webget.bat b/win32/bin/webget.bat
deleted file mode 100644
index e77bb88ced..0000000000
--- a/win32/bin/webget.bat
+++ /dev/null
@@ -1,1099 +0,0 @@
-@rem = '--*-Perl-*--';
-@rem = '
-@echo off
-perl -S %0.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto endofperl
-@rem ';
-#!/usr/local/bin/perl -w
-
-#-
-#!/usr/local/bin/perl -w
-$version = "951121.18";
-$comments = 'jfriedl@omron.co.jp';
-
-##
-## This is "webget"
-##
-## Jeffrey Friedl (jfriedl@omron.co.jp), July 1994.
-## Copyright 19.... ah hell, just take it.
-## Should work with either perl4 or perl5
-##
-## BLURB:
-## Given a URL on the command line (HTTP and FTP supported at the moment),
-## webget fetches the named object (HTML text, images, audio, whatever the
-## object happens to be). Will automatically use a proxy if one is defined
-## in the environment, follow "this URL has moved" responses, and retry
-## "can't find host" responses from a proxy in case host lookup was slow).
-## Supports users & passwords (FTP), Basic Authorization (HTTP), update-if-
-## modified (HTTP), and much more. Works with perl4 or perl5.
-
-##
-## More-detailed instructions in the comment block below the history list.
-##
-
-##
-## To-do:
-## Add gopher support.
-## Fix up how error messages are passed among this and the libraries.
-##
-
-## 951219.19
-## Lost ftp connections now die with a bit more grace.
-##
-## 951121.18
-## Add -nnab.
-## Brought the "usage" string in line with reality.
-##
-## 951114.17
-## Added -head.
-## Added -update/-refresh/-IfNewerThan. If any URL was not pulled
-## because it was not out of date, an exit value of 2 is returned.
-##
-## 951031.16
-## Added -timeout. Cleaned up (a bit) the exit value. Now exits
-## with 1 if all URLs had some error (timeout exits immediately with
-## code 3, though. This is subject to change). Exits with 0 if any
-## URL was brought over safely.
-##
-## 951017.15
-## Neat -pf, -postfile idea from Lorrie Cranor
-## (http://www.ccrc.wustl.edu/~lorracks/)
-##
-## 950912.14
-## Sigh, fixed a typo.
-##
-## 950911.13
-## Added Basic Authorization support for http. See "PASSWORDS AND STUFF"
-## in the documentation.
-##
-## 950911.12
-## Implemented a most-excellent suggestion by Anthony D'Atri
-## (aad@nwnet.net), to be able to automatically grab to a local file of
-## the same name as the URL. See the '-nab' flag.
-##
-## 950706.11
-## Quelled small -w warning (thanks: Lars Rasmussen <gnort@daimi.aau.dk>)
-##
-## 950630.10
-## Steve Campbell to the rescue again. FTP now works when supplied
-## with a userid & password (eg ftp://user:pass@foo.bar.com/index.txt).
-##
-## 950623.9
-## Incorporated changes from Steve Campbell (steven_campbell@uk.ibm.com)
-## so that the ftp will work when no password is required of a user.
-##
-## 950530.8
-## Minor changes:
-## Eliminate read-size warning message when size unknown.
-## Pseudo-debug/warning messages at the end of debug_read now go to
-## stderr. Some better error handling when trying to contact systems
-## that aren't really set up for ftp. Fixed a bug concerning FTP access
-## to a root directory. Added proxy documentation at head of file.
-##
-## 950426.6,7
-## Complete Overhaul:
-## Renamed from httpget. Added ftp support (very sketchy at the moment).
-## Redid to work with new 'www.pl' library; chucked 'Www.pl' library.
-## More or less new and/or improved in many ways, but probably introduced
-## a few bugs along the way.
-##
-## 941227.5
-## Added follow stuff (with -nofollow, etc.)
-## Added -updateme. Cool!
-## Some general tidying up.
-##
-## 941107.4
-## Allowed for ^M ending a header line... PCs give those kind of headers.
-##
-## 940820.3
-## First sorta'clean net release.
-##
-##
-
-##
-##>
-##
-## Fetch http and/or ftp URL(s) given on the command line and spit to
-## STDOUT.
-##
-## Options include:
-## -V, -version
-## Print version information; exit.
-##
-## -p, -post
-## If the URL looks like a reply to a form (i.e. has a '?' in it),
-## the request is POST'ed instead of GET'ed.
-##
-## -head
-## Gets the header only (for HTTP). This might include such useful
-## things as 'Last-modified' and 'Content-length' fields
-## (a lack of a 'Last-modified' might be a good indication that it's
-## a CGI).
-##
-## The "-head" option implies "-nostrip", but does *not* imply,
-## for example "-nofollow".
-##
-##
-## -pf, -postfile
-## The item after the '?' is taken as a local filename, and the contents
-## are POST'ed as with -post
-##
-## -nab, -f, -file
-## Rather than spit the URL(s) to standard output, unconditionally
-## dump to a file (or files) whose name is that as used in the URL,
-## sans path. I like '-nab', but supply '-file' as well since that's
-## what was originally suggested. Also see '-update' below for the
-## only-if-changed version.
-##
-## -nnab
-## Like -nab, but in addtion to dumping to a file, dump to stdout as well.
-## Sort of like the 'tee' command.
-##
-## -update, -refresh
-## Do the same thing as -nab, etc., but does not bother pulling the
-## URL if it older than the localfile. Only applies to HTTP.
-## Uses the HTTP "If-Modified-Since" field. If the URL was not modified
-## (and hence not changed), the return value is '2'.
-##
-## -IfNewerThan FILE
-## -int FILE
-## Only pulls URLs if they are newer than the date the local FILE was
-## last written.
-##
-## -q, -quiet
-## Suppresses all non-essential informational messages.
-##
-## -nf, -nofollow
-## Normally, a "this URL has moved" HTTP response is automatically
-## followed. Not done with -nofollow.
-##
-## -nr, -noretry
-## Normally, an HTTP proxy response of "can't find host" is retried
-## up to three times, to give the remote hostname lookup time to
-## come back with an answer. This suppresses the retries. This is the
-## same as '-retry 0'.
-##
-## -r#, -retry#, -r #, -retry #
-## Sets the number of times to retry. Default 3.
-##
-## -ns, -nostrip
-## For HTTP items (including other items going through an HTTP proxy),
-## the HTTP response header is printed rather than stripped as default.
-##
-## -np, -noproxy
-## A proxy is not used, even if defined for the protocol.
-##
-## -h, -help
-## Show a usage message and exit.
-##
-## -d, -debug
-## Show some debugging messages.
-##
-## -updateme
-## The special and rather cool flag "-updateme" will see if webget has
-## been updated since you got your version, and prepare a local
-## version of the new version for you to use. Keep updated! (although
-## you can always ask to be put on the ping list to be notified when
-## there's a new version -- see the author's perl web page).
-##
-## -timeout TIMESPAN
-## -to TIMESPAN
-## Time out if a connection can not be made within the specified time
-## period. TIMESPAN is normally in seconds, although a 'm' or 'h' may
-## be appended to indicate minutes and hours. "-to 1.5m" would timeout
-## after 90 seconds.
-##
-## (At least for now), a timeout causes immediate program death (with
-## exit value 3). For some reason, the alarm doesn't always cause a
-## waiting read or connect to abort, so I just die immediately.. /-:
-##
-## I might consider adding an "entire fetch" timeout, if someone
-## wants it.
-##
-## PASSWORDS AND SUCH
-##
-## You can use webget to do FTP fetches from non-Anonymous systems and
-## accounts. Just put the required username and password into the URL,
-## as with
-## webget 'ftp:/user:password@ftp.somesite.com/pub/pix/babe.gif
-## ^^^^^^^^^^^^^
-## Note the user:password is separated from the hostname by a '@'.
-##
-## You can use the same kind of thing with HTTP, and if so it will provide
-## what's know as Basic Authorization. This is >weak< authorization. It
-## also provides >zero< security -- I wouldn't be sending any credit-card
-## numbers this way (unless you send them 'round my way :-). It seems to
-## be used most by providers of free stuff where they want to make some
-## attempt to limit access to "known users".
-##
-## PROXY STUFF
-##
-## If you need to go through a gateway to get out to the whole internet,
-## you can use a proxy if one's been set up on the gateway. This is done
-## by setting the "http_proxy" environmental variable to point to the
-## proxy server. Other variables are used for other target protocols....
-## "gopher_proxy", "ftp_proxy", "wais_proxy", etc.
-##
-## For example, I have the following in my ".login" file (for use with csh):
-##
-## setenv http_proxy http://local.gateway.machine:8080/
-##
-## This is to indicate that any http URL should go to local.gateway.machine
-## (port 8080) via HTTP. Additionally, I have
-##
-## setenv gopher_proxy "$http_proxy"
-## setenv wais_proxy "$http_proxy"
-## setenv ftp_proxy "$http_proxy"
-##
-## This means that any gopher, wais, or ftp URL should also go to the
-## same place, also via HTTP. This allows webget to get, for example,
-## GOPHER URLs even though it doesn't support GOPHER itself. It uses HTTP
-## to talk to the proxy, which then uses GOPHER to talk to the destination.
-##
-## Finally, if there are sites inside your gateway that you would like to
-## connect to, you can list them in the "no_proxy" variable. This will allow
-## you to connect to them directly and skip going through the proxy:
-##
-## setenv no_proxy "www.this,www.that,www.other"
-##
-## I (jfriedl@omron.co.jp) have little personal experience with proxies
-## except what I deal with here at Omron, so if this is not representative
-## of your situation, please let me know.
-##
-## RETURN VALUE
-## The value returned to the system by webget is rather screwed up because
-## I didn't think about dealing with it until things were already
-## complicated. Since there can be more than one URL on the command line,
-## it's hard to decide what to return when one times out, another is fetched,
-## another doesn't need to be fetched, and a fourth isn't found.
-##
-## So, here's the current status:
-##
-## Upon any timeout (via the -timeout arg), webget immediately
-## returns 3. End of story. Otherwise....
-##
-## If any URL was fetched with a date limit (i.e. via
-## '-update/-refresh/-IfNewerThan' and was found to not have changed,
-## 2 is returned. Otherwise....
-##
-## If any URL was successfully fetched, 0 is returned. Otherwise...
-##
-## If there were any errors, 1 is returned. Otherwise...
-##
-## Must have been an info-only or do-nothing instance. 0 is returned.
-##
-## Phew. Hopefully useful to someone.
-##<
-##
-
-## Where latest version should be.
-$WEB_normal = 'http://www.wg.omron.co.jp/~jfriedl/perl/webget';
-$WEB_inlined = 'http://www.wg.omron.co.jp/~jfriedl/perl/inlined/webget';
-
-
-require 'network.pl'; ## inline if possible (directive to a tool of mine)
-require 'www.pl'; ## inline if possible (directive to a tool of mine)
-$inlined=0; ## this might be changed by a the inline thing.
-
-##
-## Exit values. All screwed up.
-##
-$EXIT_ok = 0;
-$EXIT_error = 1;
-$EXIT_notmodified = 2;
-$EXIT_timeout = 3;
-
-##
-##
-
-warn qq/WARNING:\n$0: need a newer version of "network.pl"\n/ if
- !defined($network'version) || $network'version < "950311.5";
-warn qq/WARNING:\n$0: need a newer version of "www.pl"\n/ if
- !defined($www'version) || $www'version < "951114.8";
-
-$WEB = $inlined ? $WEB_inlined : $WEB_normal;
-
-$debug = 0;
-$strip = 1; ## default is to strip
-$quiet = 0; ## also normally off.
-$follow = 1; ## normally, we follow "Found (302)" links
-$retry = 3; ## normally, retry proxy hostname lookups up to 3 times.
-$nab = 0; ## If true, grab to a local file of the same name.
-$refresh = 0; ## If true, use 'If-Modified-Since' with -nab get.
-$postfile = 0; ## If true, filename is given after the '?'
-$defaultdelta2print = 2048;
-$TimeoutSpan = 0; ## seconds after which we should time out.
-
-while (@ARGV && $ARGV[0] =~ m/^-/)
-{
- $arg = shift(@ARGV);
-
- $nab = 1, next if $arg =~ m/^-f(ile)?$/;
- $nab = 1, next if $arg =~ m/^-nab$/;
- $nab = 2, next if $arg =~ m/^-nnab$/;
- $post = 1, next if $arg =~ m/^-p(ost)?$/i;
- $post = $postfile = 1, next if $arg =~ m/^-p(ost)?f(ile)?$/i;
- $quiet=1, next if $arg =~ m/^-q(uiet)?$/;
- $follow = 0, next if $arg =~ m/^-no?f(ollow)?$/;
- $strip = 0, next if $arg =~ m/^-no?s(trip)?$/;
- $debug=1, next if $arg =~ m/^-d(ebug)?$/;
- $noproxy=1, next if $arg =~ m/^-no?p(roxy)?$/;
- $retry=0, next if $arg =~ m/^-no?r(etry)?$/;
- $retry=$2, next if $arg =~ m/^-r(etry)?(\d+)$/;
- &updateme if $arg eq '-updateme';
- $strip = 0, $head = 1, next if $arg =~ m/^-head(er)?/;
- $nab = $refresh = 1, next if $arg =~ m/^-(refresh|update)/;
-
- &usage($EXIT_ok) if $arg =~ m/^-h(elp)?$/;
- &show_version, exit($EXIT_ok) if $arg eq '-version' || $arg eq '-V';
-
- if ($arg =~ m/^-t(ime)?o(ut)?$/i) {
- local($num) = shift(@ARGV);
- &usage($EXIT_error, "expecting timespan argument to $arg\n") unless
- $num =~ m/^\d+(\d*)?[hms]?$/;
- &timeout_arg($num);
- next;
- }
-
- if ($arg =~ m/^-if?n(ewer)?t(han)?$/i) {
- $reference_file = shift(@ARGV);
- &usage($EXIT_error, "expecting filename arg to $arg")
- if !defined $reference_file;
- if (!-f $reference_file) {
- warn qq/$0: ${arg}'s "$reference_file" not found.\n/;
- exit($EXIT_error);
- }
- next;
- }
-
- if ($arg eq '-r' || $arg eq '-retry') {
- local($num) = shift(@ARGV);
- &usage($EXIT_error, "expecting numerical arg to $arg\n") unless
- defined($num) && $num =~ m/^\d+$/;
- $retry = $num;
- next;
- }
- &usage($EXIT_error, qq/$0: unknown option "$arg"\n/);
-}
-
-if ($head && $post) {
- warn "$0: combining -head and -post makes no sense, ignoring -post.\n";
- $post = 0;
- undef $postfile;
-}
-
-if ($refresh && defined($reference_file)) {
- warn "$0: combining -update and -IfNewerThan make no sense, ignoring -IfNewerThan.\n";
- undef $reference_file;
-}
-
-if (@ARGV == 0) {
- warn "$0: nothing to do. Use -help for info.\n";
- exit($EXIT_ok);
-}
-
-
-##
-## Now run through the remaining arguments (mostly URLs) and do a quick
-## check to see if they look well-formed. We won't *do* anything -- just
-## want to catch quick errors before really starting the work.
-##
-@tmp = @ARGV;
-$errors = 0;
-while (@tmp) {
- $arg = shift(@tmp);
- if ($arg =~ m/^-t(ime)?o(ut)?$/) {
- local($num) = shift(@tmp);
- if ($num !~ m/^\d+(\d*)?[hms]?$/) {
- &warn("expecting timespan argument to $arg\n");
- $errors++;
- }
- } else {
- local($protocol) = &www'grok_URL($arg, $noproxy);
-
- if (!defined $protocol) {
- warn qq/can't grok "$arg"/;
- $errors++;
- } elsif (!$quiet && ($protocol eq 'ftp')) {
- warn qq/warning: -head ignored for ftp URLs\n/ if $head;
- warn qq/warning: -refresh ignored for ftp URLs\n/if $refresh;
- warn qq/warning: -IfNewerThan ignored for ftp URLs\n/if defined($reference_file);
-
- }
- }
-}
-
-exit($EXIT_error) if $errors;
-
-
-$SuccessfulCount = 0;
-$NotModifiedCount = 0;
-
-##
-## Now do the real thing.
-##
-while (@ARGV) {
- $arg = shift(@ARGV);
- if ($arg =~ m/^-t(ime)?o(ut)?$/) {
- &timeout_arg(shift(@ARGV));
- } else {
- &fetch_url($arg);
- }
-}
-
-if ($NotModifiedCount) {
- exit($EXIT_notmodified);
-} elsif ($SuccessfulCount) {
- exit($EXIT_ok);
-} else {
- exit($EXIT_error);
-}
-
-###########################################################################
-###########################################################################
-
-sub timeout_arg
-{
- ($TimeoutSpan) = @_;
- $TimeoutSpan =~ s/s//;
- $TimeoutSpan *= 60 if $TimeoutSpan =~ m/m/;
- $TimeoutSpan *= 3600 if $TimeoutSpan =~ m/h/;
-
-}
-
-##
-## As a byproduct, returns the basename of $0.
-##
-sub show_version
-{
- local($base) = $0;
- $base =~ s,.*/,,;
- print STDERR "This is $base version $version\n";
- $base;
-}
-
-##
-## &usage(exitval, message);
-##
-## Prints a usage message to STDERR.
-## If MESSAGE is defined, prints that first.
-## If exitval is defined, exits with that value. Otherwise, returns.
-##
-sub usage
-{
- local($exit, $message) = @_;
-
- print STDERR $message if defined $message;
- local($base) = &show_version;
- print STDERR <<INLINE_LITERAL_TEXT;
-usage: $0 [options] URL ...
- Fetches and displays the named URL(s). Supports http and ftp.
- (if no protocol is given, a leading "http://" is normally used).
-
-Options are from among:
- -V, -version Print version information; exit.
- -p, -post If URL looks like a form reply, does POST instead of GET.
- -pf, -postfile Like -post, but takes everything after ? to be a filename.
- -q, -quiet All non-essential informational messages are suppressed.
- -nf, -nofollow Don't follow "this document has moved" replies.
- -nr, -noretry Doesn't retry a failed hostname lookup (same as -retry 0)
- -r #, -retry # Sets failed-hostname-lookup-retry to # (default $retry)
- -np, -noproxy Uses no proxy, even if one defined for the protocol.
- -ns, -nostrip The HTTP header, normally elided, is printed.
- -head gets item header only (implies -ns)
- -nab, -file Dumps output to file whose name taken from URL, minus path
- -nnab Like -nab, but *also* dumps to stdout.
- -update HTTP only. Like -nab, but only if the page has been modified.
- -h, -help Prints this message.
- -IfNewerThan F HTTP only. Only brings page if it is newer than named file.
- -timeout T Fail if a connection can't be made in the specified time.
-
- -updateme Pull the latest version of $base from
- $WEB
- and reports if it is newer than your current version.
-
-Comments to $comments.
-INLINE_LITERAL_TEXT
-
- exit($exit) if defined $exit;
-}
-
-##
-## Pull the latest version of this program to a local file.
-## Clip the first couple lines from this executing file so that we
-## preserve the local invocation style.
-##
-sub updateme
-{
- ##
- ## Open a temp file to hold the new version,
- ## redirecting STDOUT to it.
- ##
- open(STDOUT, '>'.($tempFile="/tmp/webget.new")) ||
- open(STDOUT, '>'.($tempFile="/usr/tmp/webget.new")) ||
- open(STDOUT, '>'.($tempFile="/webget.new")) ||
- open(STDOUT, '>'.($tempFile="webget.new")) ||
- die "$0: can't open a temp file.\n";
-
- ##
- ## See if we can figure out how we were called.
- ## The seek will rewind not to the start of the data, but to the
- ## start of the whole program script.
- ##
- ## Keep the first line if it begins with #!, and the next two if they
- ## look like the trick mentioned in the perl man page for getting
- ## around the lack of #!-support.
- ##
- if (seek(DATA, 0, 0)) { ##
- $_ = <DATA>; if (m/^#!/) { print STDOUT;
- $_ = <DATA>; if (m/^\s*eval/) { print STDOUT;
- $_ = <DATA>; if (m/^\s*if/) { print STDOUT; }
- }
- }
- print STDOUT "\n#-\n";
- }
-
- ## Go get the latest one...
- local(@options);
- push(@options, 'head') if $head;
- push(@options, 'nofollow') unless $follow;
- push(@options, ('retry') x $retry) if $retry;
- push(@options, 'quiet') if $quiet;
- push(@options, 'debug') if $debug;
- local($status, $memo, %info) = &www'open_http_url(*IN, $WEB, @options);
- die "fetching $WEB:\n $memo\n" unless $status eq 'ok';
-
- $size = $info{'content-length'};
- while (<IN>)
- {
- $size -= length;
- print STDOUT;
- if (!defined $fetched_version && m/version\s*=\s*"([^"]+)"/) {
- $fetched_version = $1;
- &general_read(*IN, $size);
- last;
- }
- }
-
- $fetched_version = "<unknown>" unless defined $fetched_version;
-
- ##
- ## Try to update the mode of the temp file with the mode of this file.
- ## Don't worry if it fails.
- ##
- chmod($mode, $tempFile) if $mode = (stat($0))[2];
-
- $as_well = '';
- if ($fetched_version eq $version)
- {
- print STDERR "You already have the most-recent version ($version).\n",
- qq/FWIW, the newly fetched one has been left in "$tempFile".\n/;
- }
- elsif ($fetched_version <= $version)
- {
- print STDERR
- "Mmm, your current version seems newer (?!):\n",
- qq/ your version: "$version"\n/,
- qq/ new version: "$fetched_version"\n/,
- qq/FWIW, fetched one left in "$tempFile".\n/;
- }
- else
- {
- print STDERR
- "Indeed, your current version was old:\n",
- qq/ your version: "$version"\n/,
- qq/ new version: "$fetched_version"\n/,
- qq/The file "$tempFile" is ready to replace the old one.\n/;
- print STDERR qq/Just do:\n % mv $tempFile $0\n/ if -f $0;
- $as_well = ' as well';
- }
- print STDERR "Note that the libraries it uses may (or may not) need updating$as_well.\n"
- unless $inlined;
- exit($EXIT_ok);
-}
-
-##
-## Given a list of URLs, fetch'em.
-## Parses the URL and calls the routine for the appropriate protocol
-##
-sub fetch_url
-{
- local(@todo) = @_;
- local(%circref, %hold_circref);
-
- URL_LOOP: while (@todo)
- {
- $URL = shift(@todo);
- %hold_circref = %circref; undef %circref;
-
- local($protocol, @args) = &www'grok_URL($URL, $noproxy);
-
- if (!defined $protocol) {
- &www'message(1, qq/can't grok "$URL"/);
- next URL_LOOP;
- }
-
- ## call protocol-specific handler
- $func = "fetch_via_" . $protocol;
- $error = &$func(@args, $TimeoutSpan);
- if (defined $error) {
- &www'message(1, "$URL: $error");
- } else {
- $SuccessfulCount++;
- }
- }
-}
-
-sub filedate
-{
- local($filename) = @_;
- local($filetime) = (stat($filename))[9];
- return 0 if !defined $filetime;
- local($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($filetime);
- return 0 if !defined $wday;
- sprintf(qq/"%s, %02d-%s-%02d %02d:%02d:%02d GMT"/,
- ("Sunday", "Monday", "Tuesdsy", "Wednesday",
- "Thursday", "Friday", "Saturday")[$wday],
- $mday,
- ("Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")[$mon],
- $year,
- $hour,
- $min,
- $sec);
-}
-
-sub local_filename
-{
- local($filename) = @_;
- $filename =~ s,/+$,,; ## remove any trailing slashes
- $filename =~ s,.*/,,; ## remove any leading path
- if ($filename eq '') {
- ## empty -- pick a random name
- $filename = "file0000";
- ## look for a free random name.
- $filename++ while -f $filename;
- }
- $filename;
-}
-
-sub set_output_file
-{
- local($filename) = @_;
- if (!open(OUT, ">$filename")) {
- &www'message(1, "$0: can't open [$filename] for output");
- } else {
- open(SAVEOUT, ">>&STDOUT") || die "$!";;
- open(STDOUT, ">>&OUT");
- }
-}
-
-sub close_output_file
-{
- local($filename) = @_;
- unless ($quiet)
- {
- local($note) = qq/"$filename" written/;
- if (defined $error) {
- $note .= " (possibly corrupt due to error above)";
- }
- &www'message(1, "$note.");
- }
- close(STDOUT);
- open(STDOUT, ">&SAVEOUT");
-}
-
-sub http_alarm
-{
- &www'message(1, "ERROR: $AlarmNote.");
- exit($EXIT_timeout); ## the alarm doesn't seem to cause a waiting syscall to break?
-# $HaveAlarm = 1;
-}
-
-##
-## Given the host, port, and path, and (for info only) real target,
-## fetch via HTTP.
-##
-## If there is a user and/or password, use that for Basic Authorization.
-##
-## If $timeout is nonzero, time out after that many seconds.
-##
-sub fetch_via_http
-{
- local($host, $port, $path, $target, $user, $password, $timeout) = @_;
- local(@options);
- local($local_filename);
-
- ##
- ## If we're posting, but -postfile was given, we need to interpret
- ## the item in $path after '?' as a filename, and replace it with
- ## the contents of the file.
- ##
- if ($postfile && $path =~ s/\?([\d\D]*)//) {
- local($filename) = $1;
- return("can't open [$filename] to POST") if !open(IN, "<$filename");
- local($/) = ''; ## want to suck up the whole file.
- $path .= '?' . <IN>;
- close(IN);
- }
-
- $local_filename = &local_filename($path)
- if $refresh || $nab || defined($reference_file);
- $refresh = &filedate($local_filename) if $refresh;
- $refresh = &filedate($reference_file) if defined($reference_file);
-
- push(@options, 'head') if $head;
- push(@options, 'post') if $post;
- push(@options, 'nofollow') unless $follow;
- push(@options, ('retry') x 3);
- push(@options, 'quiet') if $quiet;
- push(@options, 'debug') if $debug;
- push(@options, "ifmodifiedsince=$refresh") if $refresh;
-
- if (defined $password || defined $user) {
- local($auth) = join(':', ($user || ''), ($password || ''));
- push(@options, "authorization=$auth");
- }
-
- local($old_alarm);
- if ($timeout) {
- $old_alarm = $SIG{'ALRM'} || 'DEFAULT';
- $SIG{'ALRM'} = "main'http_alarm";
-# $HaveAlarm = 0;
- $AlarmNote = "host $host";
- $AlarmNote .= ":$port" if $port != $www'default_port{'http'};
- $AlarmNote .= " timed out after $timeout second";
- $AlarmNote .= 's' if $timeout > 1;
- alarm($timeout);
- }
- local($result, $memo, %info) =
- &www'open_http_connection(*HTTP, $host,$port,$path,$target,@options);
-
- if ($timeout) {
- alarm(0);
- $SIG{'ALRM'} = $old_alarm;
- }
-
-# if ($HaveAlarm) {
-# close(HTTP);
-# $error = "timeout after $timeout second";
-# $error .= "s" if $timeout > 1;
-# return $error;
-# }
-
- if ($follow && ($result eq 'follow')) {
- %circref = %hold_circref;
- $circref{$memo} = 1;
- unshift(@todo, $memo);
- return undef;
- }
-
-
- return $memo if $result eq 'error';
- if (!$quiet && $result eq 'status' && ! -t STDOUT) {
- #&www'message(1, "Warning: $memo");
- $error = "Warning: $memo";
- }
-
- if ($info{'CODE'} == 304) { ## 304 is magic for "Not Modified"
- close(HTTP);
- &www'message(1, "$URL: Not Modified") unless $quiet;
- $NotModifiedCount++;
- return undef; ## no error
- }
-
-
- &set_output_file($local_filename) if $nab;
-
- unless($strip) {
- print $info{'STATUS'}, "\n", $info{'HEADER'}, "\n";
-
- print SAVEOUT $info{'STATUS'}, "\n", $info{'HEADER'}, "\n" if $nab==2;
- }
-
- if (defined $info{'BODY'}) {
- print $info{'BODY'};
- print SAVEOUT $info{'BODY'} if $nab==2;
- }
-
- if (!$head) {
- &general_read(*HTTP, $info{'content-length'});
- }
- close(HTTP);
- &close_output_file($local_filename) if $nab;
-
- $error; ## will be 'undef' if no error;
-}
-
-sub fetch_via_ftp
-{
- local($host, $port, $path, $target, $user, $password, $timeout) = @_;
- local($local_filename) = &local_filename($path);
- local($ftp_debug) = $debug;
- local(@password) = ($password);
- $path =~ s,^/,,; ## remove a leading / from the path.
- $path = '.' if $path eq ''; ## make sure we have something
-
- if (!defined $user) {
- $user = 'anonymous';
- $password = $ENV{'USER'} || 'WWWuser';
- @password = ($password.'@'. &network'addr_to_ascii(&network'my_addr),
- $password.'@');
- } elsif (!defined $password) {
- @password = ("");
- }
-
- local($_last_ftp_reply, $_passive_host, $_passive_port);
- local($size);
-
- sub _ftp_get_reply
- {
- local($text) = scalar(<FTP_CONTROL>);
- die "lost connection to $host\n" if !defined $text;
- local($_, $tmp);
- print STDERR "READ: $text" if $ftp_debug;
- die "internal error: expected reply code in response from ".
- "ftp server [$text]" unless $text =~ s/^(\d+)([- ])//;
- local($code) = $1;
- if ($2 eq '-') {
- while (<FTP_CONTROL>) {
- ($tmp = $_) =~ s/^\d+[- ]//;
- $text .= $tmp;
- last if m/^$code /;
- }
- }
- $text =~ s/^\d+ ?/<foo>/g;
- ($code, $text);
- }
-
- sub _ftp_expect
- {
- local($code, $text) = &_ftp_get_reply;
- $_last_ftp_reply = $text;
- foreach $expect (@_) {
- return ($code, $text) if $code == $expect;
- }
- die "internal error: expected return code ".
- join('|',@_).", got [$text]";
- }
-
- sub _ftp_send
- {
- print STDERR "SEND: ", @_ if $ftp_debug;
- print FTP_CONTROL @_;
- }
-
- sub _ftp_do_passive
- {
- local(@commands) = @_;
-
- &_ftp_send("PASV\r\n");
- local($code) = &_ftp_expect(227, 125);
-
- if ($code == 227)
- {
- die "internal error: can't grok passive reply [$_last_ftp_reply]"
- unless $_last_ftp_reply =~ m/\(([\d,]+)\)/;
- local($a,$b,$c,$d, $p1, $p2) = split(/,/, $1);
- ($_passive_host, $_passive_port) =
- ("$a.$b.$c.$d", $p1*256 + $p2);
- }
-
- foreach(@commands) {
- &_ftp_send($_);
- }
-
- local($error)=
- &network'connect_to(*PASSIVE, $_passive_host, $_passive_port);
- die "internal error: passive ftp connect [$error]" if $error;
- }
-
- ## make the connection to the host
- &www'message($debug, "connecting to $host...") unless $quiet;
-
- local($old_alarm);
- if ($timeout) {
- $old_alarm = $SIG{'ALRM'} || 'DEFAULT';
- $SIG{'ALRM'} = "main'http_alarm"; ## can use this for now
-# $HaveAlarm = 0;
- $AlarmNote = "host $host";
- $AlarmNote .= ":$port" if $port != $www'default_port{'ftp'};
- $AlarmNote .= " timed out after $timeout second";
- $AlarmNote .= 's' if $timeout > 1;
- alarm($timeout);
- }
-
- local($error) = &network'connect_to(*FTP_CONTROL, $host, $port);
-
- if ($timeout) {
- alarm(0);
- $SIG{'ALRM'} = $old_alarm;
- }
-
- return $error if $error;
-
- local ($code, $text) = &_ftp_get_reply(*FTP_CONTROL);
- close(FTP_CONTROL), return "internal ftp error: [$text]" unless $code==220;
-
- ## log in
- &www'message($debug, "logging in as $user...") unless $quiet;
- foreach $password (@password)
- {
- &_ftp_send("USER $user\r\n");
- ($code, $text) = &_ftp_expect(230,331,530);
- close(FTP_CONTROL), return $text if ($code == 530);
- last if $code == 230; ## hey, already logged in, cool.
-
- &_ftp_send("PASS $password\r\n");
- ($code, $text) = &_ftp_expect(220,230,530,550,332);
- last if $code != 550;
- last if $text =~ m/can't change directory/;
- }
-
- if ($code == 550)
- {
- $text =~ s/\n+$//;
- &www'message(1, "Can't log in $host: $text") unless $quiet;
- exit($EXIT_error);
- }
-
- if ($code == 332)
- {
- &_ftp_send("ACCT noaccount\r\n");
- ($code, $text) = &_ftp_expect(230, 202, 530, 500,501,503, 421)
- }
- close(FTP_CONTROL), return $text if $code >= 300;
-
- &_ftp_send("TYPE I\r\n");
- &_ftp_expect(200);
-
- unless ($quiet) {
- local($name) = $path;
- $name =~ s,.*/([^/]),$1,;
- &www'message($debug, "requesting $name...");
- }
- ## get file
- &_ftp_do_passive("RETR $path\r\n");
- ($code,$text) = &_ftp_expect(125, 150, 550, 530);
- close(FTP_CONTROL), return $text if $code == 530;
-
- if ($code == 550)
- {
- close(PASSIVE);
- if ($text =~ /directory/i) {
- ## probably from "no such file or directory", so just return now.
- close(FTP_CONTROL);
- return $text;
- }
-
- ## do like Mosaic and try getting a directory listing.
- &_ftp_send("CWD $path\r\n");
- ($code) = &_ftp_expect(250,550);
- if ($code == 550) {
- close(FTP_CONTROL);
- return $text;
- }
- &_ftp_do_passive("LIST\r\n");
- &_ftp_expect(125, 150);
- }
-
- $size = $1 if $text =~ m/(\d+)\s+bytes/;
- binmode(PASSIVE); ## just in case.
- &www'message($debug, "waiting for data...") unless $quiet;
- &set_output_file($local_filename) if $nab;
- &general_read(*PASSIVE, $size);
- &close_output_file($local_filename) if $nab;
-
- close(PASSIVE);
- close(FTP_CONTROL);
- undef;
-}
-
-sub general_read
-{
- local(*INPUT, $size) = @_;
- local($lastcount, $bytes) = (0,0);
- local($need_to_clear) = 0;
- local($start_time) = time;
- local($last_time, $time) = $start_time;
- ## Figure out how often to print the "bytes read" message
- local($delta2print) =
- (defined $size) ? int($size/50) : $defaultdelta2print;
-
- &www'message(0, "read 0 bytes") unless $quiet;
-
- ## so $! below is set only if a real error happens from now
- eval 'local($^W) = 0; undef $!';
-
-
- while (defined($_ = <INPUT>))
- {
- ## shove it out.
- &www'clear_message if $need_to_clear;
- print;
- print SAVEOUT if $nab==2;
-
- ## if we know the content-size, keep track of what we're reading.
- $bytes += length;
-
- last if eof || (defined $size && $bytes >= $size);
-
- if (!$quiet && $bytes > ($lastcount + $delta2print))
- {
- if ($time = time, $last_time == $time) {
- $delta2print *= 1.5;
- } else {
- $last_time = $time;
- $lastcount = $bytes;
- local($time_delta) = $time - $start_time;
- local($text);
-
- $delta2print /= $time_delta;
- if (defined $size) {
- $text = sprintf("read $bytes bytes (%.0f%%)",
- $bytes*100/$size);
- } else {
- $text = "read $bytes bytes";
- }
-
- if ($time_delta > 5 || ($time_delta && $bytes > 10240))
- {
- local($rate) = int($bytes / $time_delta);
- if ($rate < 5000) {
- $text .= " ($rate bytes/sec)";
- } elsif ($rate < 1024 * 10) {
- $text .= sprintf(" (%.1f k/sec)", $rate/1024);
- } else {
- $text .= sprintf(" (%.0f k/sec)", $rate/1024);
- }
- }
- &www'message(0, "$text...");
- $need_to_clear = -t STDOUT;
- }
- }
- }
-
- if (!$quiet)
- {
- if ($size && ($size != $bytes)) {
- &www'message("WARNING: Expected $size bytes, read $bytes bytes.\n");
- }
-# if ($!) {
-# print STDERR "\$! is [$!]\n";
-# }
-# if ($@) {
-# print STDERR "\$\@ is [$@]\n";
-# }
- }
- &www'clear_message($text) unless $quiet;
-}
-
-sub dummy {
- 1 || &dummy || &fetch_via_ftp || &fetch_via_http || &http_alarm;
- 1 || close(OUT);
- 1 || close(SAVEOUT);
-}
-
-__END__
-__END__
-:endofperl
View Lorry Controller Status