From patchwork Sat Feb 24 18:31:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 877443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::240; helo=mail-lf0-x240.google.com; envelope-from=swupdate+bncbcxploxj6ikrb7g6y3kakgqe52gsr2i@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="J7nAtGbv"; dkim-atps=neutral Received: from mail-lf0-x240.google.com (mail-lf0-x240.google.com [IPv6:2a00:1450:4010:c07::240]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zpc9t24rTz9sDQ for ; Sun, 25 Feb 2018 05:31:29 +1100 (AEDT) Received: by mail-lf0-x240.google.com with SMTP id 102sf3524345lft.15 for ; Sat, 24 Feb 2018 10:31:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1519497085; cv=pass; d=google.com; s=arc-20160816; b=JQNzM39cVyRdtfrWCjK+eTnrobLhlbsKNzt0CPwlyGJCfEb8Fqfuu6yMy3LfXesh2P 02jnKonWzAfYtoC6279W6iiZglu0VM9Lnpm4eoFj5qG2hzI/lgZ1Tcqg3HsXNa+17iYf dsEQ0inPBFz/laUcW/4gqeurCOnP1GA9aSS7K/5rZeAmiAjcUMFJjgqauH/qFaypWjqr TLxcSPGj4KWQd1iYnGThF0HfbdzH+kwpjtKcYEM5wH5vNljyzOxgpoLcvqIMoTox+NqD Dg4XjFojJ3CtLMae//Gm4E8FqcS/KLk0zi7mlQpLpbHaOoema+1s3zX4RFk31pihTE97 GghA== 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:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=xE2RurhrUQxn9P4z8gXzq67QYDr3gHPlyHosxhDbYZg=; b=pjbOaEu7aKIiWE0ORcFnBIJibIbzPkCcW7ZbF5GONVuLnDQ5tNFL5pW5zHJHxJM7yT XCJccgwUd7gOgaYj079XM7mpt45wFc8DwSQ6kFZ5eBVMhFA3+c3m0fPOYWMPiKo/CgGF gsmV/O6RHranc01fywud0BC4JvMv2FHNplJLmL1Cpel2YmUz65EKRHevcyT1tHIJ4dg9 lc1lNKpgVwVbaPNoKUaCEQT6F0WXcbWB/t4OwJiWGQPyT+1M/hQFhfSlduPI5T4A3yjt ecFmQM/E3ues5POhTJwGUHdv8g6wKDUH2ExtQtQFKS66IpRi8511Rm+gotPh6ECe00Un jWaw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=xE2RurhrUQxn9P4z8gXzq67QYDr3gHPlyHosxhDbYZg=; b=J7nAtGbvgleCwd/sb4B+sPEjfvyL30uCZiYRgFSe/KORZ5eflwx1Gp1Dj5Rvnb1UDa 0Xby0Hh53oOPuLqMS89XNs/qZ6GosdfsbSSkfBAkUn1wdwa2ncebEK2Cm+cbZhXIJQ+7 mIPhO2PXB6FC/oxLG2t/zFXZi/Z4BCFnIo3O7X6nM1m2GriYsVOAbNnK2uyM4BlnQX2j AVFKmp4TiXgiHLeaTFMc9Ogo92OVZ7NWvrnl+iJ+MGDmBu84OMleP3lKDR1EQIjUB6YV wX6+HpjkDlStmEASOEgAvAYaMJ1gAKksVL7SjC4GtiFHY98V7vxO6SH6h8ZCvUZRHpuA Y/5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=xE2RurhrUQxn9P4z8gXzq67QYDr3gHPlyHosxhDbYZg=; b=OdDF/FH1Es3Oy+y+4xzmaKR+0ov3Qj/kaIVUYtar4Cm/KpDRY5QyTrRiKuczu2kkHx H2zks8CVgbhv0ZbQLpRPfcicLDnD/ZDKLhuoWzpM/LZMGu4pb+Q6HXS18fJfY3eaq/fB GKpm4GWolQX3uLw308UnGyAQVxAARo1YXFj0YYHkvWDFEJTTk7gTew+xlsF5V1RdzwCq Es4J8pY2hsRVH8pvyTTgapnaR6kVXbiP/f1Rngg2DfdPge7OusfzfPz4OIb1ry1Kxw17 3/P8zsQTJ6ITQaZuIGBNSiHg8hwz9/SnYh2VWZtHBca5XQ/4E4nq5Ubap7op+NlusrDn bo3A== Sender: swupdate@googlegroups.com X-Gm-Message-State: APf1xPD88P/rYXMyLWqhvVJ2K+nXZCEm0PixlYd+zNnRhuWi5O83KMpA AHK6L82sAuQqZ0pO4axlkfU= X-Google-Smtp-Source: AG47ELtRLjXFwrkbw/S4luBJ1KprChAS18e1rmMxzr9ktQuqwn/Xo0Bsw/4/rpYqv+wh0R93AiJAUg== X-Received: by 10.25.149.65 with SMTP id x62mr20835lfd.8.1519497084824; Sat, 24 Feb 2018 10:31:24 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.25.193.87 with SMTP id r84ls978852lff.9.gmail; Sat, 24 Feb 2018 10:31:24 -0800 (PST) X-Received: by 10.25.208.19 with SMTP id h19mr373559lfg.10.1519497084124; Sat, 24 Feb 2018 10:31:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519497084; cv=none; d=google.com; s=arc-20160816; b=pbq4l5w5ZDlZidp89tgX/f/w4W/kUAgvBFB2ZGvJbhN3Kp/5qw88T45ALemBuINiWU kgNU1+ZohPBpICObjoMjORO21VEOrBrLLVySOtyXv+TvyZOCdkqmMAGzhVx5FTUkPiL+ 7QHjoWUXnf0SY417gYWQks8qMVtdE7zCGaiAjIPLTGXA1T7F0N6oq5HFG0g8ImA8x1nJ JAIcIkzPoChkOet3M4BwK6Nyy1lSQUmDvZTUpJjIPwnM3omsQa2BO5bLjOWWM+StKoA+ QG1SRmLuNuRkJ7Eotin8vZYIGtCeMp7IvkWTXNMSkU0n5mt0Kox1iJqPHPReGle0tLua b1oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=/sm1fprXyE01zvo880oWTNYirLFYnEufi2pSSVfTyrQ=; b=m35Ybnp0gxSECMiIoLn5VcdGsvhvZVF2AOudRKQfl1ELfb6DKTj9A16KtpKtOA4BQ4 T1490RYdOWWmSTUp8msJ9ADTbde8QH0WMM+C3mVePZ70awX1HgS8sTAr8PdrJFYCefxk yLlwtRhVLkUFWLVJnPVFBHZ1e16D+77HZzCFagg8RpebZu7d8lwzsJEQSLOEWslK8hvI bvEefuhyWrt8OPrudHyOc2lwKFdkChTGri4lRF24ve+g4XEDG9RO7C1QwIgO387+pAGs 5c2G0Lwfj15fr1M+e6qp0K3QC9XXRebltHT5HeSl73HdkvOJG/uJfEM+DVGclYsN32PA HNDg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id z25si201522lfg.5.2018.02.24.10.31.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Feb 2018 10:31:23 -0800 (PST) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zpc9l16mZz1qtXt; Sat, 24 Feb 2018 19:31:23 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zpc9l0xdrz1r3T2; Sat, 24 Feb 2018 19:31:23 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id BS6te_z_oC4C; Sat, 24 Feb 2018 19:31:21 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sat, 24 Feb 2018 19:31:21 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 19E21454069E; Sat, 24 Feb 2018 19:31:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KgU3QNENGqg0; Sat, 24 Feb 2018 19:31:11 +0100 (CET) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id EB009454049A; Sat, 24 Feb 2018 19:31:10 +0100 (CET) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH] mongoose: fix parsing of configuration file Date: Sat, 24 Feb 2018 19:31:08 +0100 Message-Id: <1519497068-12484-1-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 2.7.4 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de 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: , GET_FIELD_STRING_RESET() ensure that the returned string is empty after parsing an entry, else the string contains last parsed element. Signed-off-by: Stefano Babic Acked-by: Stefan Herbrechtsmeier --- mongoose/mongoose_interface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index 89a51f3..60914d3 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -477,27 +477,27 @@ static int mongoose_settings(void *elem, void __attribute__ ((__unused__)) *dat struct mongoose_options *opts = (struct mongoose_options *)data; char tmp[128]; - GET_FIELD_STRING(LIBCFG_PARSER, elem, "document_root", tmp); + GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "document_root", tmp); if (strlen(tmp)) { opts->root = strdup(tmp); } - GET_FIELD_STRING(LIBCFG_PARSER, elem, "enable_directory_listing", tmp); + GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "enable_directory_listing", tmp); if (strlen(tmp)) { opts->listing = strdup(tmp); } - GET_FIELD_STRING(LIBCFG_PARSER, elem, "listening_ports", tmp); + GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "listening_ports", tmp); if (strlen(tmp)) { opts->port = strdup(tmp); } #if MG_ENABLE_SSL - GET_FIELD_STRING(LIBCFG_PARSER, elem, "ssl_certificate", tmp); + GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "ssl_certificate", tmp); if (strlen(tmp)) { opts->ssl_cert = strdup(tmp); } - GET_FIELD_STRING(LIBCFG_PARSER, elem, "ssl_certificate_key", tmp); + GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "ssl_certificate_key", tmp); if (strlen(tmp)) { opts->ssl_key = strdup(tmp); }