public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
* Why change posix/globtest.sh?
@ 2000-04-18 17:27 H . J . Lu
  2000-04-18 19:38 ` Ulrich Drepper
  0 siblings, 1 reply; 6+ messages in thread
From: H . J . Lu @ 2000-04-18 17:27 UTC (permalink / raw)
  To: Ulrich Drepper; +Cc: GNU C Library

I cannot see how this patch in glibc 2.1:

2000-04-13  Ulrich Drepper  <drepper@redhat.com>

        * posix/globtest.sh: Work around inconsistency with expanding ~/
        in shell (PR libc/1690).  Reported by patsmith@pobox.com.

will work. Here is the change:

 ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
 ${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
 sort > $testout
-eval echo ~$USER | cmp - $testout || result=1
+# Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
+if test ~/ = //; then
+    echo / | cmp - $testout || result=1
+else
+    echo ~/ | cmp - $testout || result=1
+fi

UIlrich, I believe you applied the patch at the wrong place. Could
you please fix it?

Thanks.


H.J.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Why change posix/globtest.sh?
  2000-04-18 17:27 Why change posix/globtest.sh? H . J . Lu
@ 2000-04-18 19:38 ` Ulrich Drepper
  2000-04-18 20:18   ` H . J . Lu
  0 siblings, 1 reply; 6+ messages in thread
From: Ulrich Drepper @ 2000-04-18 19:38 UTC (permalink / raw)
  To: H . J . Lu; +Cc: GNU C Library

"H . J . Lu" <hjl@lucon.org> writes:

>  ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
>  ${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
>  sort > $testout
> -eval echo ~$USER | cmp - $testout || result=1
> +# Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
> +if test ~/ = //; then
> +    echo / | cmp - $testout || result=1
> +else
> +    echo ~/ | cmp - $testout || result=1
> +fi
> 
> UIlrich, I believe you applied the patch at the wrong place. Could
> you please fix it?

Why should this be wrong?  Some shells expand ~/ for $HOME == / to //.
We expect / and therefore we have to have a special test.

-- 
---------------.      drepper at gnu.org  ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Red Hat          `--' drepper at redhat.com   `------------------------

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Why change posix/globtest.sh?
  2000-04-18 19:38 ` Ulrich Drepper
@ 2000-04-18 20:18   ` H . J . Lu
  2000-04-26 20:44     ` Andreas Jaeger
  0 siblings, 1 reply; 6+ messages in thread
From: H . J . Lu @ 2000-04-18 20:18 UTC (permalink / raw)
  To: Ulrich Drepper; +Cc: GNU C Library

On Tue, Apr 18, 2000 at 07:36:02PM -0700, Ulrich Drepper wrote:
> "H . J . Lu" <hjl@lucon.org> writes:
> 
> >  ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
> >  ${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
> >  sort > $testout
> > -eval echo ~$USER | cmp - $testout || result=1
> > +# Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
> > +if test ~/ = //; then
> > +    echo / | cmp - $testout || result=1
> > +else
> > +    echo ~/ | cmp - $testout || result=1
> > +fi
> > 
> > UIlrich, I believe you applied the patch at the wrong place. Could
> > you please fix it?
> 
> Why should this be wrong?  Some shells expand ~/ for $HOME == / to //.
> We expect / and therefore we have to have a special test.
> 

This is the patch for glibc 2.1. Please read PR libc/1690 and glibc
2.2. I didn't figure it out until I read PR libc/1690 and glibc 2.2.


H.J.
--
2000-04-18  H.J. Lu  <hjl@gnu.org>

        * posix/globtest.sh: Properly apply the patch by Ulrich Drepper
        <drepper@redhat.com> on 2000-04-13.


--- ../../import/glibc-2.1/libc/posix/globtest.sh	Thu Apr 13 20:25:20 2000
+++ posix/globtest.sh	Tue Apr 18 17:29:46 2000
@@ -211,18 +211,18 @@ echo ~ | cmp - $testout || result=1
 ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
 ${common_objpfx}posix/globtest -q -t "$testdir" "~/" |
 sort > $testout
-echo ~/ | cmp - $testout || result=1
-
-# Test tilde expansion with username
-${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
-${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
-sort > $testout
 # Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
 if test ~/ = //; then
     echo / | cmp - $testout || result=1
 else
     echo ~/ | cmp - $testout || result=1
 fi
+
+# Test tilde expansion with username
+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
+sort > $testout
+eval echo ~$USER | cmp - $testout || result=1
 
 # Tilde expansion shouldn't match a file
 ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Why change posix/globtest.sh?
  2000-04-18 20:18   ` H . J . Lu
