2010/1/15 Mike Frysinger <[email protected]>:
> On Friday 15 January 2010 17:07:48 Garrett Cooper wrote:
>> Shortly after I sent out this email, I received some helpful replies
>> as to why my code wasn't working. It turns out that the curly bracket
>> regexp quantifier operators available in many other popular
>> implementations of regexps (perl, python, tcl) isn't supported in awk.
>> Here's the new patch with less bloat.
>
> the patch itself is word wrapped in the e-mail though :(
>
>> +_abspath() {
>> + echo "$@" | awk '{ sub(/\/$/, ""); while (gsub(/\/\//, "/")) { };
>> while (gsub(/\/[^\/]+\/\.\.\/?/, "/")) { }; while (gsub(/\/\.\//,
>> "/")) { } print }'
>> +}
>
> it's easy to line wrap awk scripts, and this sucker really needs it
>
> btw, this doesnt quite handle:
> /a/b/c/.././
>
> how about this (largely untested) sed:
> sed -r -e 's:/+[.]/+:/:g' -e 's:(^|/+[^/]*)/+[.][.]/+:/:g' -e 's:/+$::'
>
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ tests/test_abspath.sh 15 Jan 2010 22:04:59 -0000
>> +# NOTE (garrcoop): I usually don't use bashisms, but it was just easier to
>> +# express these values as an array of values instead of one whacky long
>> +# string.
>> +test_strings=( foo/bar /foo/bar /foo/../bar /foo/bar/../baz
>> /foo/bar/../baz/ /foo/../bar/ /foo/../bar/.. /foo/../bar/../
>> /foo/bar/../baz /foo/./bar /./foo/./bar /foo//bar //foo/bar
>> //////foo/bar /foo/////bar )
>> +expected_strings=( foo/bar /foo/bar /bar /foo/baz
>> /foo/baz /bar / / /foo/baz
>> /foo/bar /foo/bar /foo/bar /foo/bar /foo/bar
>> /foo/bar )
>
> probably be good if the source were better wrapped
>
> however, two parallel arrays makes it hard to correlate the input/expected
> values. how about something like:
> set -- \
> foo/bar:foo/bar \
> /foo/bar:/foo/bar \
> /foo/../bar:/bar \
> ...........
>
> then you can easily do:
> for test in "$@" ; do
> input=${test%:*}
> expect=${test#*:}
> ...
> done
>
> this should be POSIX and avoid /bin/bash
Version 2:
1. Incorporate comments from Mike F.
2. Resolve a negative testcase failure.
gcoo...@orangebox /scratch/ltp $ scripts/tests/test_abspath.sh
test_abspath 1 TPASS : Test string matches expected string
_abspath(foo/bar) => foo/bar == foo/bar)
test_abspath 2 TPASS : Test string matches expected string
_abspath(/foo/bar) => /foo/bar == /foo/bar)
test_abspath 3 TPASS : Test string matches expected string
_abspath(/foo/../bar) => /bar == /bar)
test_abspath 4 TPASS : Test string matches expected string
_abspath(/foo/bar/../baz) => /foo/baz == /foo/baz)
test_abspath 5 TPASS : Test string matches expected string
_abspath(/foo/bar/../baz/) => /foo/baz == /foo/baz)
test_abspath 6 TPASS : Test string matches expected string
_abspath(/foo/../bar/) => /bar == /bar)
test_abspath 7 TPASS : Test string matches expected string
_abspath(/foo/../bar/..) => / == /)
test_abspath 8 TPASS : Test string matches expected string
_abspath(/foo/../bar/../) => / == /)
test_abspath 9 TPASS : Test string matches expected string
_abspath(/foo/bar/../baz) => /foo/baz == /foo/baz)
test_abspath 10 TPASS : Test string matches expected string
_abspath(/foo/./bar) => /foo/bar == /foo/bar)
test_abspath 11 TPASS : Test string matches expected string
_abspath(/./foo/./bar) => /foo/bar == /foo/bar)
test_abspath 12 TPASS : Test string matches expected string
_abspath(/foo//bar) => /foo/bar == /foo/bar)
test_abspath 13 TPASS : Test string matches expected string
_abspath(//foo/bar) => /foo/bar == /foo/bar)
test_abspath 14 TPASS : Test string matches expected string
_abspath(//////foo/bar) => /foo/bar == /foo/bar)
test_abspath 15 TPASS : Test string matches expected string
_abspath(/foo/////bar) => /foo/bar == /foo/bar)
test_abspath 16 TPASS : Test string matches expected string
_abspath(/a/b/c/.././) => /a/b == /a/b)
test_abspath 17 TPASS : Test string matches expected string
_abspath(/.foo) => /.foo == /.foo)
test_abspath 18 TPASS : Test string matches expected string
_abspath(./.foo) => /.foo == /.foo)
test_abspath 19 TPASS : Test string matches expected string
_abspath(/.foo/.bar) => /.foo/.bar == /.foo/.bar)
test_abspath 20 TPASS : Test string matches expected string
_abspath(./.foo/.bar) => /.foo/.bar == /.foo/.bar)
Index: scripts/lib/file_functions.sh
===================================================================
RCS file: scripts/lib/file_functions.sh
diff -N scripts/lib/file_functions.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ scripts/lib/file_functions.sh 17 Jan 2010 06:18:33 -0000
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# File functions utilized as part of abspath.sh, realpath.sh, etc.
+#
+# Copyright (C) 2010, Cisco Systems Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Garrett Cooper, January 2010
+#
+# POSIX compliant bourne shell functions for performing make 3.81
+# compliancy in 3.80 with a minimal set of external commands
+# [awk(1) // readlink(1) only required].
+#
+
+# 1. Replace /+ with /.
+# 2. Replace a/b/../c with a/c
+# 3. Replace /./ with /
+# 4. Replace trailing /. with /
+# 5. Replace heading ./ with /
+_abspath() {
+ echo "$@" | awk '{
+ while (gsub(/\/\//, "/")) { };
+ while (gsub(/\/[^\/]+\/\.\.\/?/, "/")) { };
+ while (gsub(/\/\.\//, "/")) { };
+ sub(/(\/\.)?\/$/, "");
+ sub(/^\.\//, "/") ;
+ if ($0 == "") {
+ print "/";
+ } else {
+ print;
+ }
+}'
+}
+
+_realpath() {
+ readlink -f "$@"
+}
Index: scripts/tests/test_abspath.sh
===================================================================
RCS file: scripts/tests/test_abspath.sh
diff -N scripts/tests/test_abspath.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ scripts/tests/test_abspath.sh 17 Jan 2010 06:18:33 -0000
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# Test the _abspath function, utilized as part of abspath.sh
+#
+# Copyright (C) 2010, Cisco Systems Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Garrett Cooper, January 2010
+#
+
+set -- foo/bar:foo/bar \
+ /foo/bar:/foo/bar \
+ /foo/../bar:/bar \
+ /foo/bar/../baz:/foo/baz \
+ /foo/bar/../baz/:/foo/baz \
+ /foo/../bar/:/bar \
+ /foo/../bar/..:/ \
+ /foo/../bar/../:/ \
+ /foo/bar/../baz:/foo/baz \
+ /foo/./bar:/foo/bar \
+ /./foo/./bar:/foo/bar \
+ /foo//bar:/foo/bar \
+ //foo/bar:/foo/bar \
+ //////foo/bar:/foo/bar \
+ /foo/////bar:/foo/bar \
+ /a/b/c/.././:/a/b \
+ /.foo:/.foo \
+ ./.foo:/.foo \
+ /.foo/.bar:/.foo/.bar \
+ ./.foo/.bar:/.foo/.bar
+
+export TCID=test_abspath
+export TST_TOTAL=$#
+export TST_COUNT=1
+
+. "${0%/*}/../lib/file_functions.sh"
+
+for i in "$@"; do
+
+ test_string=${i%:*}
+ expected_string=${i#*:}
+
+ result=$(_abspath "$test_string")
+
+ if [ "$result" = "$expected_string" ]; then
+ result_s="matches expected string _abspath(${test_string}) =>
$result == $expected_string)"
+ result_v=TPASS
+ else
+ result_s="doesn't match expected string
_abspath(${test_string}) =>
$result != $expected_string)"
+ result_v=TFAIL
+ FAILED=1
+ fi
+
+ tst_resm $result_v "Test string $result_s"
+
+ : $(( TST_COUNT += 1 ))
+
+done
+
+exit ${FAILED:=0}
Index: scripts/abspath.sh
===================================================================
RCS file: scripts/abspath.sh
diff -N scripts/abspath.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ scripts/abspath.sh 17 Jan 2010 06:18:33 -0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# make 3.81 $(abspath .. ) emulation layer
+#
+# Copyright (C) 2010, Cisco Systems Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Garrett Cooper, January 2010
+#
+
+. "${0%/*}/lib/file_functions.sh"
+
+while [ $# -gt 0 ] ; do
+ _abspath "$1"
+ shift
+done
Index: scripts/realpath.sh
===================================================================
RCS file: scripts/realpath.sh
diff -N scripts/realpath.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ scripts/realpath.sh 17 Jan 2010 06:18:33 -0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# make 3.81 $(realpath .. ) emulation layer
+#
+# Copyright (C) 2010, Cisco Systems Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Garrett Cooper, January 2010
+#
+
+. "${0%/*}/lib/file_functions.sh"
+
+while [ $# -gt 0 ] ; do
+ _realpath "$1"
+ shift
+done
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
