[{"id":3820,"web_url":"https://patchwork.libcamera.org/comment/3820/","msgid":"<20200220202424.GK4998@pendragon.ideasonboard.com>","date":"2020-02-20T20:24:24","subject":"Re: [libcamera-devel] [PATCH v3 1/6] libcamera: utils: Add an\n\tinternal dirname helper","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Thu, Feb 20, 2020 at 04:56:59PM +0000, Kieran Bingham wrote:\n> Provide a wrapped dirname call which returns a std::string.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> ---\n>  src/libcamera/include/utils.h |  1 +\n>  src/libcamera/utils.cpp       | 17 +++++++++++++++++\n>  2 files changed, 18 insertions(+)\n> \n> diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\n> index 080ea6614de0..940597760ee2 100644\n> --- a/src/libcamera/include/utils.h\n> +++ b/src/libcamera/include/utils.h\n> @@ -33,6 +33,7 @@ namespace utils {\n>  const char *basename(const char *path);\n>  \n>  char *secure_getenv(const char *name);\n> +std::string dirname(const std::string &path);\n>  \n>  template<class InputIt1, class InputIt2>\n>  unsigned int set_overlap(InputIt1 first1, InputIt1 last1,\n> diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\n> index 453e3b3b5995..3fd3aeaf822a 100644\n> --- a/src/libcamera/utils.cpp\n> +++ b/src/libcamera/utils.cpp\n> @@ -70,6 +70,23 @@ char *secure_getenv(const char *name)\n>  #endif\n>  }\n>  \n> +/**\n> + * \\brief identify the dirname portion of a path\n\ns/identify/Identify/\n\n> + * \\param[in] path The full path to parse\n> + *\n\nShould we add that this function conforms to the behaviour of the\ndirname() function defined by POSIX ?\n\n> + * \\returns A string of the directory component of the path\n\ns/returns/return/\n\n> + */\n> +std::string dirname(const std::string &path)\n> +{\n> +\tsize_t pos = path.rfind('/', path.length());\n> +\n> +\tif (pos != std::string::npos) {\n> +\t\treturn (path.substr(0, pos));\n> +\t}\n\nNo need for braces and parentheses around path.substr(0, pos).\n\n> +\n> +\treturn path;\n\nTo be compatible with the glibc implementation, you should return the\nstring \".\" if the path doesn't contain a '/'. Furthemore, if the whole\npath string is equal to \"/\", then you should return \"/\", while the above\nreturns an empty string. There's also the case of trailing '/' in the\npath that is not handled correctly.\n\nHow about the following (only compile-test) ?\n\n/**\n * \\brief Identify the dirname portion of a path\n * \\param[in] path The full path to parse\n *\n * This function conforms with the behaviour of the %dirname() function as\n * defined by POSIX.\n *\n * \\return A string of the directory component of the path\n */\nstd::string dirname(const std::string &path)\n{\n\tif (path.empty())\n\t\treturn \".\";\n\n        /*\n\t * Skip all trailing slashes. If the path is only made of slashes,\n\t * return \"/\".\n\t */\n\tsize_t pos = path.size();\n\twhile (pos > 0 && path[pos-1] == '/')\n\t\tpos--;\n\n        if (!pos)\n\t\treturn \"/\";\n\n\t/*\n\t * Find the previous slash. If the path contains no non-trailing slash,\n\t * return \".\".\n\t */\n\twhile (pos > 0 && path[pos-1] != '/')\n\t\tpos--;\n\n\tif (!pos)\n\t\treturn \".\";\n\n\t/*\n\t * Return the directory name until (but not including) the slash. If\n\t * this would result in an empty string, return \"/\".\n\t */\n\tif (pos == 1)\n\t\treturn \"/\";\n\n\treturn path.substr(0, pos - 1);\n}\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> +}\n> +\n>  /**\n>   * \\fn libcamera::utils::set_overlap(InputIt1 first1, InputIt1 last1,\n>   *\t\t\t\t     InputIt2 first2, InputIt2 last2)","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2420A60434\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 20 Feb 2020 21:24:44 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 84F96563;\n\tThu, 20 Feb 2020 21:24:43 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582230283;\n\tbh=Ah0wzOdheszCp6FrC7HmdfLKBTCmlXCoqkPEq2qB+fg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=gWSVaiCWgNztXXNdYZXjx9QsPk16FehlneoJSkALW426MZuEPYJ7vVdLHLnCKvkZ1\n\tf3incXY9ca4HI+pvt5rNAVwFfEjKBLrf6NFZqpMZ2FIEbKFAyK7z4ayvenSx/Vduhk\n\tegMgmkYBBPa9Jf0CTSr4Y9dr6jU4c8e9SDwEcIio=","Date":"Thu, 20 Feb 2020 22:24:24 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","Message-ID":"<20200220202424.GK4998@pendragon.ideasonboard.com>","References":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>\n\t<20200220165704.23600-2-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200220165704.23600-2-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 1/6] libcamera: utils: Add an\n\tinternal dirname helper","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Thu, 20 Feb 2020 20:24:44 -0000"}},{"id":3826,"web_url":"https://patchwork.libcamera.org/comment/3826/","msgid":"<5ed7abee-44db-d15a-b18f-7140bc413680@ideasonboard.com>","date":"2020-02-21T11:15:53","subject":"Re: [libcamera-devel] [PATCH v3 1/6] libcamera: utils: Add an\n\tinternal dirname helper","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 20/02/2020 20:24, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Thu, Feb 20, 2020 at 04:56:59PM +0000, Kieran Bingham wrote:\n>> Provide a wrapped dirname call which returns a std::string.\n>>\n>> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>> ---\n>>  src/libcamera/include/utils.h |  1 +\n>>  src/libcamera/utils.cpp       | 17 +++++++++++++++++\n>>  2 files changed, 18 insertions(+)\n>>\n>> diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\n>> index 080ea6614de0..940597760ee2 100644\n>> --- a/src/libcamera/include/utils.h\n>> +++ b/src/libcamera/include/utils.h\n>> @@ -33,6 +33,7 @@ namespace utils {\n>>  const char *basename(const char *path);\n>>  \n>>  char *secure_getenv(const char *name);\n>> +std::string dirname(const std::string &path);\n>>  \n>>  template<class InputIt1, class InputIt2>\n>>  unsigned int set_overlap(InputIt1 first1, InputIt1 last1,\n>> diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\n>> index 453e3b3b5995..3fd3aeaf822a 100644\n>> --- a/src/libcamera/utils.cpp\n>> +++ b/src/libcamera/utils.cpp\n>> @@ -70,6 +70,23 @@ char *secure_getenv(const char *name)\n>>  #endif\n>>  }\n>>  \n>> +/**\n>> + * \\brief identify the dirname portion of a path\n> \n> s/identify/Identify/\n> \n>> + * \\param[in] path The full path to parse\n>> + *\n> \n> Should we add that this function conforms to the behaviour of the\n> dirname() function defined by POSIX ?\n\n\nNo - because my version doesn't and didn't intend to :-)\n\n\n>> + * \\returns A string of the directory component of the path\n> \n> s/returns/return/\n> \n>> + */\n>> +std::string dirname(const std::string &path)\n>> +{\n>> +\tsize_t pos = path.rfind('/', path.length());\n>> +\n>> +\tif (pos != std::string::npos) {\n>> +\t\treturn (path.substr(0, pos));\n>> +\t}\n> \n> No need for braces and parentheses around path.substr(0, pos).\n> \n>> +\n>> +\treturn path;\n> \n> To be compatible with the glibc implementation, you should return the\n> string \".\" if the path doesn't contain a '/'. Furthemore, if the whole\n> path string is equal to \"/\", then you should return \"/\", while the above\n> returns an empty string. There's also the case of trailing '/' in the\n> path that is not handled correctly.\n> \n> How about the following (only compile-test) ?\n\nWould you like to submit this as your own patch ?\nOr for me to take it verbatim ...\n\n\n> /**\n>  * \\brief Identify the dirname portion of a path\n>  * \\param[in] path The full path to parse\n>  *\n>  * This function conforms with the behaviour of the %dirname() function as\n>  * defined by POSIX.\n>  *\n>  * \\return A string of the directory component of the path\n>  */\n> std::string dirname(const std::string &path)\n> {\n> \tif (path.empty())\n> \t\treturn \".\";\n> \n>         /*\n> \t * Skip all trailing slashes. If the path is only made of slashes,\n> \t * return \"/\".\n> \t */\n> \tsize_t pos = path.size();\n> \twhile (pos > 0 && path[pos-1] == '/')\n> \t\tpos--;\n> \n>         if (!pos)\n> \t\treturn \"/\";\n> \n> \t/*\n> \t * Find the previous slash. If the path contains no non-trailing slash,\n> \t * return \".\".\n> \t */\n> \twhile (pos > 0 && path[pos-1] != '/')\n> \t\tpos--;\n> \n> \tif (!pos)\n> \t\treturn \".\";\n> \n> \t/*\n> \t * Return the directory name until (but not including) the slash. If\n> \t * this would result in an empty string, return \"/\".\n> \t */\n> \tif (pos == 1)\n> \t\treturn \"/\";\n> \n> \treturn path.substr(0, pos - 1);\n> }\n> \n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nThat may be a bit redundant if it's on /your/ code. ...\n\n--\nKieran\n\n\n\n> \n>> +}\n>> +\n>>  /**\n>>   * \\fn libcamera::utils::set_overlap(InputIt1 first1, InputIt1 last1,\n>>   *\t\t\t\t     InputIt2 first2, InputIt2 last2)\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 96EE060438\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 21 Feb 2020 12:15:56 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 16084563;\n\tFri, 21 Feb 2020 12:15:55 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582283756;\n\tbh=Sxz+YACbKi1Y6oR3CQXRpE6IySwPoghjRiVsjELzI0g=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=B4Rj+wz8pcD5iomqAyeS2swslSOG7do70xnYW2welGFePWY4gc+4BZY+9m4yAho+H\n\tYyg792pKrDHXEzwe2Z2nNECjCcjVKTYoo3qdZls1sZYukTCWBgkpRO4l4MB4w3G4D2\n\tq4U0pzfEjyLgO71d9ksag6a354dwvX2dlW/hkIh0=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","References":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>\n\t<20200220165704.23600-2-kieran.bingham@ideasonboard.com>\n\t<20200220202424.GK4998@pendragon.ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<5ed7abee-44db-d15a-b18f-7140bc413680@ideasonboard.com>","Date":"Fri, 21 Feb 2020 11:15:53 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200220202424.GK4998@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v3 1/6] libcamera: utils: Add an\n\tinternal dirname helper","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Fri, 21 Feb 2020 11:15:56 -0000"}},{"id":3830,"web_url":"https://patchwork.libcamera.org/comment/3830/","msgid":"<20200221125838.GA4955@pendragon.ideasonboard.com>","date":"2020-02-21T12:58:38","subject":"Re: [libcamera-devel] [PATCH v3 1/6] libcamera: utils: Add an\n\tinternal dirname helper","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Fri, Feb 21, 2020 at 11:15:53AM +0000, Kieran Bingham wrote:\n> On 20/02/2020 20:24, Laurent Pinchart wrote:\n> > On Thu, Feb 20, 2020 at 04:56:59PM +0000, Kieran Bingham wrote:\n> >> Provide a wrapped dirname call which returns a std::string.\n> >>\n> >> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> >> ---\n> >>  src/libcamera/include/utils.h |  1 +\n> >>  src/libcamera/utils.cpp       | 17 +++++++++++++++++\n> >>  2 files changed, 18 insertions(+)\n> >>\n> >> diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\n> >> index 080ea6614de0..940597760ee2 100644\n> >> --- a/src/libcamera/include/utils.h\n> >> +++ b/src/libcamera/include/utils.h\n> >> @@ -33,6 +33,7 @@ namespace utils {\n> >>  const char *basename(const char *path);\n> >>  \n> >>  char *secure_getenv(const char *name);\n> >> +std::string dirname(const std::string &path);\n> >>  \n> >>  template<class InputIt1, class InputIt2>\n> >>  unsigned int set_overlap(InputIt1 first1, InputIt1 last1,\n> >> diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\n> >> index 453e3b3b5995..3fd3aeaf822a 100644\n> >> --- a/src/libcamera/utils.cpp\n> >> +++ b/src/libcamera/utils.cpp\n> >> @@ -70,6 +70,23 @@ char *secure_getenv(const char *name)\n> >>  #endif\n> >>  }\n> >>  \n> >> +/**\n> >> + * \\brief identify the dirname portion of a path\n> > \n> > s/identify/Identify/\n> > \n> >> + * \\param[in] path The full path to parse\n> >> + *\n> > \n> > Should we add that this function conforms to the behaviour of the\n> > dirname() function defined by POSIX ?\n> \n> No - because my version doesn't and didn't intend to :-)\n> \n> >> + * \\returns A string of the directory component of the path\n> > \n> > s/returns/return/\n> > \n> >> + */\n> >> +std::string dirname(const std::string &path)\n> >> +{\n> >> +\tsize_t pos = path.rfind('/', path.length());\n> >> +\n> >> +\tif (pos != std::string::npos) {\n> >> +\t\treturn (path.substr(0, pos));\n> >> +\t}\n> > \n> > No need for braces and parentheses around path.substr(0, pos).\n> > \n> >> +\n> >> +\treturn path;\n> > \n> > To be compatible with the glibc implementation, you should return the\n> > string \".\" if the path doesn't contain a '/'. Furthemore, if the whole\n> > path string is equal to \"/\", then you should return \"/\", while the above\n> > returns an empty string. There's also the case of trailing '/' in the\n> > path that is not handled correctly.\n> > \n> > How about the following (only compile-test) ?\n> \n> Would you like to submit this as your own patch ?\n> Or for me to take it verbatim ...\n\nFeel free to take it, I have no issue with that. It just caught my eyes\nthat the implementation wasn't compliant with POSIX dirname(), and I\nthought it could lead to confusion.\n\n> > /**\n> >  * \\brief Identify the dirname portion of a path\n> >  * \\param[in] path The full path to parse\n> >  *\n> >  * This function conforms with the behaviour of the %dirname() function as\n> >  * defined by POSIX.\n> >  *\n> >  * \\return A string of the directory component of the path\n> >  */\n> > std::string dirname(const std::string &path)\n> > {\n> > \tif (path.empty())\n> > \t\treturn \".\";\n> > \n> >         /*\n> > \t * Skip all trailing slashes. If the path is only made of slashes,\n> > \t * return \"/\".\n> > \t */\n> > \tsize_t pos = path.size();\n> > \twhile (pos > 0 && path[pos-1] == '/')\n> > \t\tpos--;\n> > \n> >         if (!pos)\n> > \t\treturn \"/\";\n> > \n> > \t/*\n> > \t * Find the previous slash. If the path contains no non-trailing slash,\n> > \t * return \".\".\n> > \t */\n> > \twhile (pos > 0 && path[pos-1] != '/')\n> > \t\tpos--;\n> > \n> > \tif (!pos)\n> > \t\treturn \".\";\n> > \n> > \t/*\n> > \t * Return the directory name until (but not including) the slash. If\n> > \t * this would result in an empty string, return \"/\".\n> > \t */\n> > \tif (pos == 1)\n> > \t\treturn \"/\";\n> > \n> > \treturn path.substr(0, pos - 1);\n> > }\n> > \n> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n> That may be a bit redundant if it's on /your/ code. ...\n\nOnly the implementation is mine :-)\n\n> >> +}\n> >> +\n> >>  /**\n> >>   * \\fn libcamera::utils::set_overlap(InputIt1 first1, InputIt1 last1,\n> >>   *\t\t\t\t     InputIt2 first2, InputIt2 last2)","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1C4C360438\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 21 Feb 2020 13:58:59 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 91258563;\n\tFri, 21 Feb 2020 13:58:58 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582289938;\n\tbh=tJKgmEpabPSXJI/istrcthgzWYUW33f9TuQjvJL5DHU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=TqyIjwuhhoKuIJKgTu9S7tm0Atkgw+wJ06ls0tmljD9jWkmnOCLXJp2j74axYGyrF\n\tPLZJ1X5zH+6/z8pDCTMjloe95snIL+f1oyj7YCIWyYFu9awt13Em+g7usVlJyRR9rx\n\tEaWBShTncXyoJzTqgLa/2fntv1WGOTM6/dIPsMvc=","Date":"Fri, 21 Feb 2020 14:58:38 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","Message-ID":"<20200221125838.GA4955@pendragon.ideasonboard.com>","References":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>\n\t<20200220165704.23600-2-kieran.bingham@ideasonboard.com>\n\t<20200220202424.GK4998@pendragon.ideasonboard.com>\n\t<5ed7abee-44db-d15a-b18f-7140bc413680@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<5ed7abee-44db-d15a-b18f-7140bc413680@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 1/6] libcamera: utils: Add an\n\tinternal dirname helper","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Fri, 21 Feb 2020 12:58:59 -0000"}}]