From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: from zero.zsh.org (zero.zsh.org [IPv6:2a02:898:31:0:48:4558:7a:7368]) by inbox.vuxu.org (Postfix) with ESMTP id 1E32523331 for ; Fri, 9 Feb 2024 19:28:22 +0100 (CET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1707503302; b=MYzWJD0X+CYtPpnZqDrHQTt5uRbcpD1261ETYot/8BOBedO8ykhRpd4BYns/fePdJVPGJhXQl/ qhX41WH0uJS3grH0hGyaXzgeU8KCZkObKOBVW1jNH0Pc9wlLUzQQxovbqSOB/4FPoFdQV8NHyS 0a7nveY/xAtnCny/97x+CSMUuK84VPdpzF07GGOKeV890Y3gJ9cmkCn7ouR4L+Zk0s/d9HnmU9 SN0Mkha5wz2QCKgk9b+WuQMPK62/Rx8arV17IXJMAkY9U8i3UiMcWyXzsdfZkDaEQNZx2Vu12z 3CuwZRB5yy/6CPRVfieZe/HJdjSTG5diW7KG1JnEVJMMgw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lf1-f45.google.com) smtp.remote-ip=209.85.167.45; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1707503302; bh=H/Ti4rtrmun0khyquATl7hghHumhUe7+AdfNwCbnMGQ=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:DKIM-Signature:DKIM-Signature; b=sPK7WK010ncRhNCRTa2AjqaXHkXJf3vrrPSY/EZTTNrkDHCpnzM3S4rG4H85+igB9bDjls2H8D fJDx1trkZ/NG8aol6pJRe2fRi8EbMjxyXqtl1+b/u7TqlQuPlsxb6PQth01nU+3rirV2YsG7SW LrI6alBjz2l7b3YDaBubSvmFDZ57cG7RSHQBYN9r4jt8L9EDqO8jN9vOfggAwfnrgZjRrp2PtG iBL1wCbqr+TzVPef0uS1ynm/n9rI3GrCrD05rp+41GrtXD0vt3QFPMOzSH/Itf1xFC+gONKiY9 pzHrvmKmhyf3Paoh2R4xCwWaNUeF/Z5//dVNp9lk6Iyc1Q==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=UCjyB00d0uVfPanxQgHxYT72M7NjZ8935N7FIC5NOJU=; b=R7zsbjHSVfm7NL2EB2DhcXrBwW OF+e6fd6TYCW8gKS2Lgwymht6N0bM1j82eBIYL0bgLHe3xAoQTd2y76nXwAInKuuwMEJgB3+IXcZ/ n8A5VzsCDm9NKib2QhAjHGRCGA9O1llhyg58kCxbAoXk0UfFx86zY0AhmmjATMf7jwU4ZEspgII1g C0mT+g+rhIMJfrlQraY6gqwdHlL74bmKMvvHGKafERw8FbkXIKzf9qhScr5JRiwcWKVeDvioLoBbs 7qxlDgJVBlAJnGp6tvdJlH4eS7JnROiLwFyrZNPVXBcx1Hg5rOm9F6PCsgaZ6zZRyB/QclyXOON65 mXI1r/sw==; Received: by zero.zsh.org with local id 1rYVbq-000Kj1-Dn; Fri, 09 Feb 2024 18:28:22 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lf1-f45.google.com) smtp.remote-ip=209.85.167.45; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-lf1-f45.google.com ([209.85.167.45]:49527) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1rYVbb-000KOo-Tm; Fri, 09 Feb 2024 18:28:08 +0000 Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-51165efb684so2127045e87.3 for ; Fri, 09 Feb 2024 10:28:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707503287; x=1708108087; darn=zsh.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UCjyB00d0uVfPanxQgHxYT72M7NjZ8935N7FIC5NOJU=; b=XbvRShSrijRwkFKm/Wxj1NahvL5WxabeDNCmuaUhypXDRKqOjo2ZwU1YYtOP8gN/98 dA+4pG0uuTLtbLmAdK61k329qmSd4yKBXERnGJr6l1jREbIYxw57Om7ygN8luHwks9zW I/1JJdTBbdtjnUVtIGW2UZynQrI8NEnYjIdWpTHaksWztqQojzE+HwMAucl1cDRkJ4Zp RRJWJLgIZfVTFvv2eOPT1Bl32ciKdQhcHY5b3QkvEpwUZGSJKmBNruu1Pz27PK3hLlJG rxpvzPBzGP8zCrIAzVVdE6iBPeurrr0cyBPcCtI9tGWbdXSzrGeHEgeIJB1BaTqVLvb7 zEtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707503287; x=1708108087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UCjyB00d0uVfPanxQgHxYT72M7NjZ8935N7FIC5NOJU=; b=TYr0jkvYZ9F7hKpPWrrv2v20crOU00IpZh9Jlxw32k7vpwJaK7gh5s5qcAAwOcy5gX 18k7KWMYEOrxKHOETDQHKwxoOB/ummDUsDWSA0MymwU01JdiIRJp8Aw7lKEOp/Yv9tzk kmYfOYe8bidv4w9wPndPrsM6YMlN78bUE62kgAa0yG6KI7PGOspx2dtjmpe0FqxM4zRi WPtNTymuOwigDEHmxYNLh2RCg9V4FvvvfLJ+CtK9hFLdkfsQZ1vdK/bN0qD8I6JuzWeL dybiRS2dZ6veFgo2b25RNgn6uqqVeAHEd/Q+Sbt7RCzFRoLd6A8uYe2TNFxjMGEEQeOy bf9w== X-Gm-Message-State: AOJu0Yx2i+QXKJ58ZTOlHQ7v+xUTz0A+yGLzyRxaY54eMMFVRfM9eX0n Bi8nyVm3bGk2Pr+hPPHxiYMB6JiHTetObcVrbmNOdmUrP/LYFvUhgDzH+y2c X-Google-Smtp-Source: AGHT+IESgcNOUQqCbSphrNL5mZzILqTfQ04QqVvUt1UuUa3oQg/+x2VhYc3X9/RumBHFtrPwo9Jiqw== X-Received: by 2002:a19:c211:0:b0:511:48fa:5c5a with SMTP id l17-20020a19c211000000b0051148fa5c5amr1680761lfc.16.1707503286673; Fri, 09 Feb 2024 10:28:06 -0800 (PST) Received: from localhost.localdomain (h-94-254-94-11.A230.priv.bahnhof.se. [94.254.94.11]) by smtp.gmail.com with ESMTPSA id h22-20020a056512221600b005114a0c56afsm371652lfu.279.2024.02.09.10.28.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 10:28:06 -0800 (PST) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: Metafy terminfo capabilities Date: Fri, 9 Feb 2024 19:28:05 +0100 Message-Id: <20240209182805.21363-1-mikachu@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20240209180356.3mbrzarqpctzbrzq@chazelas.org> References: <20240209180356.3mbrzarqpctzbrzq@chazelas.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 52526 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: This seems to do the trick. --- Src/Modules/terminfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c index 4596b41d25..f9ab64fb30 100644 --- a/Src/Modules/terminfo.c +++ b/Src/Modules/terminfo.c @@ -160,7 +160,7 @@ getterminfo(UNUSED(HashTable ht), const char *name) pm->node.flags |= PM_SCALAR; pm->gsu.s = &nullsetscalar_gsu; } else if ((tistr = (char *)tigetstr(nameu)) != NULL && tistr != (char *)-1) { - pm->u.str = dupstring(tistr); + pm->u.str = metafy(tistr, -1, META_HEAPDUP); pm->node.flags |= PM_SCALAR; pm->gsu.s = &nullsetscalar_gsu; } else { @@ -280,7 +280,7 @@ scanterminfo(UNUSED(HashTable ht), ScanFunc func, int flags) for (capname = (char **)strnames; *capname; capname++) { if ((tistr = (char *)tigetstr(*capname)) != NULL && tistr != (char *)-1) { - pm->u.str = dupstring(tistr); + pm->u.str = metafy(tistr, -1, META_HEAPDUP); pm->node.nam = dupstring(*capname); func(&pm->node, flags); } -- 2.38.1