From patchwork Thu Jun 14 11:27:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinhui Huang X-Patchwork-Id: 929373 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 4161ZQ1s2hz9s1B for ; Thu, 14 Jun 2018 21:27:58 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 654D91A97A3 for ; Thu, 14 Jun 2018 13:27:53 +0200 (CEST) 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 [217.194.8.3]) by picard.linux.it (Postfix) with ESMTP id 4496A1A962C for ; Thu, 14 Jun 2018 13:27:51 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-3.smtp.seeweb.it (Postfix) with ESMTP id C032A1A00E61 for ; Thu, 14 Jun 2018 13:27:49 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="41067023" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 14 Jun 2018 19:27:47 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 3D5F54D0EFFC; Thu, 14 Jun 2018 19:27:42 +0800 (CST) Received: from localhost.localdomain.localdomain (10.167.220.196) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.399.0; Thu, 14 Jun 2018 19:27:48 +0800 From: Jinhui huang To: Date: Thu, 14 Jun 2018 19:27:38 +0800 Message-ID: <1528975658-10511-1-git-send-email-huangjh.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1521184376-3649-1-git-send-email-huangjh.jy@cn.fujitsu.com> References: <1521184376-3649-1-git-send-email-huangjh.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.196] X-yoursite-MailScanner-ID: 3D5F54D0EFFC.A15AC 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=none 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 v2] 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" From: Jinhui Huang Signed-off-by: Jinhui Huang --- include/safe_macros_fn.h | 3 +++ include/tst_safe_macros.h | 3 +++ lib/safe_macros.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/include/safe_macros_fn.h b/include/safe_macros_fn.h index 3df9528..74b3ec1 100644 --- a/include/safe_macros_fn.h +++ b/include/safe_macros_fn.h @@ -42,6 +42,9 @@ char* safe_dirname(const char *file, const int lineno, char* safe_getcwd(const char *file, const int lineno, void (*cleanup_fn)(void), char *buf, size_t size); +struct group *safe_getgrnam(const char *file, const int lineno, + void (*cleanup_fn)(void), const char *name); + struct passwd* safe_getpwnam(const char *file, const int lineno, void (*cleanup_fn)(void), const char *name); diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h index 64cdbbf..a8c2393 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -69,6 +69,9 @@ static inline int safe_dup(const char *file, const int lineno, #define SAFE_GETCWD(buf, size) \ safe_getcwd(__FILE__, __LINE__, NULL, (buf), (size)) +#define SAFE_GETGRNAM(name) \ + safe_getgrnam(__FILE__, __LINE__, NULL, (name)) + #define SAFE_GETPWNAM(name) \ safe_getpwnam(__FILE__, __LINE__, NULL, (name)) diff --git a/lib/safe_macros.c b/lib/safe_macros.c index abdeca0..ea9e1f6 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" @@ -111,6 +112,20 @@ char *safe_getcwd(const char *file, const int lineno, void (*cleanup_fn) (void), 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; +} + struct passwd *safe_getpwnam(const char *file, const int lineno, void (*cleanup_fn) (void), const char *name) {