PATCH: zsh-3.1.5-pws-11: signames2.awk

PATCH: zsh-3.1.5-pws-11: signames2.awk

[Will Day]

[-- Attachment #1.1: Type: text/plain, Size: 700 bytes --]

The signames2.awk script wasn't finding any signals, due to the extra
space generated by sun's cc -E (solaris 2.6, Sun WorkShop Compiler C
4.2), so I added a "*" to match extra spaces.

I noticed that /usr/lib/ccs/cpp doesn't add the extra space, but that's
not what configure chose for CPP.

-- 
Will Day     <PGP mail preferred>     OIT / O&E / Technical Support
willday@rom.oit.gatech.edu            Georgia Tech, Atlanta 30332-0715
  -> Opinions expressed are mine alone and do not reflect OIT policy <-
Those who would give up essential Liberty, to purchase a little temporary
Safety, deserve neither Liberty nor Safety.
    Benjamin Franklin, Pennsylvania Assembly, Nov. 11, 1755

[-- Attachment #1.2: signames.patch --]
[-- Type: text/plain, Size: 479 bytes --]

--- zsh-3.1.5-pws-11/Src/signames2.awk.orig	Tue Feb  9 08:28:41 1999
+++ zsh-3.1.5-pws-11/Src/signames2.awk	Tue Mar  9 19:55:52 1999
@@ -6,7 +6,7 @@
 # NB: On SunOS 4.1.3 - user-functions don't work properly, also \" problems
 # Without 0 + hacks some nawks compare numbers as strings
 #
-/^XXNAMES XXSIG[A-Z][A-Z0-9]* [1-9][0-9]*/ {
+/^XXNAMES XXSIG[A-Z][A-Z0-9]* *[1-9][0-9]*/ {
     sigindex = index($0, "SIG")
     sigtail = substr($0, sigindex, 80)
     split(sigtail, tmp)

[-- Attachment #2: Type: application/pgp-signature, Size: 344 bytes --]

Re: PATCH: zsh-3.1.5-pws-11: signames2.awk

[Phil Pennock]

Typing away merrily, Will Day produced the immortal words:
> The signames2.awk script wasn't finding any signals, due to the extra
> space generated by sun's cc -E (solaris 2.6, Sun WorkShop Compiler C
> 4.2), so I added a "*" to match extra spaces.

> --- zsh-3.1.5-pws-11/Src/signames2.awk.orig	Tue Feb  9 08:28:41 1999
> +++ zsh-3.1.5-pws-11/Src/signames2.awk	Tue Mar  9 19:55:52 1999
> @@ -6,7 +6,7 @@
>  # NB: On SunOS 4.1.3 - user-functions don't work properly, also \" problems
>  # Without 0 + hacks some nawks compare numbers as strings
>  #
> -/^XXNAMES XXSIG[A-Z][A-Z0-9]* [1-9][0-9]*/ {
> +/^XXNAMES XXSIG[A-Z][A-Z0-9]* *[1-9][0-9]*/ {
>      sigindex = index($0, "SIG")
>      sigtail = substr($0, sigindex, 80)
>      split(sigtail, tmp)

Is that 'correct'?  Shouldn't it be "  *" rather than " *" to force at
least one space?

Thus:
/^XXNAMES XXSIG[A-Z][A-Z0-9]*  *[1-9][0-9]*/ {

Could the pattern matched theoretically contain horizontal tabs there
too?
-- 
--> Phil Pennock ; GAT d- s+:+ a23 C++(++++) UL++++/I+++/S+++/B++/H+$ P++@$
L+++ E-@ W(+) N>++ o !K w--- O>+ M V !PS PE Y+ PGP+ t-- 5++ X+ R !tv b++>+++
DI+ D+ G+ e+ h* r y?

Re: PATCH: zsh-3.1.5-pws-11: signames2.awk

[Will Day]

[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]

A short time ago, at a computer terminal far, far away, Phil Pennock wrote:
>> -/^XXNAMES XXSIG[A-Z][A-Z0-9]* [1-9][0-9]*/ {
>> +/^XXNAMES XXSIG[A-Z][A-Z0-9]* *[1-9][0-9]*/ {
>
>Is that 'correct'?  Shouldn't it be "  *" rather than " *" to force at
>least one space?
>
>Thus:
>/^XXNAMES XXSIG[A-Z][A-Z0-9]*  *[1-9][0-9]*/ {

Hmm, yeah, that's really what you want.

>Could the pattern matched theoretically contain horizontal tabs there
>too?

I've no idea what kind of output different variants of cpp produce, or
what's considered correct, but it probably wouldn't be a bad idea to
match one or more tabs/spaces.  Perhaps:
   /XXNAMES XXSIG[A-Z][A-Z0-9]*[ \t]+[1-9][0-9]*/

-- 
Will Day     <PGP mail preferred>     OIT / O&E / Technical Support
willday@rom.oit.gatech.edu            Georgia Tech, Atlanta 30332-0715
  -> Opinions expressed are mine alone and do not reflect OIT policy <-
Those who would give up essential Liberty, to purchase a little temporary
Safety, deserve neither Liberty nor Safety.
    Benjamin Franklin, Pennsylvania Assembly, Nov. 11, 1755

[-- Attachment #2: Type: application/pgp-signature, Size: 344 bytes --]

Re: PATCH: zsh-3.1.5-pws-11: signames2.awk

[Phil Pennock]

Typing away merrily, Will Day produced the immortal words:
> A short time ago, at a computer terminal far, far away, Phil Pennock wrote:
> >Could the pattern matched theoretically contain horizontal tabs there
> >too?
> 
> I've no idea what kind of output different variants of cpp produce, or
> what's considered correct, but it probably wouldn't be a bad idea to
> match one or more tabs/spaces.  Perhaps:
>    /XXNAMES XXSIG[A-Z][A-Z0-9]*[ \t]+[1-9][0-9]*/

This assumes that all implementations of sed(1) understand \t.  My
understanding, verified by a quick glance at a Solaris manual page, is
that the only special like that which most seds handle is \n, in some
contexts.
-- 
--> Phil Pennock ; GAT d- s+:+ a23 C++(++++) UL++++/I+++/S+++/B++/H+$ P++@$
L+++ E-@ W(+) N>++ o !K w--- O>+ M V !PS PE Y+ PGP+ t-- 5++ X+ R !tv b++>+++
DI+ D+ G+ e+ h* r y?

Re: PATCH: zsh-3.1.5-pws-11: signames2.awk

[Will Day]

[-- Attachment #1: Type: text/plain, Size: 815 bytes --]

A short time ago, at a computer terminal far, far away, Phil Pennock wrote:
>>    /XXNAMES XXSIG[A-Z][A-Z0-9]*[ \t]+[1-9][0-9]*/
>
>This assumes that all implementations of sed(1) understand \t.  My
>understanding, verified by a quick glance at a Solaris manual page, is
>that the only special like that which most seds handle is \n, in some
>contexts.

I thought the script was using {n,g}awk, not sed?

-- 
Will Day     <PGP mail preferred>     OIT / O&E / Technical Support
willday@rom.oit.gatech.edu            Georgia Tech, Atlanta 30332-0715
  -> Opinions expressed are mine alone and do not reflect OIT policy <-
Those who would give up essential Liberty, to purchase a little temporary
Safety, deserve neither Liberty nor Safety.
    Benjamin Franklin, Pennsylvania Assembly, Nov. 11, 1755

[-- Attachment #2: Type: application/pgp-signature, Size: 344 bytes --]

Re: PATCH: zsh-3.1.5-pws-11: signames2.awk

[Phil Pennock]

Typing away merrily, Will Day produced the immortal words:
> I thought the script was using {n,g}awk, not sed?

Thanks.  I'll, erm, just go stick my head in a water-barrel and keep it
there.

Anyway, the earlier point stands.  Want to generate a replacement patch
for pws?

(*doh*doh*doh*)
-- 
--> Phil Pennock ; GAT d- s+:+ a23 C++(++++) UL++++/I+++/S+++/B++/H+$ P++@$
L+++ E-@ W(+) N>++ o !K w--- O>+ M V !PS PE Y+ PGP+ t-- 5++ X+ R !tv b++>+++
DI+ D+ G+ e+ h* r y?

PATCH: Re: zsh-3.1.5-pws-11: signames2.awk

[Will Day]

[-- Attachment #1.1: Type: text/plain, Size: 584 bytes --]

A short time ago, at a computer terminal far, far away, Phil Pennock wrote:
>Anyway, the earlier point stands.  Want to generate a replacement patch
>for pws?

Sure (attached).

-- 
Will Day     <PGP mail preferred>     OIT / O&E / Technical Support
willday@rom.oit.gatech.edu            Georgia Tech, Atlanta 30332-0715
  -> Opinions expressed are mine alone and do not reflect OIT policy <-
Those who would give up essential Liberty, to purchase a little temporary
Safety, deserve neither Liberty nor Safety.
    Benjamin Franklin, Pennsylvania Assembly, Nov. 11, 1755

[-- Attachment #1.2: signames.patch --]
[-- Type: text/plain, Size: 449 bytes --]

--- Src/signames2.awk.orig	Tue Feb  9 08:28:41 1999
+++ Src/signames2.awk	Wed Mar 10 17:13:43 1999
@@ -6,7 +6,7 @@
 # NB: On SunOS 4.1.3 - user-functions don't work properly, also \" problems
 # Without 0 + hacks some nawks compare numbers as strings
 #
-/^XXNAMES XXSIG[A-Z][A-Z0-9]* [1-9][0-9]*/ {
+/^XXNAMES XXSIG[A-Z][A-Z0-9]*[ \t]+[1-9][0-9]*/ {
     sigindex = index($0, "SIG")
     sigtail = substr($0, sigindex, 80)
     split(sigtail, tmp)

[-- Attachment #2: Type: application/pgp-signature, Size: 344 bytes --]

Re: PATCH: Re: zsh-3.1.5-pws-11: signames2.awk

[Peter Stephenson]

> +/^XXNAMES XXSIG[A-Z][A-Z0-9]*[ \t]+[1-9][0-9]*/ {

I've actually set this to more like what it looks like in signames1.awk,
which has [\t ][\t ]*.  That should minimise the demarcation disputes.

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy