From: Phillip Wood <phillip.wood123@gmail.com>
To: ionnss via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org
Cc: Chris Torek <chris.torek@gmail.com>, ions <zara.leonardo@gmail.com>
Subject: Re: [PATCH v3 3/3] libgit-rs: add get_ulong() and get_pathname() methods
Date: Mon, 29 Sep 2025 14:23:59 +0100 [thread overview]
Message-ID: <9e7da34f-8d1d-4223-a160-e0223984aeaf@gmail.com> (raw)
In-Reply-To: <1ac8d768194b15eaf536000ed5f76f36dd0a39b2.1758945111.git.gitgitgadget@gmail.com>
On 27/09/2025 04:51, ionnss via GitGitGadget wrote:
> From: ionnss <zara.leonardo@gmail.com>
>
> Expand the ConfigSet API with additional configuration value types:
>
> - get_ulong(): Parse unsigned long integers for large numeric values
I'm torn as to whether we should keep the same name as the C function as
you have done, or call it get_u64 to avoid the name depending on a
platform dependent type. It is very welcome that this function returns u64.
> - get_pathname(): Parse file paths, returning PathBuf for type safety
I'm not sure why these two functions are in the same commit, it would
make more sense to separate them out I think like you have done for
get_bool().
> Both functions follow the same pattern as existing get_* methods,
> using Git's C functions for consistent parsing behavior.
>
> Add comprehensive tests covering normal cases, edge cases, and
> error handling for all new functionality.
We can debate what constituets "comprehensive" but it is good to see
that the new functions are tested.
> diff --git a/contrib/libgit-rs/src/config.rs b/contrib/libgit-rs/src/config.rs
> index 72ee88801b..ffd9f311b6 100644
> --- a/contrib/libgit-rs/src/config.rs
> +++ b/contrib/libgit-rs/src/config.rs
> @@ -1,8 +1,8 @@
> use std::ffi::{c_void, CStr, CString};
> -use std::path::Path;
> +use std::path::{Path, PathBuf};
>
> #[cfg(has_std__ffi__c_char)]
> -use std::ffi::{c_char, c_int};
> +use std::ffi::{c_char, c_int, c_ulong};
>
> #[cfg(not(has_std__ffi__c_char))]
> #[allow(non_camel_case_types)]
> @@ -12,6 +12,10 @@ type c_char = i8;
> #[allow(non_camel_case_types)]
> type c_int = i32;
>
> +#[cfg(not(has_std__ffi__c_char))]
> +#[allow(non_camel_case_types)]
> +type c_ulong = u64;
This is a bit problematic as the type depends on the platform. I'm not
entirely clear why the current code doesn't just rely on having std::ffi
define these types.
> +
> use libgit_sys::*;
>
> /// A ConfigSet is an in-memory cache for config-like files such as `.gitmodules` or `.gitconfig`.
> @@ -82,6 +86,41 @@ impl ConfigSet {
>
> Some(val != 0)
> }
> +
> + /// Load the value for the given key and attempt to parse it as an unsigned long. Dies with a fatal error
> + /// if the value cannot be parsed. Returns None if the key is not present.
Please wrap the comments to 80 columns
> + pub fn get_ulong(&mut self, key: &str) -> Option<u64> {
> + let key = CString::new(key).expect("config key should be valid CString");
> + let mut val: c_ulong = 0;
> + unsafe {
> + if libgit_configset_get_ulong(self.0, key.as_ptr(), &mut val as *mut c_ulong) != 0 {
> + return None;
> + }
> + }
> + Some(val as u64)
> + }
This looks good
> + /// Load the value for the given key and attempt to parse it as a file path. Dies with a fatal error
> + /// if the value cannot be converted to a PathBuf. Returns None if the key is not present.
> + pub fn get_pathname(&mut self, key: &str) -> Option<PathBuf> {
> + let key = CString::new(key).expect("config key should be valid CString");
> + let mut val: *mut c_char = std::ptr::null_mut();
> + unsafe {
> + if libgit_configset_get_pathname(self.0, key.as_ptr(), &mut val as *mut *mut c_char)
> + != 0
> + {
> + return None;
> + }
> + let borrowed_str = CStr::from_ptr(val);
> + let owned_str = String::from(
> + borrowed_str
> + .to_str()
> + .expect("config path should be valid UTF-8"),
As we're returning a PathBuf it is a shame that we're restricted to
UTF-8 encoded paths. Unfortunately rust's standard library does not seem
to provide an easy way to convert a CStr to an OsString on windows as
one needs to convert it to a UTF-16 encoded string first.
> + pub fn libgit_configset_get_ulong(
> + cs: *mut libgit_config_set,
> + key: *const c_char,
> + dest: *mut c_ulong,
> + ) -> c_int;
> +
> + pub fn libgit_configset_get_pathname(
> + cs: *mut libgit_config_set,
> + key: *const c_char,
> + dest: *mut *mut c_char,
> + ) -> c_int;
As with the previous patch you need to define these functions in
public_symbol_export.[ch]
Thanks
Phillip
next prev parent reply other threads:[~2025-09-29 13:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 11:44 [PATCH 0/2] libgit-rs: add get_bool() method to ConfigSet ions via GitGitGadget
2025-09-25 11:44 ` [PATCH 1/2] po: fix escaped underscores in README.md ionnss via GitGitGadget
2025-09-25 11:44 ` [PATCH 2/2] libgit-rs: add get_bool() method to ConfigSet ionnss via GitGitGadget
2025-09-26 6:43 ` Chris Torek
2025-09-26 9:58 ` Phillip Wood
2025-09-26 17:15 ` Junio C Hamano
2025-09-27 0:07 ` [PATCH v2 0/3] " ions via GitGitGadget
2025-09-27 0:07 ` [PATCH v2 1/3] po: fix escaped underscores in README.md ionnss via GitGitGadget
2025-09-27 0:07 ` [PATCH v2 2/3] libgit-rs: add get_bool() method to ConfigSet ionnss via GitGitGadget
2025-09-27 0:07 ` [PATCH v2 3/3] libgit-rs: address review feedback for get_bool() ionnss via GitGitGadget
2025-09-27 2:01 ` [PATCH v2 0/3] libgit-rs: add get_bool() method to ConfigSet Junio C Hamano
2025-09-27 3:51 ` [PATCH v3 " ions via GitGitGadget
2025-09-27 3:51 ` [PATCH v3 1/3] po: fix escaped underscores in README.md ionnss via GitGitGadget
2025-09-29 13:26 ` Phillip Wood
2025-09-27 3:51 ` [PATCH v3 2/3] libgit-rs: add get_bool() method to ConfigSet ionnss via GitGitGadget
2025-09-29 13:23 ` Phillip Wood
2025-09-27 3:51 ` [PATCH v3 3/3] libgit-rs: add get_ulong() and get_pathname() methods ionnss via GitGitGadget
2025-09-29 13:23 ` Phillip Wood [this message]
2025-09-30 8:46 ` [PATCH v4] libgit-rs: add get_bool(), get_ulong(), " ions via GitGitGadget
2025-10-01 10:15 ` Phillip Wood
2025-10-06 21:20 ` brian m. carlson
2025-10-08 13:36 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9e7da34f-8d1d-4223-a160-e0223984aeaf@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=zara.leonardo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).