From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 7D72F3858C53 for ; Mon, 7 Nov 2022 23:47:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7D72F3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667864876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PvFdt3ABpob7wDZOfFuJnHDMQoUjclb9RPSFkl2JZ/4=; b=XsajOP1peUvYVVCOZ2xYLsUsQ+eTWnS29nE+1tKsx2Z2GFfJIWcP2DhrlelWnHOmZ/nxF4 YHx/B3o+4i44cuAIoIW/DpTw+SIvbn4dz7ASZkC/B6vCOASXqb0ro+7dzsFwtL89dQi8V8 6dIQ2tvcPRT49a/pd+lP+AYxFmkzv9U= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-570-UPA0A_7WNtOQGSRhLqWL2g-1; Mon, 07 Nov 2022 18:47:55 -0500 X-MC-Unique: UPA0A_7WNtOQGSRhLqWL2g-1 Received: by mail-qk1-f199.google.com with SMTP id bq13-20020a05620a468d00b006fa5a75759aso11506056qkb.13 for ; Mon, 07 Nov 2022 15:47:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PvFdt3ABpob7wDZOfFuJnHDMQoUjclb9RPSFkl2JZ/4=; b=RG6pEBxS2pAFpcJeh60KFSBDCHiaB7uvznOuqZGhQKwkI9szDj6ciqeWrrsfRLUaw2 bQgUrs6sAYzCuDdXdiryOM8fXQMr5iADDQTRN+AwEjh8Lds/+1o7cBA6VQYGhgc71fBI yA3ksBsyJn90pwHpO/i/a5y6K6FZn3zuCcBCsd8j2m0VS9Yl3oF/L9WIgHSSUobVTcei u2vlx7Fc/gMWihh5LypOaZ98d1V6D8rReh+YNB4ZtW/RjGRjLrM5RZ03K/7M6hittteH l12xFxLbQAOZkuG0oSODS9HWTsK5wPfh3+HdlOYzY2HIlXHrpEkOPWWnX+I4iEeum9S2 vzTQ== X-Gm-Message-State: ACrzQf0LHK/6pHZFnfAxNQUmHpH8diAeyQwC/16JwpR17YOGJCSLl4Rk 7Ma6MoorM1T+AbWwJTa5nxAxiFzfAnsd6oIsbKq8AZLK5bK7AjFlOBBIW+sSJoHsL7cjJZdZaib nZtHtqx0= X-Received: by 2002:ae9:f448:0:b0:6fa:8040:8a39 with SMTP id z8-20020ae9f448000000b006fa80408a39mr16124099qkl.321.1667864874677; Mon, 07 Nov 2022 15:47:54 -0800 (PST) X-Google-Smtp-Source: AMsMyM60KbqdVnEIkyfvkZ0+gs+1j5oyRTF3P3Hcs55xi2OLhpYwmgPPn5OdEQAUl3pQLidp9vICVA== X-Received: by 2002:ae9:f448:0:b0:6fa:8040:8a39 with SMTP id z8-20020ae9f448000000b006fa80408a39mr16124085qkl.321.1667864874383; Mon, 07 Nov 2022 15:47:54 -0800 (PST) Received: from [172.22.36.61] (rrcs-24-43-233-8.west.biz.rr.com. [24.43.233.8]) by smtp.gmail.com with ESMTPSA id m17-20020ae9e711000000b006ce580c2663sm7785941qka.35.2022.11.07.15.47.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Nov 2022 15:47:53 -0800 (PST) Message-ID: Date: Mon, 7 Nov 2022 13:47:51 -1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] libcpp: add a function to determine UTF-8 validity of a C string To: Ben Boeckel , gcc-patches@gcc.gnu.org Cc: nathan@acm.org, fortran@gcc.gnu.org, gcc@gcc.gnu.org, brad.king@kitware.com, dmalcolm@redhat.com, mliska@suse.cz, anlauf@gmx.de References: <20221027231645.67623-1-ben.boeckel@kitware.com> <20221027231645.67623-3-ben.boeckel@kitware.com> From: Jason Merrill In-Reply-To: <20221027231645.67623-3-ben.boeckel@kitware.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: On 10/27/22 13:16, Ben Boeckel wrote: > 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; > } Please add a comment before the function. > +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; > + } > + } We usually omit unnecessary { } around single statements. > + 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,