Return-Path: 
 <cvs-return-11588-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 47629 invoked by uid 500); 16 May 2002 02:56:23 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 47618 invoked by uid 500); 16 May 2002 02:56:23 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 16 May 2002 02:56:31 -0000
Message-ID: <20020516025631.27943.qmail@icarus.apache.org>
From: wrowe@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0 Makefile.win
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

wrowe       02/05/15 19:56:31

  Modified:    .        Makefile.win
  Log:
    Potential flaw --- use forward slash notation in filenames to awk
  
  Revision  Changes    Path
  1.102     +16 -15    httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- Makefile.win	16 May 2002 02:52:43 -0000	1.101
  +++ Makefile.win	16 May 2002 02:56:31 -0000	1.102
  @@ -410,7 +410,8 @@
     for use in the OpenSSL Toolkit <http://www.openssl.org/>.
   <<
   	-awk -f <<script.awk < "srclib\openssl\LICENSE" >> "$(INSTDIR)\LICENSE.txt"
  -{   print "";
  +BEGIN {
  +    print "";
       print "For the libeay32.dll, ssleay32.dll and certtool.exe components:";
       print "";
       while ( getline > 0 ) {
  @@ -476,19 +477,19 @@
     and Mark Adler (madler@alumni.caltech.edu) .
   <<
   	-awk -f <<script.awk < "srclib\zlib\README" >> "$(INSTDIR)\LICENSE.txt"
  -    {
  -      while ( getline > 0 ) {
  +BEGIN {
  +    while ( getline > 0 ) {
   	if ( $$0 ~ /Copyright notice:/ ) {
  -	  print "";
  -	  print "For the mod_deflate zlib compression component:";
  -	  while ( getline > 0 && $$0 !~ /^[^ ]/ ) {
  -	    print $$0;
  -          }
  -          exit 0;
  +	    print "";
  +	    print "For the mod_deflate zlib compression component:";
  +	    while ( getline > 0 && $$0 !~ /^[^ ]/ ) {
  +		print $$0;
  +            }
  +            exit 0;
           }
  -      }
  -      exit 1;
       }
  +    exit 1;
  +}
   <<
   	copy modules\filters\$(LONG)\mod_deflate.so "$(INSTDIR)\modules" <.y
   !ENDIF
  @@ -500,7 +501,7 @@
   	copy support\win32\$(LONG)\ApacheMonitor.exe "$(INSTDIR)\bin" <.y
   	copy support\win32\$(LONG)\wintty.exe "$(INSTDIR)\bin" <.y
   	copy docs\cgi-examples\printenv "$(INSTDIR)\cgi-bin\printenv.pl" <.y
  -	-awk -f <<script.awk "docs\cgi-examples\printenv" > "$(INSTDIR)\cgi-bin\printenv.pl"
  +	-awk -f <<script.awk "docs/cgi-examples/printenv" > "$(INSTDIR)\cgi-bin\printenv.pl"
       BEGIN { 
   	if ( "perl -e \"print $$^X;\"" | getline perlroot ) {
   	    gsub( /\\/, "/", perlroot );
  @@ -544,7 +545,7 @@
   	if not exist "$(INSTDIR)\conf\mime.types" \
   	    copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
   	copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf" <.y
  -	-awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.default.conf"
  +	-awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.default.conf"
       BEGIN { 
   	serverroot = ARGV[2];
   	delete ARGV[2];
  @@ -562,7 +563,7 @@
   	if not exist "$(INSTDIR)\conf\httpd.conf" \
   	    copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
   	copy docs\conf\ssl-std.conf "$(INSTDIR)\conf\ssl.default.conf" <.y
  -	-awk -f <<script.awk "docs\conf\ssl-std.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
  +	-awk -f <<script.awk "docs/conf/ssl-std.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
       BEGIN { 
   	serverroot = ARGV[2];
   	delete ARGV[2];
  @@ -577,7 +578,7 @@
   <<
   	if not exist "$(INSTDIR)\conf\ssl.conf" \
   	    copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf"
  -	-awk -f <<script.awk "support\dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"
  +	-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"
       { if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) {
   	  sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" ); 
         }