From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SiXmk-00019j-OD for garchives@archives.gentoo.org; Sat, 23 Jun 2012 21:22:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D152421C0F0; Sat, 23 Jun 2012 21:21:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9163721C0EE for ; Sat, 23 Jun 2012 21:21:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3075B1B4031 for ; Sat, 23 Jun 2012 21:21:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E7D34E5438 for ; Sat, 23 Jun 2012 21:21:51 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1340485956.a7f12a1d89aa3d7810996330b79acc577f3a558e.vapier@gentoo> Subject: [gentoo-commits] proj/sandbox:master commit in: src/, libsbutil/, etc/, tests/ X-VCS-Repository: proj/sandbox X-VCS-Files: etc/sandbox.conf libsbutil/sbutil.h src/environ.c src/sandbox.c tests/local.at X-VCS-Directories: src/ libsbutil/ etc/ tests/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: a7f12a1d89aa3d7810996330b79acc577f3a558e X-VCS-Branch: master Date: Sat, 23 Jun 2012 21:21:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 12a5676f-787e-4cd2-940b-6f5d29e7b28c X-Archives-Hash: 3bcb494ace88725098aad5725616d204 commit: a7f12a1d89aa3d7810996330b79acc577f3a558e Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 18 03:47:04 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Jun 23 21:12:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sandbox.git;a= =3Dcommit;h=3Da7f12a1d sandbox: drop beep support Almost no one has beep support turned on anymore, and ebeep in the main tree has been deprecated (meaning it wasn't found useful while building packages). So punt support for it from sandbox too. Signed-off-by: Mike Frysinger gentoo.org> --- etc/sandbox.conf | 6 ------ libsbutil/sbutil.h | 3 --- src/environ.c | 1 - src/sandbox.c | 15 +-------------- tests/local.at | 1 - 5 files changed, 1 insertions(+), 25 deletions(-) diff --git a/etc/sandbox.conf b/etc/sandbox.conf index 6ad1c15..dc460f0 100644 --- a/etc/sandbox.conf +++ b/etc/sandbox.conf @@ -22,12 +22,6 @@ # operations caught by sandbox. Default is "no" #SANDBOX_DEBUG=3D"no" =20 -# SANDBOX_BEEP -# -# The amount of beeps sandbox will issue when it exits with access viol= ations -# after printing the normal log. Default is "3" -#SANDBOX_BEEP=3D3 - # NOCOLOR # # Determine the use of color in the output. Default is "false" (ie, us= e color) diff --git a/libsbutil/sbutil.h b/libsbutil/sbutil.h index bdff33f..ad9ce25 100644 --- a/libsbutil/sbutil.h +++ b/libsbutil/sbutil.h @@ -57,7 +57,6 @@ extern const char env_sandbox_testing[]; #define ENV_SANDBOX_PREDICT "SANDBOX_PREDICT" =20 #define ENV_SANDBOX_ON "SANDBOX_ON" -#define ENV_SANDBOX_BEEP "SANDBOX_BEEP" =20 #define ENV_SANDBOX_PID "SANDBOX_PID" #define ENV_SANDBOX_ABORT "SANDBOX_ABORT" @@ -66,8 +65,6 @@ extern const char env_sandbox_testing[]; #define ENV_SANDBOX_ACTIVE "SANDBOX_ACTIVE" #define SANDBOX_ACTIVE "armedandready" =20 -#define DEFAULT_BEEP_COUNT 3 - #define SB_BUF_LEN 2048 =20 #define COLOR_NORMAL "\033[0m" diff --git a/src/environ.c b/src/environ.c index 8f4968f..45bf9a6 100644 --- a/src/environ.c +++ b/src/environ.c @@ -188,7 +188,6 @@ static int setup_cfg_vars(struct sandbox_info_t *sand= box_info) { setup_cfg_var(ENV_SANDBOX_VERBOSE); setup_cfg_var(ENV_SANDBOX_DEBUG); - setup_cfg_var(ENV_SANDBOX_BEEP); setup_cfg_var(ENV_NOCOLOR); =20 if (-1 =3D=3D setup_access_var(ENV_SANDBOX_DENY)) diff --git a/src/sandbox.c b/src/sandbox.c index a8e28fe..0fda106 100644 --- a/src/sandbox.c +++ b/src/sandbox.c @@ -85,8 +85,7 @@ static int setup_sandbox(struct sandbox_info_t *sandbox= _info, bool interactive) =20 static void print_sandbox_log(char *sandbox_log) { - int sandbox_log_file, beep_count; - char *beep_count_env; + int sandbox_log_file; size_t len; char buffer[1024]; =20 @@ -114,18 +113,6 @@ static void print_sandbox_log(char *sandbox_log) sb_close(sandbox_log_file); =20 SB_EERROR("------------------------------------------------------------= --------------------", "\n"); - - beep_count_env =3D getenv(ENV_SANDBOX_BEEP); - if (beep_count_env) - beep_count =3D atoi(beep_count_env); - else - beep_count =3D DEFAULT_BEEP_COUNT; - - while (beep_count--) { - fputc('\a', stderr); - if (beep_count) - sleep(1); - } } =20 static void stop(int signum) diff --git a/tests/local.at b/tests/local.at index da44b76..f937ff1 100644 --- a/tests/local.at +++ b/tests/local.at @@ -5,7 +5,6 @@ dnl any of the tempdirs. Same goes for predict access, b= ut this is dnl due to the default PM test env having that predict. m4_defun([SB_RUN],[\ env \ - SANDBOX_BEEP=3D0 \ SANDBOX_LOG=3D"$PWD/sandbox.log" \ sandbox.sh \ addpredict / \; \