From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) by sourceware.org (Postfix) with ESMTPS id D8D503851528 for ; Thu, 27 Oct 2022 23:17:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D8D503851528 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kitware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kitware.com Received: by mail-qv1-xf34.google.com with SMTP id x15so2933511qvp.1 for ; Thu, 27 Oct 2022 16:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kitware.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k1ckgw/Zitbryg1fYk9NUQK1HUEQUI6/L91coAjePPM=; b=qex0Qx3TTpQn1oSEak8NJgwTyTZaJ4LkZU2BS/dqzNnbChCTNUjS5kIDin5ABcqj32 A5gJsVqFM2Z9xmeb9ieqiSplWchgPjWPpZ/y0gO7C77WYCivkpSWdnd6nNENJiPN9cuB ZHJBzLfohozLyEURDwPQ/7WyJZEh2yerMgg3U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k1ckgw/Zitbryg1fYk9NUQK1HUEQUI6/L91coAjePPM=; b=ZUnSL5UuhtzqzZmV6RDmn+kuznObjlcIu5ZFQvsONAqqs3B3jeWEv5DsLsOS+7zJVp S0IQ1ywkfPErxovhJJB1D0L/ehzG4hF00LG96DlmuLEVnnKDtIYq0HAtkSxZECU3UVSz 8/GpIRzhGTcRZ19Hejd71rxjt9PDO2cjTzGnwDchrM5Tl1StNpjqGFfXWF2sy9wO1Nlo biKVezMMJgURkI5X03ZVWZTDikFc14y9nE2uYuD1g+wOio8PfJGqXTbottXSO8vLsKES 2BpDsTDe7VQ/vxOfn9G1sJjN5+nwNuLIrqhOjRki2BaUpKH+euYZaWaDK9dlhqTgciWY aUpg== X-Gm-Message-State: ACrzQf1blkiZqJximSJEJ1evoM5D4JKO8awEQoTU2iaSC2hx7Ybc8y3o 2xRRDNHhrnwPxd6N/BBTQtc+gA== X-Google-Smtp-Source: AMsMyM5r9ulsYr594FDxqNqeEdY7/7pAL2KcTxYeELo/V4QhMp6ZgGU8au2ZNzWNZwjgAZG1j/HgHA== X-Received: by 2002:a05:6214:d46:b0:4b4:625b:7f0c with SMTP id 6-20020a0562140d4600b004b4625b7f0cmr44238248qvr.86.1666912629198; Thu, 27 Oct 2022 16:17:09 -0700 (PDT) Received: from localhost (cpe-142-105-146-128.nycap.res.rr.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id i16-20020a05620a405000b006eeb25369e9sm1881155qko.25.2022.10.27.16.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 16:17:08 -0700 (PDT) From: Ben Boeckel To: gcc-patches@gcc.gnu.org Cc: Ben Boeckel , jason@redhat.com, nathan@acm.org, fortran@gcc.gnu.org, gcc@gcc.gnu.org, brad.king@kitware.com, dmalcolm@redhat.com, mliska@suse.cz, anlauf@gmx.de Subject: [PATCH v2 2/3] libcpp: add a function to determine UTF-8 validity of a C string Date: Thu, 27 Oct 2022 19:16:43 -0400 Message-Id: <20221027231645.67623-3-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221027231645.67623-1-ben.boeckel@kitware.com> References: <20221027231645.67623-1-ben.boeckel@kitware.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This simplifies the interface for other UTF-8 validity detections when a simple "yes" or "no" answer is sufficient. Signed-off-by: Ben Boeckel --- libcpp/ChangeLog | 6 ++++++ libcpp/charset.cc | 18 ++++++++++++++++++ libcpp/internal.h | 2 ++ 3 files changed, 26 insertions(+) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 4d707277531..4e2c7900ae2 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2022-10-27 Ben Boeckel + + * include/charset.cc: Add `_cpp_valid_utf8_str` which determines + whether a C string is valid UTF-8 or not. + * include/internal.h: Add prototype for `_cpp_valid_utf8_str`. + 2022-10-27 Ben Boeckel * include/charset.cc: Reject encodings of codepoints above 0x10FFFF. diff --git a/libcpp/charset.cc b/libcpp/charset.cc index e9da6674b5f..0524ab6beba 100644 --- a/libcpp/charset.cc +++ b/libcpp/charset.cc @@ -1864,6 +1864,24 @@ _cpp_valid_utf8 (cpp_reader *pfile, return true; } +extern bool +_cpp_valid_utf8_str (const char *name) +{ + const uchar* in = (const uchar*)name; + size_t len = strlen(name); + cppchar_t cp; + + while (*in) + { + if (one_utf8_to_cppchar(&in, &len, &cp)) + { + return false; + } + } + + return true; +} + /* Subroutine of convert_hex and convert_oct. N is the representation in the execution character set of a numeric escape; write it into the string buffer TBUF and update the end-of-string pointer therein. WIDE diff --git a/libcpp/internal.h b/libcpp/internal.h index badfd1b40da..4f2dd4a2f5c 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -834,6 +834,8 @@ extern bool _cpp_valid_utf8 (cpp_reader *pfile, struct normalize_state *nst, cppchar_t *cp); +extern bool _cpp_valid_utf8_str (const char *str); + extern void _cpp_destroy_iconv (cpp_reader *); extern unsigned char *_cpp_convert_input (cpp_reader *, const char *, unsigned char *, size_t, size_t, -- 2.37.3