Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mIWY7-0007sv-8W for mharc-grub-devel@gnu.org; Tue, 24 Aug 2021 09:33:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIWY5-0007mx-9r for grub-devel@gnu.org; Tue, 24 Aug 2021 09:33:05 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:45896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIWY0-0003Bx-2n for grub-devel@gnu.org; Tue, 24 Aug 2021 09:33:04 -0400 Received: by mail-pj1-x1036.google.com with SMTP id f11-20020a17090aa78b00b0018e98a7cddaso2345837pjq.4 for ; Tue, 24 Aug 2021 06:32:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=38e3sMvl0wj9TSKeqKAlOMLdAahrnvUGFGz1bsgEgW0=; b=PNjVp/36LP917wgZflZv30b6ODjaxThr0oRPZaPtprgZi2pCLpO25lOCi7M7Cw57UH efEXoGKLfQScSaRjI6jsG+FLxdziOquLNnW2uhSZue5fAjfOIMS+NzSIZ/HlxyOWC141 3VgSQyDRQwhIjr56x61LsoKLH7nIBskS3le+c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=38e3sMvl0wj9TSKeqKAlOMLdAahrnvUGFGz1bsgEgW0=; b=BsUk/LLSklEYE1HVwi7qWeJ6XfoHtJ87cta7cxeiCOuXnVqn5bZrVLVtkWuCmiUmfH kqj/MgH/J5ZvsIflf0b9CcXUxo/0rWKQH1L/k03uWXc2ExARHA+/9xS0hIfDBLY2hZ6T d7tSmFO2mrtZM2/DBNd6DPd3zdr10olYq7n7jFjsRrVnZDUTVFarD501ZlczZ2GaozJM 2tG47z8XV6QAWGoeUK4XT2/C8T6+xLIIbWSLENGRhBngAs9cdTapAhJ5oeZ5QYN9N0jJ JQ+ppxA4zAnOFdFD4kZc0CBArDsa5UUyeY7xXFof4/aH37g+LAKThZifHflc+tI7ZTIw 1eUg== X-Gm-Message-State: AOAM531nMFjw+1UQNf9WjHx1StEmO/93d8gu02r492mMONMDorFSG+uM XO5rYNxTFjQnVF55BMBmjJYcWv0XtxozBw== X-Google-Smtp-Source: ABdhPJxHNjovpzPiwdcQCro/AxBQq6cD6CgsSowExKcrBwcFjIFHqpaqm/D6A62F8D2ebmSg98W+6g== X-Received: by 2002:a17:90a:116:: with SMTP id b22mr4542660pjb.108.1629811978553; Tue, 24 Aug 2021 06:32:58 -0700 (PDT) Received: from localhost ([2001:4479:e200:df00:90ee:2749:b9b1:fb92]) by smtp.gmail.com with ESMTPSA id k10sm18749594pfu.139.2021.08.24.06.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 06:32:58 -0700 (PDT) From: Daniel Axtens To: grub-devel@gnu.org Cc: Daniel Axtens Subject: [RFC PATCH 3/7] Rust: add a slightly more idiomatic wrapper around command handling Date: Tue, 24 Aug 2021 23:32:39 +1000 Message-Id: <20210824133243.3296813-4-dja@axtens.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824133243.3296813-1-dja@axtens.net> References: <20210824133243.3296813-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=dja@axtens.net; helo=mail-pj1-x1036.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2021 13:33:05 -0000 Add a way to do registering and deregistering of commands that is just a tiny bit more "Rust-y". Signed-off-by: Daniel Axtens --- grub-core/Makefile.am | 2 +- grub-core/lib/rust/grub/src/command.rs | 50 ++++++++++++++++++++++++++ grub-core/lib/rust/grub/src/lib.rs | 1 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 grub-core/lib/rust/grub/src/command.rs diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index 71c1444bcf7d..b565803efb05 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -38,7 +38,7 @@ lib/rust/grub/src/bindings.rs: lib/rust/bindings.h CLEANFILES += lib/rust/grub/src/bindings.rs -COMMON_RUSTSOURCES = lib/rust/grub/src/bindings.rs lib/rust/grub/src/lib.rs +COMMON_RUSTSOURCES = lib/rust/grub/src/bindings.rs lib/rust/grub/src/lib.rs lib/rust/grub/src/command.rs else COMMON_RUSTSOURCES = endif diff --git a/grub-core/lib/rust/grub/src/command.rs b/grub-core/lib/rust/grub/src/command.rs new file mode 100644 index 000000000000..e96b0ad78608 --- /dev/null +++ b/grub-core/lib/rust/grub/src/command.rs @@ -0,0 +1,50 @@ +extern crate alloc; +use crate::bindings; +use alloc::string::String; +use cty; + +pub type GrubCommandFunc = unsafe extern "C" fn( + cmd: *mut bindings::grub_command, + argc: cty::c_int, + argv: *mut *mut cty::c_char, +) -> bindings::grub_err_t; + +pub struct GrubCommand { + grub_command: bindings::grub_command_t, +} + +impl GrubCommand { + pub fn new( + name: &'static str, + func: GrubCommandFunc, + summary: &'static str, + description: &'static str, + ) -> GrubCommand { + let grub_command = register_command_prio(name, func, summary, description, 0); + GrubCommand { grub_command } + } +} + +impl Drop for GrubCommand { + fn drop(&mut self) { + unsafe { bindings::grub_unregister_command(self.grub_command) }; + } +} + +fn register_command_prio( + name: &'static str, + func: GrubCommandFunc, + summary: &'static str, + description: &'static str, + prio: cty::c_int, +) -> bindings::grub_command_t { + unsafe { + bindings::grub_register_command_prio( + name.as_ptr() as *const _, + Some(func), + summary.as_ptr() as *const _, + description.as_ptr() as *const _, + prio, + ) + } +} diff --git a/grub-core/lib/rust/grub/src/lib.rs b/grub-core/lib/rust/grub/src/lib.rs index c34f332c88af..02411292ba12 100644 --- a/grub-core/lib/rust/grub/src/lib.rs +++ b/grub-core/lib/rust/grub/src/lib.rs @@ -6,6 +6,7 @@ #![feature(alloc_error_handler)] pub mod bindings; +pub mod command; use bindings::grub_size_t; use core::alloc::GlobalAlloc; use core::alloc::Layout; -- 2.30.2