[SCM] strace branch, master, updated. v4.6-390-g3efa7c7

[Dmitry V. Levin]

On Tue, May 01, 2012 at 09:55:56PM +0400, Dmitry V. Levin wrote:
> On Sat, Apr 28, 2012 at 03:01:15PM +0000, Denys Vlasenko wrote:
> [...]
> > - Log -----------------------------------------------------------------
> > commit 3efa7c7f1be0f54e0656de5cb4a5f4c39db10150
> > Author: Denys Vlasenko <vda.linux at googlemail.com>
> > Date:   Sat Apr 28 16:59:47 2012 +0200
> > 
> >     Enable printing of uts.domainname in uname syscall
> >     
> >     * process.c (sys_uname): Enable printing of uts.domainname
> >     
> >     Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
> > 
> > -----------------------------------------------------------------------
> > 
> > Summary of changes:
> >  process.c |    3 +--
> >  1 files changed, 1 insertions(+), 2 deletions(-)
> > 
> > diff --git a/process.c b/process.c
> > index 2fb6c92..8824abd 100644
> > --- a/process.c
> > +++ b/process.c
> > @@ -1170,13 +1170,12 @@ sys_uname(struct tcb *tcp)
> >  		else if (umove(tcp, tcp->u_arg[0], &uname) < 0)
> >  			tprints("{...}");
> >  		else if (!abbrev(tcp)) {
> > -
> >  			tprintf("{sysname=\"%s\", nodename=\"%s\", ",
> >  				uname.sysname, uname.nodename);
> >  			tprintf("release=\"%s\", version=\"%s\", ",
> >  				uname.release, uname.version);
> >  			tprintf("machine=\"%s\"", uname.machine);
> > -#ifndef __GLIBC__
> > +#if defined(_GNU_SOURCE) && defined(__GLIBC__)
> >  			tprintf(", domainname=\"%s\"", uname.domainname);
> >  #endif
> >  			tprints("}");
> 
> This change, besides enabling uts.domainname printing on __GLIBC__, also
> disables it on non-__GLIBC__ which is hardly justifiable.  I suppose a
> configure check would be more appropriate for this case.

I've changed it to a configure check.


-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20120502/16b852a6/attachment.bin>