@ 2000-04-26 20:44     ` Andreas Jaeger
  2000-04-26 20:52       ` H . J . Lu
  0 siblings, 1 reply; 6+ messages in thread
From: Andreas Jaeger @ 2000-04-26 20:44 UTC (permalink / raw)
  To: H . J . Lu; +Cc: GNU libc hacker

>>>>> H J Lu writes:

HJ> On Tue, Apr 18, 2000 at 07:36:02PM -0700, Ulrich Drepper wrote:
>> "H . J . Lu" <hjl@lucon.org> writes:
>> 
>> >  ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
>> >  ${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
>> >  sort > $testout
>> > -eval echo ~$USER | cmp - $testout || result=1
>> > +# Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
>> > +if test ~/ = //; then
>> > +    echo / | cmp - $testout || result=1
>> > +else
>> > +    echo ~/ | cmp - $testout || result=1
>> > +fi
>> > 
>> > UIlrich, I believe you applied the patch at the wrong place. Could
>> > you please fix it?
>> 
>> Why should this be wrong?  Some shells expand ~/ for $HOME == / to //.
>> We expect / and therefore we have to have a special test.
>> 

HJ> This is the patch for glibc 2.1. Please read PR libc/1690 and glibc
HJ> 2.2. I didn't figure it out until I read PR libc/1690 and glibc 2.2.

You're right - I've fixed and commited this for 2.2 now.

Andreas
-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Why change posix/globtest.sh?
  2000-04-26 20:44     ` Andreas Jaeger
@ 2000-04-26 20:52       ` H . J . Lu
  2000-04-26 21:02         ` Andreas Jaeger
  0 siblings, 1 reply; 6+ messages in thread
From: H . J . Lu @ 2000-04-26 20:52 UTC (permalink / raw)
  To: Andreas Jaeger; +Cc: GNU libc hacker

On Thu, Apr 27, 2000 at 05:43:47AM +0200, Andreas Jaeger wrote:
> >>>>> H J Lu writes:
> 
> HJ> On Tue, Apr 18, 2000 at 07:36:02PM -0700, Ulrich Drepper wrote:
> >> "H . J . Lu" <hjl@lucon.org> writes:
> >> 
> >> >  ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
> >> >  ${common_objpfx}posix/globtest -q -t "$testdir" "~"$USER |
> >> >  sort > $testout
> >> > -eval echo ~$USER | cmp - $testout || result=1
> >> > +# Some shell incorrectly(?) convert ~/ into // if ~ expands to /.
> >> > +if test ~/ = //; then
> >> > +    echo / | cmp - $testout || result=1
> >> > +else
> >> > +    echo ~/ | cmp - $testout || result=1
> >> > +fi
> >> > 
> >> > UIlrich, I believe you applied the patch at the wrong place. Could
> >> > you please fix it?
> >> 
> >> Why should this be wrong?  Some shells expand ~/ for $HOME == / to //.
> >> We expect / and therefore we have to have a special test.
> >> 
> 
> HJ> This is the patch for glibc 2.1. Please read PR libc/1690 and glibc
> HJ> 2.2. I didn't figure it out until I read PR libc/1690 and glibc 2.2.
> 
> You're right - I've fixed and commited this for 2.2 now.

My patch is for glibc 2.1. Why did you change 2.2?


H.J.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Why change posix/globtest.sh?
  2000-04-26 20:52       ` H . J . Lu
@ 2000-04-26 21:02         ` Andreas Jaeger
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Jaeger @ 2000-04-26 21:02 UTC (permalink / raw)
  To: H . J . Lu; +Cc: GNU libc hacker

>>>>> H J Lu writes:

HJ> On Thu, Apr 27, 2000 at 05:43:47AM +0200, Andreas Jaeger wrote:
>> >>>>> H J Lu writes:
[...]
HJ> This is the patch for glibc 2.1. Please read PR libc/1690 and glibc
HJ> 2.2. I didn't figure it out until I read PR libc/1690 and glibc 2.2.
>> 
>> You're right - I've fixed and commited this for 2.2 now.

HJ> My patch is for glibc 2.1. Why did you change 2.2?

Upps - shame on me :-(.

I clean up the mess now.

Thanks for checking this,
Andreas
-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2000-04-26 21:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-04-18 17:27 Why change posix/globtest.sh? H . J . Lu
2000-04-18 19:38 ` Ulrich Drepper
2000-04-18 20:18   ` H . J . Lu
2000-04-26 20:44     ` Andreas Jaeger
2000-04-26 20:52       ` H . J . Lu
2000-04-26 21:02         ` Andreas Jaeger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).