From patchwork Tue Jul 9 11:08:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1958322 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=grgfOhYB; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=lnolRXYN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::53b; helo=mail-ed1-x53b.google.com; envelope-from=swupdate+bncbdy5juxlviebbrnxws2amgqedoxrwya@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-ed1-x53b.google.com (mail-ed1-x53b.google.com [IPv6:2a00:1450:4864:20::53b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WJJLf4THlz1xpd for ; Tue, 9 Jul 2024 21:15:22 +1000 (AEST) Received: by mail-ed1-x53b.google.com with SMTP id 4fb4d7f45d1cf-58d7b8f1e1bsf7521750a12.0 for ; Tue, 09 Jul 2024 04:15:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720523719; cv=pass; d=google.com; s=arc-20160816; b=hS20v52dosd9i+UXc00GgDI5OXQxi2oiXj8DTAjO7ktHO0/sTlB0zxRXPm/9NAC1tr QCR64aRup8/+vjQmvhsClfL+K2FDRzAh9UYJto7UI0EhHsFGuwx3D5mPCtGa4EmXXQRA PCUbPtHQ09ZY4Bc6q9cNNA2T/BXnE11P/4YYPLM59/BmVBUeLQBW643XLk1rFBaTgn6p 1WRV8VvCr355q/GflYVgNzEhXA3ImvqtKP5rM+TX+PN9/YotZAJAerN3XbPnyK5QAmZ/ 9MK2ViPBGqdrWKJ5D+kojAHT61zE9NfyB66snC+HkK77rpVNP5Ji63PSoGw9Y7Q8ZJJx GwWQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=Y7w7hOaFtoECS441VWQINUcaQ2jUC2+jLqwQiyCkBwM=; fh=HO6Cz5H+sj2Y3DIjoGzR8uFFWOuLjCmRl24z8NHkv+0=; b=owTdCVBichlgwCelT74difuK2m8FZaBFfPCQEMPY+45zhdmhsqjiKrfSuKBj/SVxgE d8QfSGGXzfzre/DIQS9ntt6nIAYW0Wwk8aFPceRDmeetdZpue63Or7ELk69LmXDgvVXj rdElfKvqIZ4289OEpnN56jPK81bXZAI00+O0eohn8QhuWGYzgq5Ee+b1Trei8jBtlGdC lD6aUUyGXBYINmGP5AEfkZ85RSso9XSBgIgYAkbE5pVGHxepA2H/HwZpfzjgj5bu6nei AZrWFn4QPP2VEohW3Y2s6W2JkReUhA9sGRW5MT1+8UP+3nWdOp3JRmLA170kA5FBH5Rs 5yvw==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Jbtxd5ST; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::533 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720523719; x=1721128519; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Y7w7hOaFtoECS441VWQINUcaQ2jUC2+jLqwQiyCkBwM=; b=grgfOhYBDvyg8C3a+zQewHD2bu1H+XQuhvpQzNgnYsK26TiLZNooZ2fKfxm1mgLT4y 6i9l2e/hbrsEUGNDlmC5aGP/ggLz4PFmeoyh5dlSlYV2vvt1qPJPffSm+LDEM/PdWodO IuR2MSn4Lx4rzzq2RTd6pfagpm35NKt/pmL4SRKuhDDZ2aF/gt18LyNG/SWrHcjtwgG9 /7juPrbPOu0lUqio7UO3OPUGAoW3NZ+LWjZ82pM3DcdHCUcSwlKxyD6NSuulaOMCs/KQ UXp9elFrFEqXd9vrJdBNAPKaPnmYTQWnNQ4KeFp/T4yp0bujPYaK/an6pC+huoVUCgdW 5X9g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720523719; x=1721128519; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y7w7hOaFtoECS441VWQINUcaQ2jUC2+jLqwQiyCkBwM=; b=lnolRXYNSp7ZXgJUAeWaJbq7Kmq/qbEh4Tdb0yIBqj9OyEKLEQBNejrMUFCAGhF6QC VuweaiyNij+Rx2Fh5gd4MKITqBoZCI3CpbA4C90XXuxbf4U992uAtyyZ5P0DDmmNafM8 OiOB2+ruSrzSu3kMQw/jWk3hTPz2ZDFtagJ7dmSrikuOqBAMtqI7Wfhrssdh+sQ//Ran kMIkTjy+6/xhtw9xPWG1dwfdngJJJjaoSnLFmUaZldbD4fAg1ZrnzghcbhmP1ssHNgRm +CCTgSKVVVnoFK+SHtyUEFOtl9L+xGNps2lygjgbgx2OvCfVAZ+i3zdQup5oyq412Y3F pGnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720523719; x=1721128519; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=Y7w7hOaFtoECS441VWQINUcaQ2jUC2+jLqwQiyCkBwM=; b=AQzXJa8o5EHAGlMhc/STn3XALO0u78UVyTNDZnreciU7Laglp1tax0Z0NI+7H2//uG hg7AjfPqu5YJoLcEva6M53Pq6jACJW5sKgzSH8yv8oJnDnCKYn6QcY9n89/X8MCKdeCb sSdR3I3157wyNo92576e2Vlhkedfkk9M+wXyuB/uq9taBJf8F68+6WMb3WSa254IbyI0 mz3V0XPczWOlMTMRxBzsPsNa7yajFiWva5/D3Bj1HHLiJNJVkfbePLVEoPb12AHqn37W 5homJ6TxbavUg4MpdDDhkkTQjWLYbPr47LzvJUZcRJGHt1bdt0hYoF/8ipbeyLZlULqZ fmLw== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUNlWUEIoY6mK0Q2DI5iJsRF7qNr+2VD/pk1i+C1F2QyjwMu+Ay4weE+9SMTW9CbrwsHAaq0ZrX/M/HWWgfryJMXquNklXRfWH7UxxCKA== X-Gm-Message-State: AOJu0YxyG/PwQc4+MXXqafJGlURwQO6oZyU3tQPxR8WapteEro5meXim rjK3vRoAHrsZVdMDbkfMz3wW5x9LzCGDP81lB4mtbDeyVsbYcHcI X-Google-Smtp-Source: AGHT+IGc+3USaQXu7ul/bFaebby/ss4QHX0TJy5pKB7H1+8fZ792V+uJC5evT1LqJmXabdJDq5jM8A== X-Received: by 2002:aa7:d0d6:0:b0:57d:4409:4f48 with SMTP id 4fb4d7f45d1cf-594de104180mr1575450a12.15.1720523718154; Tue, 09 Jul 2024 04:15:18 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6402:cbc:b0:57d:1766:62e9 with SMTP id 4fb4d7f45d1cf-58e24bce76cls3685249a12.2.-pod-prod-00-eu; Tue, 09 Jul 2024 04:15:15 -0700 (PDT) X-Received: by 2002:aa7:d0d6:0:b0:57d:4409:4f48 with SMTP id 4fb4d7f45d1cf-594de104180mr1575328a12.15.1720523715386; Tue, 09 Jul 2024 04:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720523715; cv=none; d=google.com; s=arc-20160816; b=o9NtY++zsLnKkT7pQ0XNUFYyf68rRvlAYw/6UYwkIW4KFo3XuQoDBxBoxEmNkg8l3o jRT/gZ7beWTejkJFyP7338prWaQcWpORZxvcM5u8s3gckmwlnDe4LgP3tWyb6gcClGVU c1WdMakXkfARIMDsGtERpxOzBODO4hTpzt7HlNqgGLNkcwTc/AM/QNGqsn5Tmtx8uznd oo+Sj+CW1PRnOLmhLpYvMEC74USs3Wm3PAnhKwM6WGJge3oMA7yuMjHaOsPNGWQeswfn mz4gjxyKTCtrJeBqfJ+XyNtHGtbJ034Ot2xJZNoeC4U+lnEvO+bruBQwc3B7Cnj/+JBa oEmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=QdSlvGQz1vUR/9sqdYIVj0bXGa6kF7pkJEQTQFw2NIQ=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=kDJuVzOvkjp7ijZaBQTBuRDvEnf5PV0TN7IE2SUkTYhFADjza5tmTGzeJ5kg0yCR+n ojUp8QyaUa9kw+HNoVgr4BNfxGTx6lWEszT7Ogm/RIeDTYS1D/8vFeaShQoDFPKvF7h2 e/fFGTEvOk29AUfXHXh2fSAT2temzIx9mDPwjwuLyTNjS0CHZpVJrLyK2qZpuW0+mttI OXZ1JU2f09iegKn1TFqMqvhzuprVh6gJ//kh3FRU1G7a90s/7+ZVE4mqfDIHk9+5W6QR CgGbwjJ0h9xX7gE2utPOOl7PE4RWMY782vfLrUOlS1U3IpY7j12L/LbAkBsLPHg+WZ/r +j6A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Jbtxd5ST; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::533 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com. [2a00:1450:4864:20::533]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-594bcaaea74si43476a12.1.2024.07.09.04.15.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jul 2024 04:15:15 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::533 as permitted sender) client-ip=2a00:1450:4864:20::533; Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-58c2e5e8649so8918264a12.1 for ; Tue, 09 Jul 2024 04:15:15 -0700 (PDT) X-Received: by 2002:a17:906:6a15:b0:a77:f5ca:f83b with SMTP id a640c23a62f3a-a780d3f1eadmr173720566b.35.1720523714539; Tue, 09 Jul 2024 04:15:14 -0700 (PDT) Received: from PC-2635.irisgmbh.local (dslb-002-203-138-100.002.203.pools.vodafone-ip.de. [2.203.138.100]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc8adsm70739166b.14.2024.07.09.04.15.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 04:15:14 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [V3][PATCH 04/21] mongoose: Forward port deprecated mg_strstr() Date: Tue, 9 Jul 2024 13:08:40 +0200 Message-ID: <20240709111440.8215-5-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240709111440.8215-1-Michael.Glembotzki@iris-sensing.com> References: <20240709111440.8215-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Jbtxd5ST; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::533 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , mongoose rev-id: b46bee0540c83c780ae9622ef18b9cc8a7b3ebab Signed-off-by: Michael Glembotzki --- mongoose/mongoose_multipart.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mongoose/mongoose_multipart.c b/mongoose/mongoose_multipart.c index fccc5a62..5e57d326 100644 --- a/mongoose/mongoose_multipart.c +++ b/mongoose/mongoose_multipart.c @@ -48,6 +48,19 @@ static void mg_http_free_proto_data_mp_stream( memset(mp, 0, sizeof(*mp)); } +static const char *mg_strstr(const struct mg_str haystack, + const struct mg_str needle) { + size_t i; + if (needle.len > haystack.len) return NULL; + if (needle.len == 0) return haystack.buf; + for (i = 0; i <= haystack.len - needle.len; i++) { + if (memcmp(haystack.buf + i, needle.buf, needle.len) == 0) { + return haystack.buf + i; + } + } + return NULL; +} + static void mg_http_multipart_begin(struct mg_connection *c, struct mg_http_message *hm) { struct mg_http_multipart_stream *mp_stream;