Received: by taz.hyperreal.com (8.8.4/V2.0) id QAA05114;
 Wed, 29 Jan 1997 16:08:03 -0800 (PST)
Received: by taz.hyperreal.com (8.8.4/V2.0) id QAA05093;
 Wed, 29 Jan 1997 16:08:00 -0800 (PST)
Date: Wed, 29 Jan 1997 16:08:00 -0800 (PST)
From: Jim Jagielski <jim@hyperreal.com>
Message-Id: <199701300008.QAA05093@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src/helpers PrintPath
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

jim         97/01/29 16:07:55

  Modified:    src/helpers  PrintPath
  Log:
  Better -x test for PrintPath: fixes Ult bug
  
  Revision  Changes    Path
  1.9       +5 -8      apache/src/helpers/PrintPath
  
  Index: PrintPath
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/PrintPath,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** PrintPath	1997/01/25 03:20:33	1.8
  --- PrintPath	1997/01/30 00:07:54	1.9
  ***************
  *** 10,30 ****
    
    cat > $testfile <<ENDTEST
    #!/bin/sh
  ! if [ -x /dev/null ]
  ! then
  !  :
    fi
  ! echo "YES"
    ENDTEST
    
  ! havex=`/bin/sh $testfile 2>/dev/null`
  ! rm -f $testfile
  ! 
  ! if [ "x$havex" = "xYES" ]; then
        test_exec_flag="-x"
    else
        test_exec_flag="-r"
    fi
    
    if [ "x$1" = "x-s" ]; then
        shift
  --- 10,27 ----
    
    cat > $testfile <<ENDTEST
    #!/bin/sh
  ! if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
  !  exit 0
    fi
  ! exit 1
    ENDTEST
    
  ! if `/bin/sh $testfile 2>/dev/null`; then
        test_exec_flag="-x"
    else
        test_exec_flag="-r"
    fi
  + rm -f $testfile
    
    if [ "x$1" = "x-s" ]; then
        shift