From patchwork Tue May 2 12:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ryhl X-Patchwork-Id: 89345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp593270vqo; Tue, 2 May 2023 06:03:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ45D6AUvoQHz1QPRm70YkoRH8F5lJUOL8dQBnPpbeMVvKA6vmgGwq97/UUXG8+OPLUVDFOi X-Received: by 2002:a17:90a:f415:b0:24e:1144:ef52 with SMTP id ch21-20020a17090af41500b0024e1144ef52mr4691539pjb.11.1683032611457; Tue, 02 May 2023 06:03:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683032611; cv=none; d=google.com; s=arc-20160816; b=BBX2Cqm9GjYP74z38xctbKlqJK8/QkcCBMSCzsuN/IPAk/Mw8U6NZ+eK5alU5emVVB K1g+lV6WlpLUst22EO7p9mPDXIlGiKtUtDgvZCdjVsN7Ry0j9Bkn7D5KrSOrFqW1C7IG yT9TpFmKxK/45YWUCwlL/jg+VuL9fg9RyBAbEFbEVD3vTXWthbv0BRIo3DVGH0PeD1U8 ZUmNFGAhugToHINHwG8f69N5/4yd97Xcr5+Wa0ZM860kBjRWy7vEO82LdSfUTWYE4V48 yaZVVznrRCFhABr6t9MmLC4iKecGLqd/cKsugAVBjtyTw9LiwvkKPKhIVcGHE2w5Mb8S TvnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=yD3RHOmw2YonU9lq/qLKI0ISZtFJQuh0JdGUDdx5IQ4=; b=WBnX6uM7toh6vatvae0+jQh5m2KGE/ZpS/etRnwXBzQLs1II1/7tclBAp43+U86h6i 3oyx6V7+Y2x0kl8WuHz7DYK8R6/xUEjAKmRgEshtRMQQ3woA/ywtKiCLBHBin86OJn/m XmdV5ekHzCFB8fsZcPlhNMAG4qbcynCcQLtc68yfRNwbv4dZWuYSPcY31aUBgeujj46t nRJ5oeLoK1JfE0jOOO/DHCmo+XoEl6KPHeHmliNiL1LmIXtCb6yzlvuUFUp0ENeYRzBc E7VJMA8FZC8RquYjfrUh7niAT/h9yxFqd4G/yY7pY0a9EXm4ITpGEkdW5wtccjCteDZz QLxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=Nd8aPNd3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x4-20020a63db44000000b0051bb415165dsi28056565pgi.194.2023.05.02.06.03.17; Tue, 02 May 2023 06:03:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=Nd8aPNd3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233771AbjEBMxk (ORCPT + 99 others); Tue, 2 May 2023 08:53:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233513AbjEBMxi (ORCPT ); Tue, 2 May 2023 08:53:38 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 980C45252 for ; Tue, 2 May 2023 05:53:37 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b922aa3725fso7517675276.0 for ; Tue, 02 May 2023 05:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683032017; x=1685624017; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=yD3RHOmw2YonU9lq/qLKI0ISZtFJQuh0JdGUDdx5IQ4=; b=Nd8aPNd3NegOIXfFnsIObxs6yMD8V4tXgHyCuXTTN/BZDFLwElKICS86m6HIeGPcJo sa21trMsksNhMFTJpnRHFOxe6gNFa2PqBhWUMgMEqBNGYcOmhcrg8ei2+afLGBQtW/1I YIMFA+EfZnd6QWWaANQ6O85meD1Xgamv1yPKfhukbtXAhHP9s5JJiBaZJQdgAi8CTqMJ Qw+6goOIKN8vyJJALi4cHybsIVUi6VKK1rXv+P7sExw7GiS2FJJRPFi1pw8zKYjxwhbK Ccmy/M8HU8QnaK9dBM6FoQA3CxY0dQgSjB+fxgTqTuEnRE+Rb8jAuL2v7MM0U9luLK2k Agjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683032017; x=1685624017; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=yD3RHOmw2YonU9lq/qLKI0ISZtFJQuh0JdGUDdx5IQ4=; b=fjlzCJio6cdmU6ug/vg9fAdFZ2Sw2Vvgom0Jaw/UB1DjS95u2RbBZZ/7PeIOZ62Rx6 QAWfm84mY59ZOE3zla/vaS9wp7Kj2TQxiGZvlWaXuGT9N4CB2PTCNXf6yov8rz8U4NlF gBHpOtGqzf1d88zKbBdQh7KqTcCDXnU24SnO3frpLnnhqHt2Q3lNN0tGGHO9ZrBso+0K cs+vClzNxsVOqyHSoKLTxWnFGHg2sfo1BXibKUHd7FeT1xGoWhsGTqAQHJApcg92WKmy ZJ75MT/f8fQz1ZCkH3h1K5SKLgbnFOjijAJxZTiyxLL/imBAMRDRT6KAfU5dkudnqBBV mTGg== X-Gm-Message-State: AC+VfDxtrpYyu+cwGyRimxDmXHx1D6gb7x3SUjB6hSwfjZCVRP9uFx5a HGlw3k86VFeazrtl9qhxwfAHwcJFgIiUCLw= X-Received: from aliceryhl.c.googlers.com ([fda3:e722:ac3:cc00:31:98fb:c0a8:6c8]) (user=aliceryhl job=sendgmr) by 2002:a05:6902:100e:b0:b8f:47c4:58ed with SMTP id w14-20020a056902100e00b00b8f47c458edmr10400410ybt.9.1683032016822; Tue, 02 May 2023 05:53:36 -0700 (PDT) Date: Tue, 2 May 2023 12:53:06 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230502125306.358283-1-aliceryhl@google.com> Subject: [PATCH] rust: str: add conversion from `CStr` to `CString` From: Alice Ryhl To: Miguel Ojeda , Wedson Almeida Filho , Alex Gaynor Cc: Boqun Feng , Gary Guo , " =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= " , Benno Lossin , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Alice Ryhl X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764787603635274833?= X-GMAIL-MSGID: =?utf-8?q?1764787603635274833?= These methods can be used to copy the data in a temporary c string into a separate allocation, so that it can be accessed later even if the original is deallocated. The API in this file mirrors the standard library API for the `&str` and `String` types. The `ToOwned` trait is not implemented because it assumes that allocations are infallible. Signed-off-by: Alice Ryhl Reviewed-by: Martin Rodriguez Reboredo Reviewed-by: Benno Lossin --- rust/kernel/str.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) base-commit: ea76e08f4d901a450619831a255e9e0a4c0ed162 diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index b771310fa4a4..54935ff3a610 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -2,6 +2,7 @@ //! String representations. +use alloc::collections::TryReserveError; use alloc::vec::Vec; use core::fmt::{self, Write}; use core::ops::{self, Deref, Index}; @@ -199,6 +200,12 @@ impl CStr { pub unsafe fn as_str_unchecked(&self) -> &str { unsafe { core::str::from_utf8_unchecked(self.as_bytes()) } } + + /// Convert this [`CStr`] into a [`CString`] by allocating memory and + /// copying over the string data. + pub fn to_cstring(&self) -> Result { + CString::try_from(self) + } } impl fmt::Display for CStr { @@ -584,6 +591,20 @@ impl Deref for CString { } } +impl<'a> TryFrom<&'a CStr> for CString { + type Error = TryReserveError; + + fn try_from(cstr: &'a CStr) -> Result { + let len = cstr.len_with_nul(); + let mut buf = Vec::try_with_capacity(len)?; + buf.try_extend_from_slice(cstr.as_bytes_with_nul())?; + + // INVARIANT: The CStr and CString types have the same invariants for + // the string data, and we copied it over without changes. + Ok(CString { buf }) + } +} + /// A convenience alias for [`core::format_args`]. #[macro_export] macro_rules! fmt {