Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nRAGA-0000Fk-Bk for mharc-grub-devel@gnu.org; Mon, 07 Mar 2022 05:06:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRAG5-0000BR-Pa 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]:28331) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRAG3-0003W0-DR 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=1646647586; 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=jeQLpHmT2e9j9B1pMnrosncpNCmsfglMNS9bZcGHa+o=; b=E/etJYL0ao5VbM5v3M7YeXVmGlVqJ3Nc6Z0afPp1XP5dOuy1rFgv12N2Sy7C2USLca/z+Q 7/bFR8okyoLUZL/yM/9yinKxRTfSHtNx7G1Yh+6DcU9RIkLAoXwJ9RrC4r7baw18lma3IY XYmt6XkaQq3oEwSt+jFjS3LD64QOHXs= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-Tf30rXunM_WZ9Btk9M-g7w-1; Mon, 07 Mar 2022 05:06:25 -0500 X-MC-Unique: Tf30rXunM_WZ9Btk9M-g7w-1 Received: by mail-wm1-f69.google.com with SMTP id x5-20020a1c7c05000000b00389bcc8df46so128837wmc.0 for ; Mon, 07 Mar 2022 02:06:25 -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=jeQLpHmT2e9j9B1pMnrosncpNCmsfglMNS9bZcGHa+o=; b=t1xS5kqKRmT/us5ASx2wh5h2S87LaCg1KJPCC+uavc9kSmnmpwcFQas22p3Mn8QEir UNarNov7aAwJpvMkm6V7JmfTUHTS5sXndcd3gZ6kJlK6qFixzh7acxUTJc/oliJE0s0f 90ElbJVAVJrX2lznJ+6rbvbLSdoOsLs+D5WYdFjR63mplDJNe3f8POShC1iiS7NbsL8P gDXn/QQrD6XazJL+a44sxUVlSwjVUJgHAWrvsaY0FfblDeeWn6GXxFXzvbjQoRJJors6 tGCJogt8tLxXwIAg/buz36UkvsqaSCGoqu8ei6Q8dq35Qi/X9V1tSQ5RI/MaFvmEFd70 avIA== X-Gm-Message-State: AOAM530HiKNJzDovdmQOhijv3dfjDfm5bh5xlYcJC2RC47RtACu2pNHz rpEeAcR6P8c7fxg/5g8V0jD3g4btYkYd9BFoOz4JuQCXqAbPPzuZjZa8jwztJYvpTO+B2Yj6py8 Dkp5dsBLtOy5B9g2OZ1w4eETVCRYwtCCm+ceyt2Dcr/g78lFnZnfORwtLbvef5b4= X-Received: by 2002:adf:e2cf:0:b0:1ed:a702:5ef4 with SMTP id d15-20020adfe2cf000000b001eda7025ef4mr7494215wrj.487.1646647584169; Mon, 07 Mar 2022 02:06:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUvDpIeqKWt8CIQXDExkWl5eAjQP2FoQLwsnsY2XiBsdO5XRrvrEDCBEJDgYhUgAhrnrH3Ug== X-Received: by 2002:adf:e2cf:0:b0:1ed:a702:5ef4 with SMTP id d15-20020adfe2cf000000b001eda7025ef4mr7494202wrj.487.1646647583911; Mon, 07 Mar 2022 02:06:23 -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:23 -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 1/3] search: fixed bug stopping iteration when --no-floppy is used Date: Mon, 7 Mar 2022 11:06:18 +0100 Message-Id: <20220307100620.34309-2-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 When using --no-floppy and a floppy was encountered, iterate_device() was returning 1, causing the iteration to stop instead of continuing. Signed-off-by: Renaud Métrich --- grub-core/commands/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c index ed090b3af..51656e361 100644 --- a/grub-core/commands/search.c +++ b/grub-core/commands/search.c @@ -64,7 +64,7 @@ iterate_device (const char *name, void *data) /* Skip floppy drives when requested. */ if (ctx->no_floppy && name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9') - return 1; + return 0; #ifdef DO_SEARCH_FS_UUID #define compare_fn grub_strcasecmp -- 2.35.1