svn commit: r364124 - head/cddl/contrib/opensolaris/lib/libdtrace/common

Jessica Clarke jrtc27 at freebsd.org
Tue Aug 11 16:59:53 UTC 2020


On 11 Aug 2020, at 17:46, Alex Richardson <arichardson at FreeBSD.org> wrote:
> 
> Author: arichardson
> Date: Tue Aug 11 16:46:54 2020
> New Revision: 364124
> URL: https://svnweb.freebsd.org/changeset/base/364124
> 
> Log:
>  Fix libdtrace build with zsh as /bin/sh
> 
>  When zsh runs in POSIX sh mode it does not support the -e flag to echo.
>  Use printf instead of echo to avoid the "-e" characters being printed.
> 
>  Obtained from:	CheriBSD
>  Reviewed By:	markj
>  Differential Revision: https://reviews.freebsd.org/D26026
> 
> Modified:
>  head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
>  head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh
>  head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh
>  head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh
> 
> Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh
> ==============================================================================
> --- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh	Tue Aug 11 16:46:48 2020	(r364123)
> +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh	Tue Aug 11 16:46:54 2020	(r364124)
> @@ -24,16 +24,15 @@
> # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
> # Use is subject to license terms.
> #
> -#ident	"%Z%%M%	%I%	%E% SMI"
> set -e
> 
> -echo "\
> -/*\n\
> - * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.\n\
> - * Use is subject to license terms.\n\
> - */\n\
> -\n\
> -#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n"
> +printf "%s" "
> +/*
> + * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
> + * Use is subject to license terms.
> + */
> +
> +"

Surely these would be much better as a heredoc?

cat <<EOF
/*
 * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 * Use is subject to license terms.
 */

EOF

Jess



More information about the svn-src-all mailing list