Re: Reducing uname footer string on FreeBSD

[Ingo Schwarze <schwarze@usta.de>]

Hi Ulrich,

Ulrich Spörlein wrote on Wed, Jun 09, 2010 at 06:34:47PM +0200:

> The attached patch clamps the string after the dash, iff uname reports
> we are running on FreeBSD. I don't think such special casing should be
> applied in the general source tree, but wanted to put it up for
> discussion anyway.

Actually, i wouldn't even object to this particular patch going in
in case that's easier for you.  After all,

 - post_os() is typically called once per input file;
 - this is the central place where OS names are handled,
   so having differences here is not that surprising;
 - your patch is not expensive:  linear in the length
   of the string "FreeBSD" on FreeBSD, one return-at-once
   function call everywhere else.

So, even if all the four major free BSD implementations would
need something like this in post_os(), it would still seem
reasonable to me.

Yours,
  Ingo


> commit 7b6298d198c875c7d5036f0a8ad81c4a0ea194f9
> Author: Ulrich Spörlein <uqs@spoerlein.net>
> Date:   Mon May 24 16:50:14 2010 +0200
> 
>     mandoc: cut trailing OS string after first dash
>     
>     This is to mimick groff behaviour, where only "FreeBSD 8.0" is
>     displayed in the footer.
> 
> diff --git a/contrib/mdocml/mdoc_action.c b/contrib/mdocml/mdoc_action.c
> index f27ef13..ddd7cab 100644
> --- a/contrib/mdocml/mdoc_action.c
> +++ b/contrib/mdocml/mdoc_action.c
> @@ -611,6 +611,8 @@ post_os(POST_ARGS)
>  			mdoc_nmsg(m, n, MANDOCERR_MEM);
>  			return(0);
>  		}
> +		if (strncmp(utsname.sysname, "FreeBSD", sizeof("FreeBSD")) == 0)
> +			strtok(utsname.release, "-");
>  		if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
>  			mdoc_nmsg(m, n, MANDOCERR_MEM);
>  			return(0);
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv