From patchwork Sat Mar 26 15:54:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle van der Waa X-Patchwork-Id: 2052 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.29) for (single-drop); Sat, 26 Mar 2022 15:54:35 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id 6L1QLDo3P2JnkgEAK+/4rw (envelope-from ) for ; Sat, 26 Mar 2022 15:54:34 +0000 Received: from lists.archlinux.org (lists.archlinux.org [95.217.236.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id E023FE61DB9; Sat, 26 Mar 2022 15:54:33 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 165E4E9AB65; Sat, 26 Mar 2022 15:54:31 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lists.archlinux.org (Postfix) with ESMTPS id 260C2E9AB4D for ; Sat, 26 Mar 2022 15:54:29 +0000 (UTC) Received: by mail-ej1-x630.google.com with SMTP id r13so20681672ejd.5 for ; Sat, 26 Mar 2022 08:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vdwaa-nl.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=USqn9XXR5hRqWUPWPCFUCIB2tP38Uhjh7auxxjLhQeI=; b=p4AIraSvZyMyE+4YA+jxZOLSCppx8DGPgw4gIFfZOhNr64mkUFgWqqdKoy6m0yQANI O9TX1RBX6jyhqktHda43GhULjac5J5FcpA094p4rvyLWh9MZMS/buP5nooOYIf84KHTW xiyqDrYvA3/9r2w9mmYeZzjLxx6yeib4M1gHFhzNFETT7Hkd/zuolsSEw+BBX99LbwXJ /eygw1U4gi2bz+5JbiFEQxYyl5ruDUTAnTcIylIm+w366edk71Q5SwLBjQnH8aznV6R8 15nmR16NYT7U1U2vnlJl8a/vx/OGCoE+ZHNxOmMGNUxe4X+ZtZRnYMrgbBH0B7MPvS3/ Oj5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=USqn9XXR5hRqWUPWPCFUCIB2tP38Uhjh7auxxjLhQeI=; b=3vPpU/rNgtQ2Liv84M0dRfpTeca1ZntXB2kEwaK+762LH5VkRDwpatWdhzU2nxWCOE eVdeGdjmX5/WiY/xyfOVGUATF73HkI5Y2O7PSAmkhJyOQyOvQWGXly3GBr0cmmJoKJ5Y HQxwS9Z3K3Hpro9jMfLk/nGV9z34iaPxvoZP9hhzJMU4HlGfDtQlTvBSPXzXEbL7j1lR IXQmmQn+B49+qt3WwcN7vKVazM/jjVXtlFEhjfR3ZFTElrn/itSuK4WRLg7H66VhC1uz uIad4aeteX74xvdZ92NvjkqBYwx5FzwXTk9t+9BM8+r1am2l4s1wZEAPBAL6gh1cZU3M 0CuA== X-Gm-Message-State: AOAM531+VNzbLQpsE9QzBqkT3spt8r6/ZT6vGMKHQadteYzqZ5/FP6NZ w9eet+XBdp04SO7HgRruvnAxuIpp3Ni+s2YLIAs= X-Google-Smtp-Source: ABdhPJxGjNekNF8dhaXU1wkozLAW8WqZzs6tBEEISqTZjZvWCf8WKofFkDkI/H//wyanpamCj4qr+w== X-Received: by 2002:a17:907:a40b:b0:6da:b4a1:33fa with SMTP id sg11-20020a170907a40b00b006dab4a133famr17590501ejc.22.1648310068434; Sat, 26 Mar 2022 08:54:28 -0700 (PDT) Received: from localhost.localdomain (83-84-17-34.cable.dynamic.v4.ziggo.nl. [83.84.17.34]) by smtp.gmail.com with ESMTPSA id q16-20020a170906145000b006bdaf981589sm3641463ejc.81.2022.03.26.08.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 08:54:27 -0700 (PDT) From: Jelle van der Waa X-Google-Original-From: Jelle van der Waa To: pacman-dev@lists.archlinux.org Cc: Jelle van der Waa , Jelle van der Waa Subject: [PATCH 1/3] util.c: extend --print-format with expac options Date: Sat, 26 Mar 2022 16:54:20 +0100 Message-Id: <20220326155422.28555-2-jelle@archlinux.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220326155422.28555-1-jelle@archlinux.org> References: <20220326155422.28555-1-jelle@archlinux.org> MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=vdwaa-nl.20210112.gappssmtp.com header.s=20210112 header.b=p4AIraSv; dmarc=none; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 95.217.236.249 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: E023FE61DB9 X-Spamd-Result: default: False [-4.91 / 15.00]; REPLY(-4.00)[]; R_MISSING_CHARSET(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; MAILLIST(-0.20)[mailman]; R_DKIM_ALLOW(-0.20)[vdwaa-nl.20210112.gappssmtp.com:s=20210112]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::630:received]; DMARC_NA(0.00)[vdwaa.nl]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; FROM_NEQ_ENVFROM(0.00)[jelle@vdwaa.nl,pacman-dev-bounces@lists.archlinux.org]; DKIM_TRACE(0.00)[vdwaa-nl.20210112.gappssmtp.com:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[83.84.17.34:received]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM(-0.00)[-1.000]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org From: Jelle van der Waa Extend --print-format with all expac format strings which can be easily added without conversions and through a simple C macro. Signed-off-by: Jelle van der Waa --- doc/pacman.8.asciidoc | 7 +++++-- src/pacman/util.c | 33 +++++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 785844ce..49e392cb 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -235,8 +235,11 @@ Transaction Options (apply to '-S', '-R' and '-U') *\--print-format* :: Specify a printf-like format to control the output of the '\--print' - operation. The possible attributes are: "%a" for arch, "%n" for pkgname, - "%v" for pkgver, "%l" for location, "%r" for repository, and "%s" for size. + operation. The possible attributes are: "%a" for arch, "%d" for + description, "%e" for pkgbase, "%f" for filename, "%g" for base64 + encoded PGP signature, "%h" for sha256sum, "%n" for pkgname, "%p" for + packager, "%v" for pkgver, "%l" for location, "%r" for repository, and + "%s" for size. Implies '\--print'. diff --git a/src/pacman/util.c b/src/pacman/util.c index 53833d6f..3b92e678 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -61,6 +61,13 @@ enum { CELL_FREE = (1 << 3) }; +#define VAL_FROM_FORMAT_STR(temp, format, func) \ + if(strstr(temp, format)) { \ + string = strreplace(temp, format, func(pkg)); \ + free(temp); \ + temp = string; \ + } \ + int trans_init(int flags, int check_valid) { int ret; @@ -1156,18 +1163,22 @@ void print_packages(const alpm_list_t *packages) free(temp); temp = string; } + /* %d : description */ + VAL_FROM_FORMAT_STR(temp, "%d", alpm_pkg_get_desc) + /* %e : pkgbase */ + VAL_FROM_FORMAT_STR(temp, "%e", alpm_pkg_get_base) + /* %f : filename */ + VAL_FROM_FORMAT_STR(temp, "%f", alpm_pkg_get_filename) + /* %g : base64 encoded PGP signature */ + VAL_FROM_FORMAT_STR(temp, "%g", alpm_pkg_get_base64_sig) + /* %h : sha25sum */ + VAL_FROM_FORMAT_STR(temp, "%h", alpm_pkg_get_sha256sum) /* %n : pkgname */ - if(strstr(temp, "%n")) { - string = strreplace(temp, "%n", alpm_pkg_get_name(pkg)); - free(temp); - temp = string; - } + VAL_FROM_FORMAT_STR(temp, "%n", alpm_pkg_get_name) + /* %p : packager */ + VAL_FROM_FORMAT_STR(temp, "%p", alpm_pkg_get_packager) /* %v : pkgver */ - if(strstr(temp, "%v")) { - string = strreplace(temp, "%v", alpm_pkg_get_version(pkg)); - free(temp); - temp = string; - } + VAL_FROM_FORMAT_STR(temp, "%v", alpm_pkg_get_version) /* %l : location */ if(strstr(temp, "%l")) { char *pkgloc = pkg_get_location(pkg); @@ -1195,6 +1206,8 @@ void print_packages(const alpm_list_t *packages) free(size); free(temp); } + /* %u : url */ + VAL_FROM_FORMAT_STR(temp, "%u", alpm_pkg_get_url) printf("%s\n", string); free(string); }