Message ID | 1517863234-22113-3-git-send-email-brett.grandbois@opengear.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zZzyS0Yc8z9sP1 for <incoming@patchwork.ozlabs.org>; Tue, 6 Feb 2018 07:41:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="fbCfz//k"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zZzyR5pLzzF0t7 for <incoming@patchwork.ozlabs.org>; Tue, 6 Feb 2018 07:41:19 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="fbCfz//k"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=opengear.com (client-ip=104.47.38.57; helo=nam02-bl2-obe.outbound.protection.outlook.com; envelope-from=brett.grandbois@opengear.com; receiver=<UNKNOWN>) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="fbCfz//k"; dkim-atps=neutral Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0057.outbound.protection.outlook.com [104.47.38.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zZzy12h5vzF0rf for <petitboot@lists.ozlabs.org>; Tue, 6 Feb 2018 07:40:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=opengear.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sJtB4pxvWF79iRDqgwXNSiLNTrub3q0kKP8yQzNWMkk=; b=fbCfz//kAl6dGmZQVjsaMT8CmcuI3iN4OCxHpgoi8iLpss6OSYuQ/ucoX/gWRa/wxdpT9WhtUdjhnH8HjSk9C0CBzQXVyeuHi08+OOe0We8rMvSB4lW+ZT3hhlACwRhX9BmxVW/btAPXF+cCuTCyapO1uQGPneYMuGnJDXFajCo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brett.grandbois@opengear.com; Received: from opengear.com (59.167.150.161) by MW2PR1501MB2060.namprd15.prod.outlook.com (2603:10b6:302:c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Mon, 5 Feb 2018 20:40:50 +0000 From: Brett Grandbois <brett.grandbois@opengear.com> To: petitboot@lists.ozlabs.org Subject: [PATCH 2/7] ncurses/nc-cui: musl libc fixes Date: Tue, 6 Feb 2018 06:40:29 +1000 Message-Id: <1517863234-22113-3-git-send-email-brett.grandbois@opengear.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517863234-22113-1-git-send-email-brett.grandbois@opengear.com> References: <1517863234-22113-1-git-send-email-brett.grandbois@opengear.com> MIME-Version: 1.0 X-Originating-IP: [59.167.150.161] X-ClientProxiedBy: SY3PR01CA0142.ausprd01.prod.outlook.com (2603:10c6:0:1b::27) To MW2PR1501MB2060.namprd15.prod.outlook.com (2603:10b6:302:c::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09f7bc72-f086-428d-7bd5-08d56cd8bee3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:MW2PR1501MB2060; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 3:s4FmBr4zU44e6QoGmq/TAIP+eI6b46s5QIPVY2/kgTpJ3Sl9KBmGHFwBV7Y8ESdRJ3UVosoKSjm2Loko4yPiDXFC3cbEhd1vPgVHWevsXiPwgHmsl9lVp9uIlhsex8r8w68oDlNh+iZ+zpdwq+Yl+89PFFP4xchqq2Gc+9TOLts9UCJwe1H+fqZflsI9yy7C+abG1K+ofOSEV6PU26qcXXDSSK1URhDaOEL2q0tl1CojwSDePbYXM3YFsrOX1Nqg; 25:qOEbWgEV2bEty5grZCqPyNnD7l6sJHSbyA2Cj1e8G8GUgb36sSKo7Gr4vFeqD9wwO3iOEJhmOSBEWgkty2BsiMaEBeWdO9VYq8uqVZkmxryDhH3tf9jZXGEzDkv31/oeBPL1zFj39XuQspITczxeWhxWezBelJ2IU2YHl0sRbu3vUOu2XfBPB7Zxgk7/MzmqOFDE81kITpeVycHaovOBMyo9zYvEk29JXehPFE79mYC2aBTeQEiMCluWM0ynmsebiFghGdvwD/CS7DpdskkIXtov51/R+5IlYqa4IAd4JVTHWNTvJ93K4S4mTXpLiVRvUOnOh6nO32OyzpAXQGXgjA==; 31:i3Sh/hyVbHbsGgPhonPprKDbf9TE7nXv7sLK3Lo/+hjFlgfYJIIhClmo+is+rM/4jF2ip1jQ64jY99o85K1FnsF5l4HOWpw8r8SIT8kXJWYJpHuzilQ44zc8v6aqHJtrz4SYuw8Yyx2U+aSHObnYVF3Wi9dnjLEeRyXlvVKP8RD4/zycRZxn3FYj5s8MU8lrUaU5Nc8AibllCSD5vxRwsuEfJUqqhF6yaU+JWUBJong= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2060: X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 20:3RGvwTPFJpOcIPPcaf1JHSX8VEaRuspqDyhYydxb0/+9oDW6DN8oYgDS1S5ReGFLsr6h+QRd4IfNH+NInMI6TuQd7MPfZafhc2XnyvWE5Lvf87Ml/Bw0zoqpRCq+yIWxXnvL2MnmYJQaU/MNQvzwPLJDZxUaPiuXf36UNoPeW5o=; 4:fMnfCZmjowc57pNgzHkOJ6G6EqQ9HSypQzh2ZX1oqu7ShcA4tteDnsV5QQwoBUV+ZL5cMQJ9j+rU9qfOTpF6ecUujkim21dD54aVfWwf5pFT9VH0wlMcn2a+c/cSZit4JN8vPSRIUxIZ4sXjD9dR1QP3LOKEowQgzysSPdpdIaaTRjyOLcx9uwX09x8moZfmXFqNxVGKrwUJbNpM31DVJmwXB0olSQbBSig3f1lAqr2DrMAJ3W6+HUgNyTRRudwAnf34urI121YvOrrExQA+pA== X-Microsoft-Antispam-PRVS: <MW2PR1501MB206072F50CC5383EA607EEB882FE0@MW2PR1501MB2060.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(3231101)(2400082)(944501161)(10201501046)(93006095)(93001095)(6041288)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:MW2PR1501MB2060; BCL:0; PCL:0; RULEID:; SRVR:MW2PR1501MB2060; X-Forefront-PRVS: 0574D4712B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(366004)(39840400004)(396003)(346002)(199004)(189003)(16526019)(6916009)(5660300001)(7696005)(50226002)(305945005)(52116002)(186003)(76176011)(7736002)(51416003)(26005)(8676002)(6666003)(33026002)(68736007)(107886003)(66066001)(2351001)(69596002)(36756003)(2361001)(86362001)(3846002)(6116002)(106356001)(316002)(21086003)(48376002)(25786009)(478600001)(50466002)(16586007)(59450400001)(55016002)(2906002)(47776003)(53936002)(8936002)(386003)(81156014)(4326008)(2950100002)(105586002)(97736004)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR1501MB2060; H:opengear.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: opengear.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MW2PR1501MB2060; 23:HRdbdCAAqDh5hqn2N81K5MssRc+OoIN7/zoUbVV?= abh6RR4CVe64rjF/IsFxJCMZsKBjTGDGq5kIZayjVAWe4c+DwZfTQ1pT5if7HEK4uQq3KOjg9G0TemYZawbxp9h0OX5PReWXs9oGkk3n7HROey3gcvUWnqZz6cSrIIeB8QBkvkFBLkDp3DHxJjgJM+uIJpkzFAzdH1HuAbD0EquT2lTDhg8C43YvqmlEEm8uLe5oYIIKi9sZCaBvAN8CwJkNARtMbxXvZjDBL1pwrT2ofva3NMgWaluBT/UPmXop7WtSy0ZvNO/Q92jQ5l9U2WfsIQDMWlpX4q/g5CrqyYfd+PjtRVf2UvtdHaOeMZ2J8uJRQz7nnhTwh5JLT9nwIjuwqG7t7sdfa4nq9N7z3K/QA2i1R7R33kwOweIBdFPwZDd6psAoqYbzD5cqTFoRSIw8Hq1AfcokCpuRl+t6OWKUJN7wSSz0hbOeEA7y1ZswdhCBjMu53Urf0JsEWOkvfMMsX+0j4kQ8QQ0iLLQzxh3EDDll3EvM0DSNyg1JB5jVgrBtOnId9kVfBZYGUc9fE3ZEYth6Q29xWsswBdLr/RBK7dLRFsRbLas2lU8dof2Q8a3kE2+/wRhezNe32mlwbFh1dzAw4ygiyAtX7pb0rR1fXydkSe6wEHtqGLOkJqBuNMvPSzesKFvDCklWtdNCQb89Q9OieO5Df+rMR1rjCeG87S9wmpPAkWbow9uYnqCgwOCNv8S98D85IJOUyIJePZEqK3rd5jXMLl3w/MgCZh+wHgCtxp57QDuKZ9JpzZf1VntanLXFHWNQY6hNE0jd6xbDnDpJeYk8Ky8o+bv3AHDN+G7jOcFjIYSEznO2Cg+8rBQPAlNNBzXD9LT5pY8GywuTHi1QuWKxELoXkB3XkpcK8IDQFiVOD/Wht9Gdq6TqL8QIfbcyvPP0D5UoaKYDscmTpIs292EocUBT35s6+Nl0U/cupLa26kuOKUaUF0DDT9lBacs/JZGkvCoirrAt9CTlhGF56rYpb7T+YhxwzdsAjGfNo2R/F4E7kfBCGH3ZXRkQQNcxbk5bcrD97O5jx/kGM1JzfAjwky3AQl6KX6rpERxcUepTXM4tdsm6fzyVw8lbPwmJACmTmzHyLXEtU6/DD6YCd27slM+hMU4MOsR9m2tep7dEN08OqC3iXYyzURKmpMCjL7T/ZNNzgxomAKcgX8ihHiShwha/dCTiRCnKKIA== X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 6:UV1wTKBokdJ0DRX9IUgCnkhQ1lsMQj0HRKnGIHSd/CM1VSqu70oea2eHqoeSEZ5+McUUUNO/6D/3zuYidw2b1B06ddtw6FjGYbPgdmtebVuuKg2M8jF6RdJCJro+mnb4lMklKGAHLUwaFSV0CTje50fRyvdnedN64mSNkAbd5esPnu7Rkh2crEk6NrIsUgtPa5erV45fQ/FUeul1YpgJ80Vhn7ldlMJzPuiuJztT1ERqRSbHe77Dcs7yxhSDV94bOu0ec2+TTpFeJ0Hk03CJ4n3rBD1VlLgIOf3f78Y2A/agXoZggAnGoLYn5ehKuDsfe4fisQJE3ROyVCpqbcAcASQRze5s6r5ritdNLxj6y+M=; 5:dA/f/ntWl42hqxjASVx88wt9cAOijrnQwmfjbHtl4SWaSRMVcy7wDGIDtGjbYy+GJrgGqT7MhtQw2/ZXasYmFRrwZ5eogs1+EI++kFu89vS/cU/6Fm0mPFUVZfVkmwkvgKiOwg6LMobJT9MfbeQb1vntzaB4nhaSAynfsY0F1a8=; 24:YFKQzwiF3KxbF4EQ5TzFq0O2ADcTre0iSfa/dT+BNgC8r6HM+zMcwvtpzsclKIVbPKRcGLNFY4Wb2GURkGc+PZrV9PAIEvKhuB4wwVu+hh8=; 7:UxAXE8BrZi3vOKh8YQhbMNbA8zxVaLQppSeEVknoIhAGk4jjmMsQ2HIy+MfRdb5wfUYJGvXlQ8FCdiU66i0CC7Nx9DeakjlOu0VRxJ2gmaK9eXzdb+H9G3VKXZ6h2SpskpBaO5SMcTPaXm/+JiXfGiGGZYENFzfWlzW33idFDwsV+KPOmFuVMBKXPSowPun/rZY+iiCqLkvH4yPzjNH7C9kLCAW1YQ2weTd+fudyn/mqiL21J9Iz4cO1yuvLk409 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2018 20:40:50.6608 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09f7bc72-f086-428d-7bd5-08d56cd8bee3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a6251c26-d21f-4164-a225-1f4eaebf5f9a X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR1501MB2060 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Petitboot bootloader development <petitboot.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/petitboot>, <mailto:petitboot-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/petitboot/> List-Post: <mailto:petitboot@lists.ozlabs.org> List-Help: <mailto:petitboot-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/petitboot>, <mailto:petitboot-request@lists.ozlabs.org?subject=subscribe> Cc: platypus-sw@opengear.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" <petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> |
Series |
Yocto and musl libc fixes, syslinux parser support
|
expand
|
diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index f9f8247..ee6df87 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -24,6 +24,7 @@ #include <ctype.h> #include <errno.h> #include <stdlib.h> +#include <locale.h> #include <string.h> #include <sys/ioctl.h> #include <sys/reboot.h> @@ -1334,7 +1335,7 @@ static struct pmenu *plugin_menu_init(struct cui *cui) m = pmenu_init(cui, 2, cui_plugin_menu_exit); m->scr.frame.ltitle = talloc_asprintf(m, _("Petitboot Plugins")); - m->scr.frame.rtitle = talloc_asprintf(m, NULL); + m->scr.frame.rtitle = talloc_asprintf(m, "%s", ""); m->scr.frame.help = talloc_strdup(m, _("Enter=install, e=details, x=exit, h=help")); m->scr.frame.status = talloc_asprintf(m,
add missing #inlcude <locale.h> musl libc can segfault with a NULL format string so need to add a redundant "%s", "" to keep it happy Signed-off-by: Brett Grandbois <brett.grandbois@opengear.com> --- ui/ncurses/nc-cui.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)