From patchwork Wed Apr 3 04:10:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 882 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 60EC9610B3 for ; Wed, 3 Apr 2019 06:11:10 +0200 (CEST) Received: from Q.imgcgcw.net (unknown [147.50.13.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7DA422F9; Wed, 3 Apr 2019 06:11:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1554264670; bh=8ETF0U87KhfO2nWUkad9p0Pyw1zgWHjqIlSes2E3gt8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W907S25yL4+wxXzKblVoWoNK/a4cp0ZpkeUVk+D/kXNajI0UPXb6B8RXQ3IBm+dSL nX1NMzLF9k0qBwiMscNieD/dEbovVn5vZfjlkNmSku2jyKGF9jARRlWfATtrNtDMcG QA8Tdmu6fLnZsROjyD+8gbLpPxONRDKMYhXxmqys= From: Kieran Bingham To: LibCamera Devel Date: Wed, 3 Apr 2019 11:10:55 +0700 Message-Id: <20190403041058.20921-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> References: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/4] meson: Re-order the optional components X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 04:11:10 -0000 Re-order the optional components to make them alphabetical, and fix up the indentation to use two spaces as required by meson. A comment is added to highlight that these optional components are enabled by default. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 43d4a57602bb..6e68c3e36772 100644 --- a/meson.build +++ b/meson.build @@ -29,12 +29,15 @@ subdir('include') subdir('src') subdir('utils') -if get_option('tests') - subdir('test') -endif +# The documentation and test components are optional and can be disabled +# through configuration values. They are enabled by default. if get_option('documentation') - subdir('Documentation') + subdir('Documentation') +endif + +if get_option('tests') + subdir('test') endif pkg_mod = import('pkgconfig') From patchwork Wed Apr 3 04:10:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 883 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CAD4D610B3 for ; Wed, 3 Apr 2019 06:11:12 +0200 (CEST) Received: from Q.imgcgcw.net (unknown [147.50.13.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 08F5A2F9; Wed, 3 Apr 2019 06:11:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1554264672; bh=G3fHUw1Zr3apqpHgbTVqWIe4eK1/uZmT++e/FKAwLRA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MF8k0vZwyPmuKCM+nXA2VL5mn79/QsCJezOf/BwDJdI0SNjo5Bn3nKTh0nOmkJ+ID MkRLdqvEAdeR2DEOvkRTeKLmUJzlt0a6UrCGZ4apKGNEA+dMvxVF0q8iToIeORdNEp WHNy+/mnPO22mM1CJAaJr2O/R20CadDyPS9CHsRw= From: Kieran Bingham To: LibCamera Devel Date: Wed, 3 Apr 2019 11:10:56 +0700 Message-Id: <20190403041058.20921-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> References: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/4] meson: options: Document the options X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 04:11:13 -0000 Re-order the project options and add documentation which will be presented by 'meson configure'. This produces the following extra information: Project options: Option Current Value Possible Values Description ------ ------------- --------------- ----------- documentation true [true, false] Generate the project documentation tests true [true, false] Compile and include the tests Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- meson_options.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index c5df661a2286..97efc85b4412 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,7 @@ -option('tests', type : 'boolean') -option('documentation', type : 'boolean') +option('documentation', + type : 'boolean', + description : 'Generate the project documentation') + +option('tests', + type : 'boolean', + description: 'Compile and include the tests') From patchwork Wed Apr 3 04:10:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 884 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4C956610C5 for ; Wed, 3 Apr 2019 06:11:15 +0200 (CEST) Received: from Q.imgcgcw.net (unknown [147.50.13.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7C74B2F9; Wed, 3 Apr 2019 06:11:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1554264675; bh=u/r0C3H0odrcIWVJYaG8nR+ghaq4nqbGcIRVHSg4psU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J0UGi7LOwLsKXuyJ0nXuTSqyibvOKjclbiu02K+S6wtiz5mCehV7GTn899bebK+78 AaQ3W44nUMcaVrq9ONjamM5M8j02x4Wn0sD41MJ0iJNo+95/rq38bqPt5Bj1/+iRpC 78ULeUMUpvXtSuEFxyRtG7g8uv7gjdTgL1RyI+fk= From: Kieran Bingham To: LibCamera Devel Date: Wed, 3 Apr 2019 11:10:57 +0700 Message-Id: <20190403041058.20921-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> References: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/4] libcamera: utils: Use internal basename implementation. X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 04:11:15 -0000 Differing implementations of basename() exist, some of which may modify the content of the string passed as an argument. The implementation of basename() is trivial, thus to support different C librariese, provide our own version which accepts and returns a const char *. Update the call sites to use the new implementation. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/libcamera/include/utils.h | 2 ++ src/libcamera/log.cpp | 2 +- src/libcamera/meson.build | 1 + src/libcamera/utils.cpp | 51 +++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/libcamera/utils.cpp diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h index 73fa2e69b029..1b2a62c0fda7 100644 --- a/src/libcamera/include/utils.h +++ b/src/libcamera/include/utils.h @@ -15,6 +15,8 @@ namespace libcamera { namespace utils { +const char *basename(const char *path); + /* C++11 doesn't provide std::make_unique */ template std::unique_ptr make_unique(Args&&... args) diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index 26ebf410a7a9..eb444c31857d 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -438,7 +438,7 @@ void LogMessage::init(const char *fileName, unsigned int line) msgStream_ << " " << log_severity_name(severity_); msgStream_ << " " << category_.name(); - msgStream_ << " " << basename(fileName) << ":" << line << " "; + msgStream_ << " " << utils::basename(fileName) << ":" << line << " "; } LogMessage::~LogMessage() diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 8384cd0af451..863cb60d4b90 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -16,6 +16,7 @@ libcamera_sources = files([ 'signal.cpp', 'stream.cpp', 'timer.cpp', + 'utils.cpp', 'v4l2_device.cpp', 'v4l2_subdevice.cpp', ]) diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp new file mode 100644 index 000000000000..fae28cee556a --- /dev/null +++ b/src/libcamera/utils.cpp @@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * utils.cpp - Miscellaneous utility functions + */ + +#include +#include + +#include "utils.h" + +/** + * \file utils.h + * \brief Miscellaneous utility functions + */ + +namespace libcamera { + +namespace utils { + +/** + * \def ARRAY_SIZE(array) + * \brief Determine the number of elements in the static array. + */ + +/** + * \brief Strip the directory prefix from the path + * \param[in] path The path to process + * + * basename is implemented differently across different C libraries. This + * implementation matches the one provided by the GNU libc, and does not + * modify its input parameter. + * + * \return A pointer within the given path without any leading directory + * components. + */ +const char *basename(const char *path) +{ + const char *base = strrchr(path, '/'); + return base ? base + 1 : path; +} + +/** + * \fn libcamera::utils::make_unique(Args &&... args) + * \brief Constructs an object of type T and wraps it in a std::unique_ptr. + */ + +} /* namespace utils */ + +} /* namespace libcamera */ From patchwork Wed Apr 3 04:10:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 885 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C609B610BF for ; Wed, 3 Apr 2019 06:11:17 +0200 (CEST) Received: from Q.imgcgcw.net (unknown [147.50.13.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 00F822F9; Wed, 3 Apr 2019 06:11:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1554264677; bh=+rnmzBA+pt89KB6IdNF1/OXYQQcy4jXoIQSW3hqa31Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bGxf1yzMM/Cu87fV/oRyPHX1EgZuXibc7h7klN4rU5LRmdKiO5nZfyNYlCPapHap4 bHqvLbAYZzvNs8Ry2KewbwE4cdKgApWByRlUM4febUAl/WRBoebx5ddgst7XxaCZJj kw1+G4o8mMHxNqFpS0Upxkw17arZbhM+hrWRG5mU= From: Kieran Bingham To: LibCamera Devel Date: Wed, 3 Apr 2019 11:10:58 +0700 Message-Id: <20190403041058.20921-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> References: <20190403041058.20921-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 4/4] libcamera: utils: Use internal secure_getenv() implementation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 04:11:18 -0000 The secure_getenv() call is not provided by all C libraries. Support this feature by implementing our own version. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/libcamera/include/utils.h | 2 ++ src/libcamera/log.cpp | 4 ++-- src/libcamera/utils.cpp | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h index 1b2a62c0fda7..79038a96feab 100644 --- a/src/libcamera/include/utils.h +++ b/src/libcamera/include/utils.h @@ -24,6 +24,8 @@ std::unique_ptr make_unique(Args&&... args) return std::unique_ptr(new T(std::forward(args)...)); } +char *secure_getenv(const char *name); + } /* namespace utils */ } /* namespace libcamera */ diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index eb444c31857d..71cfbc422ba0 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -122,7 +122,7 @@ Logger::Logger() */ void Logger::parseLogFile() { - const char *file = secure_getenv("LIBCAMERA_LOG_FILE"); + const char *file = utils::secure_getenv("LIBCAMERA_LOG_FILE"); if (!file) return; @@ -140,7 +140,7 @@ void Logger::parseLogFile() */ void Logger::parseLogLevels() { - const char *debug = secure_getenv("LIBCAMERA_LOG_LEVELS"); + const char *debug = utils::secure_getenv("LIBCAMERA_LOG_LEVELS"); if (!debug) return; diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp index fae28cee556a..cd0fd7614cc7 100644 --- a/src/libcamera/utils.cpp +++ b/src/libcamera/utils.cpp @@ -41,6 +41,28 @@ const char *basename(const char *path) return base ? base + 1 : path; } +/** + * \brief Get an environment variable + * \param[in] name The name of the variable to return + * + * The environment list is searched to find the variable 'name', and the + * corresponding string is returned. + * + * If 'secure execution' is required then this function always returns NULL to + * avoid vulnerabilities that could occur if set-user-ID or set-group-ID + * programs accidentally trust the environment. + * + * \returns A pointer to the value in the environment or NULL if the requested + * environment variable doesn't exist or if secure execution is required. + */ +char *secure_getenv(const char *name) +{ + if (getauxval(AT_SECURE)) + return NULL; + + return getenv(name); +} + /** * \fn libcamera::utils::make_unique(Args &&... args) * \brief Constructs an object of type T and wraps it in a std::unique_ptr.