From patchwork Fri Mar 16 07:12:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinhui Huang X-Patchwork-Id: 886628 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 402cBL1bdjz9sMM for ; Fri, 16 Mar 2018 18:13:27 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 56B293E6D4E for ; Fri, 16 Mar 2018 08:13:21 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [IPv6:2001:4b78:1:20::3]) by picard.linux.it (Postfix) with ESMTP id 921063E6AA1 for ; Fri, 16 Mar 2018 08:13:18 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-3.smtp.seeweb.it (Postfix) with ESMTP id 0183F1A00F90 for ; Fri, 16 Mar 2018 08:13:14 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="37874289" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 Mar 2018 15:13:06 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 46AED486A796 for ; Fri, 16 Mar 2018 15:13:05 +0800 (CST) Received: from localhost.localdomain (10.167.220.196) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 16 Mar 2018 15:13:04 +0800 From: Jinhui Huang To: Date: Fri, 16 Mar 2018 15:12:55 +0800 Message-ID: <1521184376-3649-1-git-send-email-huangjh.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.220.196] X-yoursite-MailScanner-ID: 46AED486A796.AEDD5 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: huangjh.jy@cn.fujitsu.com X-Spam-Status: No, score=-0.0 required=7.0 tests=T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH 1/2] SAFE_MACROS: Add SAFE_GETGRNAM() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Jinhui Huang --- include/old/safe_macros.h | 3 +++ include/safe_macros_fn.h | 3 +++ include/tst_safe_macros.h | 9 +++------ lib/safe_macros.c | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/include/old/safe_macros.h b/include/old/safe_macros.h index e778d30..0718060 100644 --- a/include/old/safe_macros.h +++ b/include/old/safe_macros.h @@ -44,6 +44,9 @@ #define SAFE_GETPWNAM(cleanup_fn, name) \ safe_getpwnam(__FILE__, __LINE__, cleanup_fn, (name)) +#define SAFE_GETGRNAM(cleanup_fn, name) \ + safe_getgrnam(__FILE__, __LINE__, cleanup_fn, (name)) + #define SAFE_GETRUSAGE(cleanup_fn, who, usage) \ safe_getrusage(__FILE__, __LINE__, (cleanup_fn), (who), (usage)) diff --git a/include/safe_macros_fn.h b/include/safe_macros_fn.h index 3df9528..2d3ddae 100644 --- a/include/safe_macros_fn.h +++ b/include/safe_macros_fn.h @@ -45,6 +45,9 @@ char* safe_getcwd(const char *file, const int lineno, struct passwd* safe_getpwnam(const char *file, const int lineno, void (*cleanup_fn)(void), const char *name); +struct group *safe_getgrnam(const char *file, const int lineno, + void (*cleanup_fn)(void), const char *name); + int safe_getrusage(const char *file, const int lineno, void (*cleanup_fn)(void), int who, struct rusage *usage); diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h index f115a7b..56ff4c3 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -72,6 +72,9 @@ static inline int safe_dup(const char *file, const int lineno, #define SAFE_GETPWNAM(name) \ safe_getpwnam(__FILE__, __LINE__, NULL, (name)) +#define SAFE_GETGRNAM(name) \ + safe_getgrnam(__FILE__, __LINE__, NULL, (name)) + #define SAFE_GETRUSAGE(who, usage) \ safe_getrusage(__FILE__, __LINE__, NULL, (who), (usage)) @@ -397,12 +400,6 @@ static inline sighandler_t safe_signal(const char *file, const int lineno, #define SAFE_SIGNAL(signum, handler) \ safe_signal(__FILE__, __LINE__, (signum), (handler)) -int safe_sigaction(const char *file, const int lineno, - int signum, const struct sigaction *act, - struct sigaction *oldact); -#define SAFE_SIGACTION(signum, act, oldact) \ - safe_sigaction(__FILE__, __LINE__, (signum), (act), (oldact)) - #define SAFE_EXECLP(file, arg, ...) do { \ execlp((file), (arg), ##__VA_ARGS__); \ tst_brk_(__FILE__, __LINE__, TBROK | TERRNO, \ diff --git a/lib/safe_macros.c b/lib/safe_macros.c index abdeca0..061819e 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "test.h" #include "safe_macros.h" @@ -126,6 +127,20 @@ struct passwd *safe_getpwnam(const char *file, const int lineno, return rval; } +struct group *safe_getgrnam(const char *file, const int lineno, + void (*cleanup_fn) (void), const char *name) +{ + struct group *rval; + + rval = getgrnam(name); + if (rval == NULL) { + tst_brkm(TBROK | TERRNO, cleanup_fn, + "%s:%d: getgrnam(%s) failed", file, lineno, name); + } + + return rval; +} + int safe_getrusage(const char *file, const int lineno, void (*cleanup_fn) (void), int who, struct rusage *usage)