Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nRAGA-0000Es-4o for mharc-grub-devel@gnu.org; Mon, 07 Mar 2022 05:06:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRAG6-0000BS-3K for grub-devel@gnu.org; Mon, 07 Mar 2022 05:06:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRAG3-0003W9-Sf for grub-devel@gnu.org; Mon, 07 Mar 2022 05:06:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646647587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yNMKn4eVSR/e5kSlK1NLpmX17ee0NMq/u5Y2n2vWric=; b=RN/MS2KZbAAv9/eMb7QbhtoDtDf6UcVLVUTgPA6M8Y4Y5e2a7hyfk92/iRnzBhaVvhZs6c Zos1tUykKHdButfp+qa7FFn95wcp8h0kDUc0mYx+mHzSILpV0QK2OslYcYa3IQYQR3NQ6P R3n6h69HTcAe9k5mW+BBG9B7DJPBlIE= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-15-eX3-4ZvQMlGiyp4QOQkB2A-1; Mon, 07 Mar 2022 05:06:26 -0500 X-MC-Unique: eX3-4ZvQMlGiyp4QOQkB2A-1 Received: by mail-wm1-f72.google.com with SMTP id 14-20020a05600c028e00b003897a4056e8so4663964wmk.9 for ; Mon, 07 Mar 2022 02:06:26 -0800 (PST) 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=yNMKn4eVSR/e5kSlK1NLpmX17ee0NMq/u5Y2n2vWric=; b=RrMiP5O3j/CWRn4ql02AMbYNjGpm7hi3L13Gpl1TqAQbGB/FRFcFowH1GvcCbeb1vu UDFntQgfaFQsI4Do7isKF1kjUF61PnVApGE8snLvxmcoMOxGGD/vPgT0iUV+a2TrdjaK c9UMu3P2bDVwpUZkF2KrucI0FVXeFnefPvjzvfO8t8THXIDrUOOBDSrnFXoUa5QDZcnZ J6MOiXgO5ZB+Nmu6BDVn3t8FUlLrSPMZMDyqk6G69PGSfGBXEGZbCO/DP1YUH8WRYCxq Ild5du4XEcABgs5XFR/Gxw46nDMU8uKq16dLY5A0IzbQqmiiirbMyydw4XH8H4Wg1j+n eOLw== X-Gm-Message-State: AOAM533bi4hYBm2o53s3tPx3cTcVAsQ4QHdVGLmqaej+IsVBCwNVaNGG /QETr5tujcwjDn6FvI9tL4dgVHUotZVicwFlZVbp4q9IKhraUAZnc4mVe6Qh++E1rwb3q1crpXn ez8G0OE5IB2lSxJMEKwfTinCu9yvXK/354ZHbx0MN5IKSC9hhVs/l33ymqMYx8Pc= X-Received: by 2002:adf:d22f:0:b0:1f1:e689:4c7e with SMTP id k15-20020adfd22f000000b001f1e6894c7emr5275082wrh.261.1646647584809; Mon, 07 Mar 2022 02:06:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIA4mCbtgYiBCh0dyXy1aHUCMWG9fDE5Em78jGqTIciRBrM78r8xKXQbl3G6Nk55mLV4eLWw== X-Received: by 2002:adf:d22f:0:b0:1f1:e689:4c7e with SMTP id k15-20020adfd22f000000b001f1e6894c7emr5275064wrh.261.1646647584533; Mon, 07 Mar 2022 02:06:24 -0800 (PST) Received: from t590.redhat.com (82-64-217-13.subs.proxad.net. [82.64.217.13]) by smtp.gmail.com with ESMTPSA id r186-20020a1c2bc3000000b0037bdd94a4e5sm12654976wmr.39.2022.03.07.02.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 02:06:24 -0800 (PST) From: =?UTF-8?q?Renaud=20M=C3=A9trich?= To: grub-devel@gnu.org Cc: =?UTF-8?q?Renaud=20M=C3=A9trich?= Subject: [PATCH v5 2/3] search: refactor --no-floppy option to have something generic Date: Mon, 7 Mar 2022 11:06:19 +0100 Message-Id: <20220307100620.34309-3-rmetrich@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307100620.34309-1-rmetrich@redhat.com> References: <20220307100620.34309-1-rmetrich@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=rmetrich@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=rmetrich@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2022 10:06:31 -0000 Signed-off-by: Renaud Métrich --- grub-core/commands/search.c | 8 ++++---- grub-core/commands/search_wrap.c | 13 +++++++------ include/grub/search.h | 14 +++++++++++--- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c index 51656e361..197eccdf8 100644 --- a/grub-core/commands/search.c +++ b/grub-core/commands/search.c @@ -47,7 +47,7 @@ struct search_ctx { const char *key; const char *var; - int no_floppy; + enum search_flags flags; char **hints; unsigned nhints; int count; @@ -62,7 +62,7 @@ iterate_device (const char *name, void *data) int found = 0; /* Skip floppy drives when requested. */ - if (ctx->no_floppy && + if (ctx->flags & SEARCH_FLAGS_NO_FLOPPY && name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9') return 0; @@ -261,13 +261,13 @@ try (struct search_ctx *ctx) } void -FUNC_NAME (const char *key, const char *var, int no_floppy, +FUNC_NAME (const char *key, const char *var, enum search_flags flags, char **hints, unsigned nhints) { struct search_ctx ctx = { .key = key, .var = var, - .no_floppy = no_floppy, + .flags = flags, .hints = hints, .nhints = nhints, .count = 0, diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c index 47fc8eb99..8e90bbdcc 100644 --- a/grub-core/commands/search_wrap.c +++ b/grub-core/commands/search_wrap.c @@ -89,6 +89,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args) const char *id = 0; int i = 0, j = 0, nhints = 0; char **hints = NULL; + enum search_flags flags = 0; if (state[SEARCH_HINT].set) for (i = 0; state[SEARCH_HINT].args[i]; i++) @@ -180,15 +181,15 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args) goto out; } + if (state[SEARCH_NO_FLOPPY].set) + flags |= SEARCH_FLAGS_NO_FLOPPY; + if (state[SEARCH_LABEL].set) - grub_search_label (id, var, state[SEARCH_NO_FLOPPY].set, - hints, nhints); + grub_search_label (id, var, flags, hints, nhints); else if (state[SEARCH_FS_UUID].set) - grub_search_fs_uuid (id, var, state[SEARCH_NO_FLOPPY].set, - hints, nhints); + grub_search_fs_uuid (id, var, flags, hints, nhints); else if (state[SEARCH_FILE].set) - grub_search_fs_file (id, var, state[SEARCH_NO_FLOPPY].set, - hints, nhints); + grub_search_fs_file (id, var, flags, hints, nhints); else grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type"); diff --git a/include/grub/search.h b/include/grub/search.h index d80347df3..bbfa6a787 100644 --- a/include/grub/search.h +++ b/include/grub/search.h @@ -19,11 +19,19 @@ #ifndef GRUB_SEARCH_HEADER #define GRUB_SEARCH_HEADER 1 -void grub_search_fs_file (const char *key, const char *var, int no_floppy, +enum search_flags + { + SEARCH_FLAGS_NO_FLOPPY = 1 + }; + +void grub_search_fs_file (const char *key, const char *var, + enum search_flags flags, char **hints, unsigned nhints); -void grub_search_fs_uuid (const char *key, const char *var, int no_floppy, +void grub_search_fs_uuid (const char *key, const char *var, + enum search_flags flags, char **hints, unsigned nhints); -void grub_search_label (const char *key, const char *var, int no_floppy, +void grub_search_label (const char *key, const char *var, + enum search_flags flags, char **hints, unsigned nhints); #endif -- 2.35.1