Re: ylwrap

Eli Zaretskii
2005-05-12T13:03:25Z

> Date: Wed, 11 May 2005 19:32:54 -0400
> From: Daniel Jacobowitz <drow@false.org>
> Cc: gdb-patches@sourceware.org
>
> > So what do I do for now? wait until we resync with the latest version,
> > or commit my changes in the GDB CVS? Or maybe something else?
>
> Hard to say in absence of the proposed changes. The first thing to do
> is make sure that the latest version in automake is OK, or fix it.

The proposed patches are below; they fix the script's notion of
absolute file names on Windows/DOS. The latest versions of the
script, both in the released Automake 1.9 and in Automake's CVS,
already include the equivalents of these patches.

Unless you (or someone else) are going to import the latest version of
ylwrap VSN, I'd like to commit these changes to the GDB repository,
since they should be harmless.

TIA

Index: ylwrap
===================================================================
RCS file: /cvs/src/src/ylwrap,v
retrieving revision 1.3
diff -u -r1.3 ylwrap
--- ylwrap 24 Sep 2004 13:21:46 -0000 1.3
+++ ylwrap 12 May 2005 12:57:36 -0000
@@ -31,15 +31,15 @@
shift
# Make any relative path in $prog absolute.
case "$prog" in
- /* | [A-Za-z]:\\*) ;;
- */*) prog="`pwd`/$prog" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *[\\/]*) prog="`pwd`/$prog" ;;
esac

# The input.
input="$1"
shift
case "$input" in
- /* | [A-Za-z]:\\*)
+ [\\/]* | [A-Za-z]:[\\/]*)
# Absolute path; do nothing.
;;
*)
@@ -52,7 +52,7 @@

# We don't want to use the absolute path if the input in the current
# directory like when making a tar ball.
-input_base=`echo $input | sed -e 's|.*/||'`
+input_base=`echo $input | sed -e 's|.*[\\/]||'`
if test -f $input_base && cmp $input_base $input >/dev/null 2>&1; then
input=$input_base
fi
@@ -75,7 +75,7 @@

cd $dirname
case "$input" in
- /* | [A-Za-z]:\\*)
+ [\\/]* | [A-Za-z]:[\\/]*)
# Absolute path; do nothing.
;;
*)
@@ -95,7 +95,7 @@
# If $2 is an absolute path name, then just use that,
# otherwise prepend `../'.
case "$2" in
- /* | [A-Za-z]:\\*) target="$2";;
+ [\\/]* | [A-Za-z]:[\\/]*) target="$2";;
*) target="../$2";;
esac
mv "$1" "$target" || status=$?