]>
Commit | Line | Data |
---|---|---|
bfc879b9 ER |
1 | diff -ur build-tree-apache.orig/apache_1.3.34/src/helpers/fmn.sh build-tree-apache/apache_1.3.34/src/helpers/fmn.sh |
2 | --- build-tree-apache.orig/apache_1.3.34/src/helpers/fmn.sh 2004-02-16 22:23:09.000000000 +0000 | |
3 | +++ build-tree-apache/apache_1.3.34/src/helpers/fmn.sh 2005-01-18 13:22:08.505238696 +0000 | |
4 | @@ -24,8 +24,8 @@ | |
5 | modfile=$1 | |
6 | ||
7 | # the part from the Configure script | |
8 | -tmpfile=${TMPDIR-/tmp}/fmn.tmp.$$ | |
9 | -rm -f $tmpfile | |
10 | +tmpfile=`mktemp -t fmn.XXXXXX || tempfile --prefix=fmn` || {echo "$0: Cannot create temporary file" >&2; exit 1; } | |
11 | +trap "rm -f -- \"$tmpfile\";" 0 1 2 3 13 15 | |
12 | modname='' | |
13 | ext=`echo $modfile | sed 's/^.*\.//'` | |
14 | modbase=`echo $modfile | sed 's/\.[^.]*$//'` | |
15 | @@ -52,8 +52,8 @@ | |
16 | modname=`echo $modbase | sed 's/^.*\///' | \ | |
17 | sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'` | |
18 | fi | |
19 | -rm -f $tmpfile | |
20 | ||
21 | # output: the name of the module structure symbol | |
22 | echo "$modname" | |
23 | ||
24 | +exit 0 | |
25 | diff -ur build-tree-apache.orig/apache_1.3.34/src/support/check_forensic build-tree-apache/apache_1.3.34/src/support/check_forensic | |
26 | --- build-tree-apache.orig/apache_1.3.34/src/support/check_forensic 2005-01-18 13:19:22.532470000 +0000 | |
27 | +++ build-tree-apache/apache_1.3.34/src/support/check_forensic 2005-01-18 13:27:58.132087336 +0000 | |
28 | @@ -7,9 +7,14 @@ | |
29 | ||
30 | F=$1 | |
31 | ||
32 | -cut -f 1 -d '|' $F > /tmp/fc-all.$$ | |
33 | -grep + < /tmp/fc-all.$$ | cut -c2- | sort > /tmp/fc-in.$$ | |
34 | -grep -- - < /tmp/fc-all.$$ | cut -c2- | sort > /tmp/fc-out.$$ | |
35 | +all=`mktemp -t fcall.XXXXXX || tempfile --prefix=fcall` || { echo "$0: Cannot create temporary file" >&2; exit 1; } | |
36 | +in=`mktemp -t fcin.XXXXXX || tempfile --prefix=fcin` || { echo "$0: Cannot create temporary file" >&2; exit 1; } | |
37 | +out=`mktemp -t fcout.XXXXXX || tempfile --prefix=fcout` || { echo "$0: Cannot create temporary file" >&2; exit 1; } | |
38 | +trap "rm -f -- \"$all\" \"$in\" \"$out\";" 0 1 2 3 13 15 | |
39 | + | |
40 | +cut -f 1 -d '|' $F >$all | |
41 | +grep + < $all|cut -c2- | sort >$in | |
42 | +grep -- - < $all cut -c2- | sort >$out | |
43 | # use -i instead of -I for GNU xargs | |
44 | -join -v 1 /tmp/fc-in.$$ /tmp/fc-out.$$ | xargs -ixx egrep "^\\+xx" $F | |
45 | -rm /tmp/fc-all.$$ /tmp/fc-in.$$ /tmp/fc-out.$$ | |
46 | +join -v 1 $in $out |xargs -ixx egrep "^\\+xx" $F | |
47 | +exit 0 |