From patchwork Wed Jan 25 21:06:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 63695 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 181013954446 for ; Wed, 25 Jan 2023 21:11:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 181013954446 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674681066; bh=UJHIaYM0U5u0SEst0IBU/9LMwwy3p3yBJTTN7TdQwgI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=bMZ112fIPWg73MttkF+ELTIsBBNKOdCZhnZ0BLeziA+db5UJQHu+kHnZufr2B/QdV H+YWUFhPmGs4f80bl8S4i98bayvqF/LJC5nCdOH0Ia4foIFdq05wku+hG+NZLXFR9W r/ULag2slftkbs5+snEUu5OZlhHbXhtb1TTe5mF8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by sourceware.org (Postfix) with ESMTPS id BB8D83858C74 for ; Wed, 25 Jan 2023 21:06:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB8D83858C74 Received: by mail-qt1-x833.google.com with SMTP id h24so13256940qta.12 for ; Wed, 25 Jan 2023 13:06:55 -0800 (PST) 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=UJHIaYM0U5u0SEst0IBU/9LMwwy3p3yBJTTN7TdQwgI=; b=EpKmmC3PVEvy471ClSjdJOq7DzZ8Ic30DqyxiH4UYjwY9QRRe5tC24zACkePbiGO6X n15VTz5X6Eergtwtsm/IX8WRxK7T8IqyBH8JOIX8oIVdell2FDVenURRnX5ilw3QSOaD axhyE5NetmCCpk8hOByjDvhCjMRBffaEjPUjUvc7tVtswcTQ+jqqYjOyQtInZrgyaBjt 0dn5fZYiBbhPjl1GsQtdBsTK3ndDfSCC/Wp5alwQK8sqOvod5Ugpgc4mA9ozjdADgY2R sYq3CEAnxrE65RS5hlE0HmxNQF9aoW3ijsBTZM1FsTBQTcAUUphTZoQtql31/leCr+Ts H9GQ== X-Gm-Message-State: AO0yUKXPGcEPsvVA2HPUHqE+PVu8+/C9ZFdUdDyhAQkSxIwzJtnkIoTr +MwWPxFzmpDKrOGsnLvfnqnTGwgWpXTwKHEny1I= X-Google-Smtp-Source: AK7set//ESpZkkUIhgm7Cw640FS2xdAEV3JCla0iPTYuGLxpKmEnol619Ij7CQCYmgm5LuQnzemB/g== X-Received: by 2002:ac8:4e94:0:b0:3b7:faaf:f6da with SMTP id 20-20020ac84e94000000b003b7faaff6damr9785164qtp.50.1674680815158; Wed, 25 Jan 2023 13:06:55 -0800 (PST) Received: from localhost (cpe-142-105-146-128.nycap.res.rr.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id 72-20020a37074b000000b00706c1fc62desm4152724qkh.112.2023.01.25.13.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 13:06:54 -0800 (PST) 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 Subject: [PATCH v5 2/5] libcpp: add a function to determine UTF-8 validity of a C string Date: Wed, 25 Jan 2023 16:06:33 -0500 Message-Id: <20230125210636.2960049-3-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230125210636.2960049-1-ben.boeckel@kitware.com> References: <20230125210636.2960049-1-ben.boeckel@kitware.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ben Boeckel via Gcc-patches From: Ben Boeckel Reply-To: Ben Boeckel Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This simplifies the interface for other UTF-8 validity detections when a simple "yes" or "no" answer is sufficient. libcpp/ * charset.cc: Add `_cpp_valid_utf8_str` which determines whether a C string is valid UTF-8 or not. * internal.h: Add prototype for `_cpp_valid_utf8_str`. Signed-off-by: Ben Boeckel --- libcpp/charset.cc | 20 ++++++++++++++++++++ libcpp/internal.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/libcpp/charset.cc b/libcpp/charset.cc index f7ae12ea5a2..616be9d02ee 100644 --- a/libcpp/charset.cc +++ b/libcpp/charset.cc @@ -1868,6 +1868,26 @@ _cpp_valid_utf8 (cpp_reader *pfile, return true; } +/* Detect whether a C-string is a valid UTF-8-encoded set of bytes. Returns + `false` if any contained byte sequence encodes an invalid Unicode codepoint + or is not a valid UTF-8 sequence. Returns `true` otherwise. */ + +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 9724676a8cd..48520901b2d 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,