Re: another bugfix for squid-cvs!

Makes sense, but I fail to see any syntax error there.

According to all documentation I can find the ?: operator is fairly old
(SVR3.1), and Solaris should support it... it is even covered by POSIX
AFAIKT.

Anyway, the proposed change makes the code more readable as well as more
portable. Even I (who wrote this in January) had trouble to understand
that line at a first glance.... Too many quoted quotes to make sense on
a long line..

/Henrik

Adrian Chadd wrote:
>
> This is from Andres again. I've just tried compiling squid under
> solaris 2.7 and have hit this bug. And it fixes it. :-) Can
> someone else running solaris test this against squid-cvs and give me
> some feedback so I can look at committing it?
>
> (I'll be testing it against GNU awk tonight..)
>
> Thanks!
>
> Adrian
>
> ----- Forwarded message from Andres Kroonmaa <andre@online.ee> -----
>
> From: "Andres Kroonmaa" <andre@online.ee>
> To: Adrian Chadd <adrian@creative.net.au>
> Date: Mon, 9 Oct 2000 19:12:42 +0200
> Subject: Re: mempools conversions, more ..
> X-mailer: Pegasus Mail for Win32 (v3.12c)
>
> On 9 Oct 2000, at 21:22, Adrian Chadd <adrian@creative.net.au> wrote:
> > > > Ok;. Can I please please request you redo these against squid-HEAD?
> > >
> > > Alright, but it'll take a week or two then.
> >
> > It wil not be that hard - it'll be a little more fuzzy, if you managed
> > to do this in a couple days .. :-)
>
> this fixes awk script for non-gnu awk
> (solaris' awk bails out on syntax error)
>
> Index: cf_gen_defines
> ===================================================================
> RCS file: /cvsroot/squid/squid/src/Attic/cf_gen_defines,v
> retrieving revision 1.1.6.3
> diff -u -r1.1.6.3 cf_gen_defines
> --- cf_gen_defines 2000/07/16 00:25:22 1.1.6.3
> +++ cf_gen_defines 2000/10/09 17:11:47
> @@ -20,7 +20,11 @@
> define["USE_REFERER_LOG"]="--enable-referer-log"
> }
> /^IFDEF:/ {
> - print "{\"" $2 "\", \"" (define[$2] != "" ? define[$2] : ("-D" $2)) "\", "
> + if (define[$2] != "")
> + DEFINE=define[$2]
> + else
> + DEFINE="-D" $2
> + print "{\"" $2 "\", \"" DEFINE "\", "
> print "#if " $2
> print "1"
> print "#else"
>
> ------------------------------------
> Andres Kroonmaa <andre@online.ee>
> Delfi Online
> Tel: 6501 731, Fax: 6501 708
> Pärnu mnt. 158, Tallinn,
> 11317 Estonia
>
> ----- End forwarded message -----
>
> --
> Adrian Chadd "It was then that I knew that I wouldn't
> <adrian@creative.net.au> die, as a doctor wouldn't fart in front
> of a dying boy." -- Angela's Ashes
Received on Tue Oct 17 2000 - 10:33:59 MDT