From patchwork Mon May 1 16:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13227642 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67E35C77B73 for ; Mon, 1 May 2023 16:55:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E581F900009; Mon, 1 May 2023 12:55:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D910F900002; Mon, 1 May 2023 12:55:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0A16900009; Mon, 1 May 2023 12:55:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B1C47900002 for ; Mon, 1 May 2023 12:55:24 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 78DFBC0779 for ; Mon, 1 May 2023 16:55:24 +0000 (UTC) X-FDA: 80742286968.03.E402672 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf01.hostedemail.com (Postfix) with ESMTP id AEE9440011 for ; Mon, 1 May 2023 16:55:22 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=FUEHKTcj; spf=pass (imf01.hostedemail.com: domain of 3-e5PZAYKCEAuwtgpdiqqing.eqonkpwz-oomxcem.qti@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3-e5PZAYKCEAuwtgpdiqqing.eqonkpwz-oomxcem.qti@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682960122; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=AsvePdIIpK1hSWiMR4JNg9vJpL7RbQEpCCaVPwkxl+U=; b=zpANovOSueHiobpIADb/65Q0z9C5PpZQDeoF7vekXykRAxR5TB/vYUrQuCYA+w99Z5KWOg 9CQpknLQ4gSoz4vu7+lxZNmug/bLcnjhpyAI04Wz5/vk+eAUxshH8SK9lvIVUcfZ3+1VM4 eWyh8uRwoyhc5kM2iRfkvIWkn6oruEY= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=FUEHKTcj; spf=pass (imf01.hostedemail.com: domain of 3-e5PZAYKCEAuwtgpdiqqing.eqonkpwz-oomxcem.qti@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3-e5PZAYKCEAuwtgpdiqqing.eqonkpwz-oomxcem.qti@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682960122; a=rsa-sha256; cv=none; b=FTLzILCaqHlPRshkCuXCPB5qtiw5OzSWfu5+JBSpNSSP06Q4eAUyYMXTIS84JmrlVRyYXS ngTo09qHTkPW/P57H4g17Jfr0eFSDh1QRJH3+0GbE0YKQ8TM/nVCKg8vc4oRvcNng4D/ST ZxxgukwwVrfekHzKQ0y0HshR7CprNS0= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-559fb850e08so31595647b3.3 for ; Mon, 01 May 2023 09:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682960122; x=1685552122; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=AsvePdIIpK1hSWiMR4JNg9vJpL7RbQEpCCaVPwkxl+U=; b=FUEHKTcj/6Oaa/jf/hG74LwWnPzMzDXETDPC/OZPn9YmdSr3Je1dLjqI5qQFH1sW3q Bq/alOSo7JqKEqD9rgKcyUF43rVJZUIyQmx1G3PllnLeg5Yg39a7Bnek6w/Qmd8uXbJK EsGaYT+egztrqXkT7lGAkap+Gl5GwKP4LRCOjo5ZnVALaZHiuOt5sB/2YrOa8QMVBMrC FKm9pwPXa7lut/5XYzJLVlhPqGzsdKvhEJFlIIbig8wN8WeEjVJtPWgEipfIbTn79FXC wbTQc/DXAGa8hfnAWPDItUw4SLFFckirBkUuGFld0u0/pGt++nX/qQJEblW72Hij4gvi rVdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682960122; x=1685552122; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AsvePdIIpK1hSWiMR4JNg9vJpL7RbQEpCCaVPwkxl+U=; b=dz6bWr4wtNanyabah/1EbM4Y45c714RptTzjLCvOJa022/RQgi1/OVw5geitCLAIqS bYjhCSbTNbIFpumUaAjstuLqPUwkdRBtiWEeEcjOnvTcg5bXqNZdB2gDPCgsiA65/Nax 12r+KIA6BgEbN4rtNJ5vm4LYiB7e2ai+6cRqLcZafhErXX/z9QuAX2gAMaIAHsb2DMn+ eurJQ3MqsPeKBtU66UFLCkmaaAnfE7xn10T6wf7BrGm0RR+1TNlF41RLgFWs2Y02QMW5 joUDcFFoI+E/Gje6JxaZWJ+/DqUfF5ZWEEVQuGunkC/A5rMp07yedq6+09pNSMkl14t+ pSyg== X-Gm-Message-State: AC+VfDz8NgdKFdj7j8P24lcT5toyxJghY+7ZdE4lhONwHZy6Qxg4WLOS pbwaxzifKElTk4/BN6KyXm8G7DB9/zU= X-Google-Smtp-Source: ACHHUZ7mSCpHViXCMYRNn7XHcAK4o9x0dQPzloUUcJZHS6W4xj2tbrDIYHMzSCEPzYlJGL4NreMIfcOP/Ik= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:6d24:3efd:facc:7ac4]) (user=surenb job=sendgmr) by 2002:a81:7653:0:b0:54f:a60c:12eb with SMTP id j19-20020a817653000000b0054fa60c12ebmr8139444ywk.1.1682960121808; Mon, 01 May 2023 09:55:21 -0700 (PDT) Date: Mon, 1 May 2023 09:54:16 -0700 In-Reply-To: <20230501165450.15352-1-surenb@google.com> Mime-Version: 1.0 References: <20230501165450.15352-1-surenb@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230501165450.15352-7-surenb@google.com> Subject: [PATCH 06/40] lib/string.c: strsep_no_empty() From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, ldufour@linux.ibm.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, shakeelb@google.com, songmuchun@bytedance.com, jbaron@akamai.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: AEE9440011 X-Stat-Signature: paw4m1ja3kw4dxnhbihfpgjns1tdgqs7 X-Rspam-User: X-HE-Tag: 1682960122-873360 X-HE-Meta: U2FsdGVkX1/wY2Ue+E3xh44c2NPr+62xNV3tE0FUp5GQZady8Vws9G8ZQfwflMOjW/l4VmfbnuNnlLO5LXQ1CR58ZDjWguvk5UA51T82qQWDKOYDTXK0ixUZ2NK5GvPv7vZiwslRet94ttTIm3WVAGpHYdglCoG24fLtRZvuhHJEuk8UIiYmhED8/X+WjVnO9jqnQ86orNysxIzg2HkRu71AOFkOZPiYUrn/kcz4SFZetf44LAld6EdTgj0buW5CPcl4glYglVVX2thbfoZoDn/5sGveLUVOD9E4S2YL1rsdjUmXahxCdDWcVK42hYfgYY1dT+YaiKT1UmBCzebFcinugKdEOYGkioQY7S0PYM4u4EYskeJCF55y/MURh04XpgafhdnMtC+0r9FZv7Zbiuc0EbjbsSAWITqjWqy06sc2lLCwX1v6p7XVbFAA/X7TZAcuGmq904esKqpbW6DePKztJ15zn1Oi5z2Vi8oqDya4xwejYLtPV/b3CxdYkvUBGLCwFJbyMF88PU1g3Vahq1WowWQY6+Dp7t+mkzozOK1shRVel8dHHc3afIcrwllTqLB01lbnw0CWqqyjF0fxjWaEhLoHrj+slx5lCE90zUJ2oWeJokJeRxHhCIb5yH7mM+QrhZSs5ZimxRA9SC0tL+Lzgng5M3maxpW2L283YFZOp/+2rOn0uNCk4WE0bfFblF5HDNO4MVRjyRpexmG7oolLKrol+qCFEDPov4AE47veQQC3I3vExeUskdpF2WAkrq3RBh5VWZfnttu2HqvJnp+kRlIF2aZ2H9nvHVqMabn+pwBa1ZF69yZ7ANGdmu/1hBmYdwhyQQptgI5XD3tLUmjVY9etemyylqY0I5bPg7UjK3avBTV58/Crcs+mqzvG6f27G5SVroXc6zcfmbyeM1hGgsVb+Vl7wBDogaGfvugiqw0fkICMWlldyQisWB2DOUOCdFgC+NaAnqbR2xX mzZilMGA Om8K+54JRxIXG3KhpU6ItxJuW7M+fq/flY4KGO1EYL6BuogzGDWLXN4t2NtE4sc1wE1VDmFP9EEh3qP9GAu6ZMbUSjVHkoDDTGGGHGuk/acuZjbwNfLpGUuUcPsX9Zx5q6eOBHmg5D3FX+HKUxU4UVqSNTC2KM0sfK/YbW1hQ00jupUnOZsljYCScYc3xgMhe0GLznRceMSpQ+oJWzBdOz+UDo2JgmgiQ3A0L53pdSshPrPp3IAHwi/pyoPYNellQuhvfc1w4oE/bCuRIqUhZy3Q3qzUQZj6z7VTH9f0fqMYevpX3A+vV1xANzaNerhKwBzq+r+ya9OCSrOsAcQXbi+H8Xq7CffT3Hh7uu2j7k5F+ZPWDpVG21W/GqFqIUMTTyJWg9zLJhlNBxIzaamc/qC0lrZ9w3ENNdJt3gHWNWvEr0iDKnD2dAn2A+fQ7ER2aQuJibvaOg4eC7pGx9OzdFv1JJyjqWQb7NPwpIjVq98jw3RCz+wePQVt7eqAXeYUvZdzOMPUGG30hoPFwODTsrUygHthxWDjwjPxrE8y36ThkBFTNtSTivcMo/u4gdW/fp2uLNytZNzi1hsoDTLEQYDPG4csYV8QmPsokqo7mEVolrBw9Ccwc3yPtyHLmatJbq0mTtkzBx6BukGMPzpnj0S9i62k9fxL94YhfTcrrmDUJMrCw1+aYMF6KUHFSmvgZC5g/umNFoO5Gx3p0Qws/tLExcjvOV3+5BL2q X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Kent Overstreet This adds a new helper which is like strsep, except that it skips empty tokens. Signed-off-by: Kent Overstreet Signed-off-by: Suren Baghdasaryan --- include/linux/string.h | 1 + lib/string.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/linux/string.h b/include/linux/string.h index c062c581a98b..6cd5451c262c 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -96,6 +96,7 @@ extern char * strpbrk(const char *,const char *); #ifndef __HAVE_ARCH_STRSEP extern char * strsep(char **,const char *); #endif +extern char *strsep_no_empty(char **, const char *); #ifndef __HAVE_ARCH_STRSPN extern __kernel_size_t strspn(const char *,const char *); #endif diff --git a/lib/string.c b/lib/string.c index 3d55ef890106..dd4914baf45a 100644 --- a/lib/string.c +++ b/lib/string.c @@ -520,6 +520,25 @@ char *strsep(char **s, const char *ct) EXPORT_SYMBOL(strsep); #endif +/** + * strsep_no_empt - Split a string into tokens, but don't return empty tokens + * @s: The string to be searched + * @ct: The characters to search for + * + * strsep() updates @s to point after the token, ready for the next call. + */ +char *strsep_no_empty(char **s, const char *ct) +{ + char *ret; + + do { + ret = strsep(s, ct); + } while (ret && !*ret); + + return ret; +} +EXPORT_SYMBOL_GPL(strsep_no_empty); + #ifndef __HAVE_ARCH_MEMSET /** * memset - Fill a region of memory with the given value