rse 98/03/04 04:48:13
Modified: src/helpers UpdateHide
Log:
- Add Apache license header
- Add usage information
- Add Linux hint
- Correct regex recently added by Ken
Revision Changes Path
1.6 +65 -4 apache-1.3/src/helpers/UpdateHide
Index: UpdateHide
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UpdateHide 1998/03/04 12:02:07 1.5
+++ UpdateHide 1998/03/04 12:48:12 1.6
@@ -1,11 +1,72 @@
:
eval 'exec perl -S $0 ${1+"$@"}'
if $running_under_some_shell;
+## ====================================================================
+## Copyright (c) 1995-1998 The Apache Group. All rights reserved.
##
-## UpdateHideHeader -- update include/hide.h header file
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##
+## 1. Redistributions of source code must retain the above copyright
+## notice, this list of conditions and the following disclaimer.
+##
+## 2. Redistributions in binary form must reproduce the above copyright
+## notice, this list of conditions and the following disclaimer in
+## the documentation and/or other materials provided with the
+## distribution.
+##
+## 3. All advertising materials mentioning features or use of this
+## software must display the following acknowledgment:
+## "This product includes software developed by the Apache Group
+## for use in the Apache HTTP server project (http://www.apache.org/)."
+##
+## 4. The names "Apache Server" and "Apache Group" must not be used to
+## endorse or promote products derived from this software without
+## prior written permission. For written permission, please contact
+## [EMAIL PROTECTED]
+##
+## 5. Redistributions of any form whatsoever must retain the following
+## acknowledgment:
+## "This product includes software developed by the Apache Group
+## for use in the Apache HTTP server project (http://www.apache.org/)."
+##
+## THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+## EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+## NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+## LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+## STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+## OF THE POSSIBILITY OF SUCH DAMAGE.
+## ====================================================================
+##
+## This software consists of voluntary contributions made by many
+## individuals on behalf of the Apache Group and was originally based
+## on public domain software written at the National Center for
+## Supercomputing Applications, University of Illinois, Urbana-Champaign.
+## For more information on the Apache Group and the Apache HTTP server
+## project, please see <http://www.apache.org/>.
+##
+##
+
+##
+## UpdateHide -- update the include/hide.h header file
## Written by Ralf S. Engelschall, <[EMAIL PROTECTED]>
##
+# usage
+if ($#ARGV != 2) {
+ print STDERR "Usage: UpdateHide <httpd-binary> <hide-header-file>
<gnu-triple>\n";
+ print STDERR "Example: UpdateHide httpd include/hide.h
`helpers/GuessOS`\n";
+ print STDERR "Hint: Use the 'makeupdate' target of src/Makefile to
run it\n";
+ exit(1);
+}
+
# the parameters
$httpdbinary = $ARGV[0];
$headerfile = $ARGV[1];
@@ -42,13 +103,13 @@
$nm_cmd = '/usr/ccs/bin/nm -p -g';
$us_strip = 0;
}
-elsif ($gnutriple =~ /linux/) {
+elsif ($gnutriple =~ m|.*-linux.*|) {
$nm_cmd = '/usr/bin/nm -g';
$us_strip = 0;
}
else {
print STDERR "Sorry, UpdateHide currently can be used only under\n";
- print STDERR "the following OS: FreeBSD, Solaris, HPUX\n";
+ print STDERR "the following OS: FreeBSD, Solaris, HPUX, Linux\n";
exit(1);
}
@@ -76,7 +137,7 @@
# already compiled with HIDE defined)
$name =~ s|^AP_||;
# skip any already-protected symbols
- next if ($name =~ m:^ap(_)|(api):);
+ next if ($name =~ m/^ap(?:_|api)/);
# skip any compiler- or system-private symbols
next if ($name !~ m|^[a-zA-Z]+|);
# skip any symbols in our exclusion list
