From patchwork Tue Feb 28 00:13:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 657593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9753FC7EE30 for ; Tue, 28 Feb 2023 00:13:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbjB1ANg (ORCPT ); Mon, 27 Feb 2023 19:13:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229980AbjB1ANe (ORCPT ); Mon, 27 Feb 2023 19:13:34 -0500 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27C061CAE7 for ; Mon, 27 Feb 2023 16:13:21 -0800 (PST) Received: by mail-il1-x12e.google.com with SMTP id a1so5347052iln.9 for ; Mon, 27 Feb 2023 16:13:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squareup.com; s=google; t=1677543200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pt2fWRdPN0ZuyGfxsoVcI3lBcYiweKmUxx5Yje4ngSM=; b=REQIu7cX5i2DQFNgZOa6PzDRtxjpYX20q+9PsVigX7v1HKymTA1mLDxed7qrI5c9tq qGxnUT59iG2NJrEVAuoMHsufiDJD4vJrqPVeXLfkFEvHsRzH4mvh823rqGqo1fIYrk1+ 2NStLuYMtSjN5b5AkjqyG59/8zA/BbgxaebaU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677543200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pt2fWRdPN0ZuyGfxsoVcI3lBcYiweKmUxx5Yje4ngSM=; b=AleIKdZDzqCq3aPzazdALPjmPxBvX2PXBUn06qWG+dQZFweE0Id3lSWyYnZXhZ+YkH n+D9XadEkS1fb0WVtyw0UdcVV5LUKbD5Ap29yuEaDJjRiSveIy+mGL0jSvY3CRjAGQS2 dQ1/BFWwvvUieY6X8OezLhU9HmG33PNE4FRc+Gns+ZKbTmJseDtliQ7zfVLWO7Vb02MJ ox5LDmpD+X/ToL8iI4TJNBz+z5UUv0i9rSDVk7Rs65PXIYrDChHu0KdTMZ6DM3jiFQtL 5rMExTtEuWleWfa/RJu0CXzWbf/rE/s/LWjsyjH7xJa51+ABFVTaNsPiAqP28t6aduh6 6pog== X-Gm-Message-State: AO0yUKXmq1+5pzCs8Nkgbv6Lf61BeBIb7pqpyOD2N/5crQlZsFHQqhnZ hIVphkOHytBty8fd5hnnYv9y1SMXRov2j0E7IoU= X-Google-Smtp-Source: AK7set+dIvZu7fC4URp/y6nJcxLZAmbc1OLS7u3dSYlB9vWc10q/On21AiY6zEgHuDANTxSdgIC7Jg== X-Received: by 2002:a05:6e02:1a85:b0:315:21d1:760b with SMTP id k5-20020a056e021a8500b0031521d1760bmr1277580ilv.1.1677543200115; Mon, 27 Feb 2023 16:13:20 -0800 (PST) Received: from localhost (137-025-033-021.res.spectrum.com. [137.25.33.21]) by smtp.gmail.com with ESMTPSA id l7-20020a02a887000000b003c5178055fdsm2569805jam.62.2023.02.27.16.13.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Feb 2023 16:13:19 -0800 (PST) From: Benjamin Li To: linux-gpio@vger.kernel.org, Bartosz Golaszewski Cc: Benjamin Li Subject: [libgpiod,v3 1/2] tools: remove dependency on glibc program_invocation_[short_]name Date: Mon, 27 Feb 2023 16:13:06 -0800 Message-Id: <20230228001307.249811-2-benl@squareup.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230228001307.249811-1-benl@squareup.com> References: <20230228001307.249811-1-benl@squareup.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Platforms like Bionic libc don't have program_invocation_[short_]name, which is a GNU extension. It does have getprogname(), a BSD extension, but rather than supporting multiple extensions let's just introduce our own local helpers. We derive the short name ourselves rather than calling basename(), as the POSIX version takes char *, not const char *, and is thus not guaranteed to avoid modifying its input. (The GNU version does take const char * but we are avoiding extensions here.) Signed-off-by: Benjamin Li --- tools/gpiodetect.c | 5 +++-- tools/gpioget.c | 5 +++-- tools/gpioinfo.c | 5 +++-- tools/gpiomon.c | 5 +++-- tools/gpionotify.c | 5 +++-- tools/gpioset.c | 5 +++-- tools/tools-common.c | 34 ++++++++++++++++++++++++++-------- tools/tools-common.h | 4 +++- 8 files changed, 47 insertions(+), 21 deletions(-) diff --git a/tools/gpiodetect.c b/tools/gpiodetect.c index f0211da..eb8d273 100644 --- a/tools/gpiodetect.c +++ b/tools/gpiodetect.c @@ -12,7 +12,7 @@ static void print_help(void) { - printf("Usage: %s [OPTIONS] [chip]...\n", get_progname()); + printf("Usage: %s [OPTIONS] [chip]...\n", get_prog_short_name()); printf("\n"); printf("List GPIO chips, print their labels and number of GPIO lines.\n"); printf("\n"); @@ -51,7 +51,7 @@ static int parse_config(int argc, char **argv) print_version(); exit(EXIT_SUCCESS); case '?': - die("try %s --help", get_progname()); + die("try %s --help", get_prog_short_name()); default: abort(); } @@ -89,6 +89,7 @@ int main(int argc, char **argv) int num_chips, i, ret = EXIT_SUCCESS; char **paths, *path; + set_prog_name(argv[0]); i = parse_config(argc, argv); argc -= i; argv += i; diff --git a/tools/gpioget.c b/tools/gpioget.c index 08c17e6..c8238cf 100644 --- a/tools/gpioget.c +++ b/tools/gpioget.c @@ -26,7 +26,7 @@ struct config { static void print_help(void) { - printf("Usage: %s [OPTIONS] ...\n", get_progname()); + printf("Usage: %s [OPTIONS] ...\n", get_prog_short_name()); printf("\n"); printf("Read values of GPIO lines.\n"); printf("\n"); @@ -120,7 +120,7 @@ static int parse_config(int argc, char **argv, struct config *cfg) print_version(); exit(EXIT_SUCCESS); case '?': - die("try %s --help", get_progname()); + die("try %s --help", get_prog_short_name()); case 0: break; default: @@ -146,6 +146,7 @@ int main(int argc, char **argv) struct config cfg; const char *fmt; + set_prog_name(argv[0]); i = parse_config(argc, argv, &cfg); argc -= i; argv += i; diff --git a/tools/gpioinfo.c b/tools/gpioinfo.c index 1ec7f63..ce2df63 100644 --- a/tools/gpioinfo.c +++ b/tools/gpioinfo.c @@ -20,7 +20,7 @@ struct config { static void print_help(void) { - printf("Usage: %s [OPTIONS] [line]...\n", get_progname()); + printf("Usage: %s [OPTIONS] [line]...\n", get_prog_short_name()); printf("\n"); printf("Print information about GPIO lines.\n"); printf("\n"); @@ -83,7 +83,7 @@ static int parse_config(int argc, char **argv, struct config *cfg) print_version(); exit(EXIT_SUCCESS); case '?': - die("try %s --help", get_progname()); + die("try %s --help", get_prog_short_name()); case 0: break; default: @@ -228,6 +228,7 @@ int main(int argc, char **argv) struct config cfg; char **paths; + set_prog_name(argv[0]); i = parse_config(argc, argv, &cfg); argc -= i; argv += i; diff --git a/tools/gpiomon.c b/tools/gpiomon.c index 93ff463..893b966 100644 --- a/tools/gpiomon.c +++ b/tools/gpiomon.c @@ -34,7 +34,7 @@ struct config { static void print_help(void) { - printf("Usage: %s [OPTIONS] ...\n", get_progname()); + printf("Usage: %s [OPTIONS] ...\n", get_prog_short_name()); printf("\n"); printf("Wait for events on GPIO lines and print them to standard output.\n"); printf("\n"); @@ -195,7 +195,7 @@ static int parse_config(int argc, char **argv, struct config *cfg) print_version(); exit(EXIT_SUCCESS); case '?': - die("try %s --help", get_progname()); + die("try %s --help", get_prog_short_name()); case 0: break; default: @@ -360,6 +360,7 @@ int main(int argc, char **argv) struct config cfg; int ret, i, j; + set_prog_name(argv[0]); i = parse_config(argc, argv, &cfg); argc -= i; argv += i; diff --git a/tools/gpionotify.c b/tools/gpionotify.c index a0976f7..e19d88c 100644 --- a/tools/gpionotify.c +++ b/tools/gpionotify.c @@ -27,7 +27,7 @@ struct config { static void print_help(void) { - printf("Usage: %s [OPTIONS] ...\n", get_progname()); + printf("Usage: %s [OPTIONS] ...\n", get_prog_short_name()); printf("\n"); printf("Wait for changes to info on GPIO lines and print them to standard output.\n"); printf("\n"); @@ -144,7 +144,7 @@ static int parse_config(int argc, char **argv, struct config *cfg) print_version(); exit(EXIT_SUCCESS); case '?': - die("try %s --help", get_progname()); + die("try %s --help", get_prog_short_name()); case 0: break; default: @@ -370,6 +370,7 @@ int main(int argc, char **argv) struct pollfd *pollfds; struct config cfg; + set_prog_name(argv[0]); i = parse_config(argc, argv, &cfg); argc -= optind; argv += optind; diff --git a/tools/gpioset.c b/tools/gpioset.c index a7084a3..cc9106c 100644 --- a/tools/gpioset.c +++ b/tools/gpioset.c @@ -36,7 +36,7 @@ struct config { static void print_help(void) { - printf("Usage: %s [OPTIONS] ...\n", get_progname()); + printf("Usage: %s [OPTIONS] ...\n", get_prog_short_name()); printf("\n"); printf("Set values of GPIO lines.\n"); printf("\n"); @@ -212,7 +212,7 @@ static int parse_config(int argc, char **argv, struct config *cfg) print_version(); exit(EXIT_SUCCESS); case '?': - die("try %s --help", get_progname()); + die("try %s --help", get_prog_short_name()); case 0: break; default: @@ -876,6 +876,7 @@ int main(int argc, char **argv) struct config cfg; char **lines; + set_prog_name(argv[0]); i = parse_config(argc, argv, &cfg); argc -= i; argv += i; diff --git a/tools/tools-common.c b/tools/tools-common.c index a0080fc..e5f6fc1 100644 --- a/tools/tools-common.c +++ b/tools/tools-common.c @@ -19,9 +19,28 @@ #include "tools-common.h" -const char *get_progname(void) +static const char *prog_name = NULL; +static const char *prog_short_name = NULL; + +void set_prog_name(const char *name) +{ + prog_name = name; + prog_short_name = name; + while (*name) { + if (*name++ == '/') { + prog_short_name = name; + } + } +} + +const char *get_prog_name(void) +{ + return prog_name; +} + +const char *get_prog_short_name(void) { - return program_invocation_name; + return prog_short_name; } void print_error(const char *fmt, ...) @@ -29,7 +48,7 @@ void print_error(const char *fmt, ...) va_list va; va_start(va, fmt); - fprintf(stderr, "%s: ", program_invocation_name); + fprintf(stderr, "%s: ", get_prog_name()); vfprintf(stderr, fmt, va); fprintf(stderr, "\n"); va_end(va); @@ -40,7 +59,7 @@ void print_perror(const char *fmt, ...) va_list va; va_start(va, fmt); - fprintf(stderr, "%s: ", program_invocation_name); + fprintf(stderr, "%s: ", get_prog_name()); vfprintf(stderr, fmt, va); fprintf(stderr, ": %s\n", strerror(errno)); va_end(va); @@ -51,7 +70,7 @@ void die(const char *fmt, ...) va_list va; va_start(va, fmt); - fprintf(stderr, "%s: ", program_invocation_name); + fprintf(stderr, "%s: ", get_prog_name()); vfprintf(stderr, fmt, va); fprintf(stderr, "\n"); va_end(va); @@ -64,7 +83,7 @@ void die_perror(const char *fmt, ...) va_list va; va_start(va, fmt); - fprintf(stderr, "%s: ", program_invocation_name); + fprintf(stderr, "%s: ", get_prog_name()); vfprintf(stderr, fmt, va); fprintf(stderr, ": %s\n", strerror(errno)); va_end(va); @@ -74,8 +93,7 @@ void die_perror(const char *fmt, ...) void print_version(void) { - printf("%s (libgpiod) v%s\n", - program_invocation_short_name, gpiod_api_version()); + printf("%s (libgpiod) v%s\n", get_prog_short_name(), gpiod_api_version()); printf("Copyright (C) 2017-2023 Bartosz Golaszewski\n"); printf("License: GPL-2.0-or-later\n"); printf("This is free software: you are free to change and redistribute it.\n"); diff --git a/tools/tools-common.h b/tools/tools-common.h index 434e5ba..c82317a 100644 --- a/tools/tools-common.h +++ b/tools/tools-common.h @@ -78,7 +78,9 @@ struct line_resolver { struct resolved_line lines[]; }; -const char *get_progname(void); +void set_prog_name(const char *name); +const char *get_prog_name(void); +const char *get_prog_short_name(void); void print_error(const char *fmt, ...) PRINTF(1, 2); void print_perror(const char *fmt, ...) PRINTF(1, 2); void die(const char *fmt, ...) NORETURN PRINTF(1, 2); From patchwork Tue Feb 28 00:13:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 658295 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 001FBC7EE30 for ; Tue, 28 Feb 2023 00:13:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229824AbjB1ANn (ORCPT ); Mon, 27 Feb 2023 19:13:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229984AbjB1ANg (ORCPT ); Mon, 27 Feb 2023 19:13:36 -0500 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA67B6A45 for ; Mon, 27 Feb 2023 16:13:31 -0800 (PST) Received: by mail-il1-x12e.google.com with SMTP id b12so5354825ils.8 for ; Mon, 27 Feb 2023 16:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squareup.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5JEGWkYSd3xHDg8Gwcx7PjafM8ucmSGf8ozVlKbIuxg=; b=ZPHjoyeWheZ5hvzgqMKauMttcBJqinbMQ7bxuXbgCwHEBcuOvEgQWdyWB1ipORjP2Y 03uVjvZfXzCyMTu/osNuDzQaywyI/7Va6WrZdBupIFdOR5WdMiNQ5+PEFFRWsXcXRCmV PtPurX/9Pps5cTkw41x9MFZlPH0/stCkLIqjs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5JEGWkYSd3xHDg8Gwcx7PjafM8ucmSGf8ozVlKbIuxg=; b=0gV66zZYMSdtFAsUwbT2gqA3DP+wW96YlnQLIoHFMnFQeGdoGG7Ms2Vv96zqUf4IF0 AOLppeMVXWyCypr+tQfsMWOK6JifTWcX3mWGgGnOqJPO/qAEsCHUH8aLdjb+cjuWn/La QmaDyVRuMKLz55ZZGWmQkXeamIeAtJV+zlv1nVIMZclFiJduNd0lwxfoJVRsiiwRSoqN 9Z7TFM1NGnK52MqLPVhSStTWPxElhItPAtioXgplIIZAUGNaETINEaQckHZkkk05bQVK pN+i7fxOSPZeGjvvm9pEYUnQUk4coSzBuRCnhvbcy/u6UhF40j/B8AmcIdgVsbdAmTUR ye2Q== X-Gm-Message-State: AO0yUKWJV7yl80oUorDHqYhkTV2u34/k8DTBMzJOre2sh3LwXMsJUiGL q30Ail71M0I+CKOaoOBpnVi2wqNUEGYYlpAaFdU= X-Google-Smtp-Source: AK7set8Ti89Fg+jTqwYoa0yN+fBTfbsGmiSTEcQXL0jZj8svbOxtsW0zLGbsG6asmrUdk5I2ZCZyzA== X-Received: by 2002:a92:ca0f:0:b0:315:9937:600e with SMTP id j15-20020a92ca0f000000b003159937600emr1215401ils.26.1677543210670; Mon, 27 Feb 2023 16:13:30 -0800 (PST) Received: from localhost (137-025-033-021.res.spectrum.com. [137.25.33.21]) by smtp.gmail.com with ESMTPSA id b23-20020a02c997000000b003b4dc9ca57asm2549529jap.13.2023.02.27.16.13.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Feb 2023 16:13:30 -0800 (PST) From: Benjamin Li To: linux-gpio@vger.kernel.org, Bartosz Golaszewski Cc: Benjamin Li Subject: [libgpiod,v3 2/2] contrib: add sample Android.bp to build within an Android tree Date: Mon, 27 Feb 2023 16:13:07 -0800 Message-Id: <20230228001307.249811-3-benl@squareup.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230228001307.249811-1-benl@squareup.com> References: <20230228001307.249811-1-benl@squareup.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add an Android.bp file for Soong, the Android build system, to build the library including C++ bindings along with all the CLI tools. This reference Android build file will live in a contrib/ folder to indiciate it is a less-maintained part of libgpiod. It will need to be moved to the root directory in order to use it, though, as Soong doesn't let Blueprint files reference sources in a parent directory. error: external/libgpiod/contrib/Android.bp:5:1: module "libgpiod" variant "...": Path is outside directory: ../include error: external/libgpiod/contrib/Android.bp:5:1: module "libgpiod" variant "...": Path is outside directory: ../bindings/cxx error: external/libgpiod/contrib/Android.bp:5:1: module "libgpiod" variant "...": Path is outside directory: ../lib/*.c error: external/libgpiod/contrib/Android.bp:5:1: module "libgpiod" variant "...": Path is outside directory: ../bindings/cxx/*.cpp Signed-off-by: Benjamin Li --- contrib/Android.bp | 136 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 contrib/Android.bp diff --git a/contrib/Android.bp b/contrib/Android.bp new file mode 100644 index 0000000..fbc2196 --- /dev/null +++ b/contrib/Android.bp @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2023 Benjamin Li + +// Instructions: +// - Check out this repository as external/libgpiod. +// - Move this build file to the project's root directory. + +// +// libgpiod main library +// + +cc_library { + name: "libgpiod", + defaults: [ + "libgpiod_defaults", + ], + srcs: [ + "lib/*.c", + "bindings/cxx/*.cpp", + ], + export_include_dirs: [ + "include", + "bindings/cxx", + ], +} + +cc_defaults { + name: "libgpiod_defaults", + device_specific: true, + cpp_std: "gnu++17", + cflags: [ + // You may want to edit this with the version from configure.ac of + // the release you are using. + "-DGPIOD_VERSION_STR=\"unstable\"", + ], + cppflags: [ + // Google C++ style is to not use exceptions, but this library does + // use them. + "-fexceptions", + ], + // Google C++ style is to not use runtime type information, but this + // library does use it. + rtti: true, +} + +// +// libgpiod tools +// + +phony { + name: "libgpiod_tools", + required: [ + "gpiodetect", + "gpioget", + "gpioinfo", + "gpiomon", + "gpionotify", + "gpioset", + ], +} + +cc_binary { + name: "gpiodetect", + defaults: [ + "libgpiod_defaults", + "libgpiod_tools_defaults", + ], + srcs: [ + "tools/gpiodetect.c", + ], +} + +cc_binary { + name: "gpioget", + defaults: [ + "libgpiod_defaults", + "libgpiod_tools_defaults", + ], + srcs: [ + "tools/gpioget.c", + ], +} + +cc_binary { + name: "gpioinfo", + defaults: [ + "libgpiod_defaults", + "libgpiod_tools_defaults", + ], + srcs: [ + "tools/gpioinfo.c", + ], +} + +cc_binary { + name: "gpiomon", + defaults: [ + "libgpiod_defaults", + "libgpiod_tools_defaults", + ], + srcs: [ + "tools/gpiomon.c", + ], +} + +cc_binary { + name: "gpionotify", + defaults: [ + "libgpiod_defaults", + "libgpiod_tools_defaults", + ], + srcs: [ + "tools/gpionotify.c", + ], +} + +cc_binary { + name: "gpioset", + defaults: [ + "libgpiod_defaults", + "libgpiod_tools_defaults", + ], + srcs: [ + "tools/gpioset.c", + ], +} + +cc_defaults { + name: "libgpiod_tools_defaults", + srcs: [ + "tools/tools-common.c", + ], + shared_libs: [ + "libgpiod", + ], +}