From patchwork Thu Mar 13 22:54:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 78 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (caibbdcaaahb.dreamhost.com [208.113.200.71]) by wilcox.dreamhost.com (Postfix) with ESMTP id 3EC403600D9 for ; Thu, 13 Mar 2014 15:54:23 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id DEEF7C43275; Thu, 13 Mar 2014 15:54:22 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id B925BC2BE99 for ; Thu, 13 Mar 2014 15:54:22 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=JF55yzp2bKOVAucRzAGJFeHl55SEQ2T 6mzSN6zq4j1o/PZIDuRoSYv4lGIQQU+67UEgEYV33UL+I8fNFMKfLPmSLiHzGJoX z7rQU9oC1YA3TlWRqxOZXdzjJj1SXQV6eM9/2pk4/W5W/UiuOux3ea5tBOp9uMrg 3nKddjjmtNKo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=rzl5/1rJfCeUQICzBNv2FbkdrwI=; b=slUlZ GsyEkBgzyHFMy4GhSDHYer9bJS1uknNvtGYbYoJ8ZrYRC3gGMEm8zJljVDhZs7Cr J7omOOUjLKoCE81k7po2CC/vc44eZzyy3VeFsHWpmkwq/pZ1PIHaGXdIRQjI/YFO 4q/RRpTXHYai6iCbnRjYjB1NJtyeXfKBtuiSSQ= Received: (qmail 16418 invoked by alias); 13 Mar 2014 22:54:21 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 16408 invoked by uid 89); 13 Mar 2014 22:54:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH v3] sotruss: drop ksh support and add basic POSIX shell support Date: Thu, 13 Mar 2014 18:54:17 -0400 Message-Id: <1394751257-24563-1-git-send-email-vapier@gentoo.org> In-Reply-To: <1390644580-25234-1-git-send-email-vapier@gentoo.org> References: <1390644580-25234-1-git-send-email-vapier@gentoo.org> X-DH-Original-To: glibc@patchwork.siddhesh.in This script works fine under bash as-is, so we don't need ksh anymore. Once we tweak the function style, the code even works (for the most part) under a POSIX shell. The localized strings will be prepended with a $, but it is otherwise functional. Signed-off-by: Mike Frysinger 2014-01-23 Mike Frysinger * elf/Makefile: Delete $(have-ksh) check. ($(objpfx)sotruss): Change KSH to BASH. * elf/sotruss.ksh: Rename to ... * elf/sotruss.sh: ... this. Change @KSH@ to @BASH@. Change function style to match POSIX. Drop ksh vim mode setting. --- v3 - rewrite commit message to better reflect what's going on elf/Makefile | 6 +++--- elf/{sotruss.ksh => sotruss.sh} | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) rename elf/{sotruss.ksh => sotruss.sh} (97%) diff --git a/elf/Makefile b/elf/Makefile index 2db3c98..8abc60b 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -93,7 +93,7 @@ pldd-modules := xmalloc # To find xmalloc.c and xstrdup.c vpath %.c ../locale/programs -ifeq ($(have-ksh)$(build-shared),yesyes) +ifeq ($(build-shared),yes) extra-objs += sotruss-lib.os sotruss-lib.so install-others += $(inst_auditdir)/sotruss-lib.so install-bin-script += sotruss @@ -104,8 +104,8 @@ $(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ $(common-objpfx)libc_nonshared.a -$(objpfx)sotruss: sotruss.ksh $(common-objpfx)config.make - sed -e 's%@KSH@%$(KSH)%g' \ +$(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make + sed -e 's%@BASH@%$(BASH)%g' \ -e 's%@VERSION@%$(version)%g' \ -e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g' \ -e 's%@PREFIX@%$(prefix)%g' \ diff --git a/elf/sotruss.ksh b/elf/sotruss.sh similarity index 97% rename from elf/sotruss.ksh rename to elf/sotruss.sh index 371a70b..483513e 100755 --- a/elf/sotruss.ksh +++ b/elf/sotruss.sh @@ -1,4 +1,4 @@ -#! @KSH@ +#! @BASH@ # Copyright (C) 2011-2014 Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -28,7 +28,7 @@ unset SOTRUSS_NOINDENT SOTRUSS_WHICH=$$ lib='@PREFIX@/$LIB/audit/sotruss-lib.so' -function do_help { +do_help() { echo $"Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...] -F, --from FROMLIST Trace calls from objects on FROMLIST -T, --to TOLIST Trace calls to objects on TOLIST @@ -51,13 +51,13 @@ function do_help { exit 0 } -function do_missing_arg { +do_missing_arg() { printf >&2 $"%s: option requires an argument -- '%s'\n" sotruss "$1" printf >&2 $"Try \`%s --help' or \`%s --usage' for more information.\n" sotruss sotruss exit 1 } -function do_ambiguous { +do_ambiguous() { printf >&2 $"%s: option is ambiguous; possibilities:" while test $# -gt 0; do printf >&2 " '%s'" $1 @@ -150,6 +150,3 @@ export SOTRUSS_EXIT export LD_AUDIT="$lib" exec "$@" -# Local Variables: -# mode:ksh -# End: