From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=astier-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=niJZ7JvWQZBvzpcftXAF+tvKnZEj/Y+eu8HV4e4bM9Q=; b=CAD2g37tmN/0jEE/OyyHxVcpCn/3yyoI5mm88nO1k9skIWTUBj5TUsyE0s4FQu492j y946Nph4VC2vnDYDoDdzjDwE8Jhwx1y0G63+ZlrNk2s1nhn6VWzPv4T8UO2Z0zFV5o2r fnh2lwDY6SvSqSJ8WxENCeyAX0gomAoH5MWodVFx3nQesePCF4wix3uLa+5UNwOhJTbq E7d19vgsJ0/rF90vkjQmv+bYYe5FIKJYbj6KB8khKW74HG7jN0rAWkS8vcXXHyRgx+73 ksH36xHvjHteZlutPGKT3n0AY4p7vz3y9CX7/y388xQNjF3jmpAikYAx3LSLXKrA+LGw EC/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=niJZ7JvWQZBvzpcftXAF+tvKnZEj/Y+eu8HV4e4bM9Q=; b=sPP0RCM1ce+pSfP+TNHkjZLA9u9DVjiNzCjidHWvLkboEsgHXSz8lVbebcwYXQwvEH FK+P0XXiSiXxDbELOGwGBkF/CpTOhq2vfnaEb4KloC6xo6X/klC+NYWDpTcnMAjGN4Oo Aupj52pXhAlzk1R5CnvsJ4+64GX609fqzo+afA/DAXkmVlxOEDeE3N9Ng5+bRhbijPCw TXCHY5lJLlPZlE8p2u0lTUcxbfDt3oYI4vq0wcsdiOFe2J2cG9lwspsX4FpZyhcMdfFg M+q2fFn5lOqXT2KT6Kt1axcsmkwlQefgPiT9fggyiqS8mqUukWb529AJLxm42Yi2Ew14 L7AQ== X-Gm-Message-State: AOAM531FgrYngfjaV0cItwE0E/ZnK4LrNnkouGSm1X9iCZOO4eyFRQjT qAAo8i8sI56WH3B0gHQznz5287KpAbh3ed32 X-Google-Smtp-Source: ABdhPJyyRbU1SvB8l0KhdO0+kyVARkul+Q1/ymMyKH8MQ9R1ckxiTMRkv8vca1CNLBBMth1JgkAosQ== X-Received: by 2002:a1c:b741:: with SMTP id h62mr7680666wmf.85.1614436579626; Sat, 27 Feb 2021 06:36:19 -0800 (PST) From: Anisse Astier To: kbd@lists.altlinux.org Date: Sat, 27 Feb 2021 15:36:11 +0100 Message-Id: <20210227143611.94982-1-anisse@astier.eu> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Alexey Gladkov Subject: [kbd] [PATCH] src/libkeymap: add support for parsing more unicode values X-BeenThere: kbd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Linux console tools development discussion List-Id: Linux console tools development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Feb 2021 14:36:25 -0000 Archived-At: List-Archive: The auto-generated (with ckbcomp) file fr-bepo_afnor did not load (even partially), because of an U+1f12f (copyleft symbol) that is wrongly parsed, generating this error message: too many (160) entries on one line Fix libkeymap so that the keymap can be parsed, even if the offending character won't be loaded because of the ushort limitation of the kb_value KDSKBENT uapi. It's better to have the keymap partially loaded than not at all. Signed-off-by: Anisse Astier Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=968195 --- src/libkeymap/analyze.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l index 9e76eae..4bdffb4 100644 --- a/src/libkeymap/analyze.l +++ b/src/libkeymap/analyze.l @@ -319,7 +319,7 @@ Include include[ \t]* Decimal [1-9][0-9]* Octal 0[0-7]* Hex 0[xX][0-9a-fA-F]+ -Unicode U\+([0-9a-fA-F]){4} +Unicode U\+([0-9a-fA-F]){4,6} Literal [a-zA-Z][a-zA-Z_0-9]* Octa ([0-7]){1,3} Charset charset|Charset|CharSet|CHARSET @@ -404,7 +404,7 @@ To to|To|TO if (parse_int(yyextra, yytext, yytext + 1, 16, &(yylval->num)) < 0) return(ERROR); - if (yylval->num >= 0xf000) { + if (yylval->num >= 0x10ffff) { ERR(yyextra, _("unicode keysym out of range: %s"), yytext); return(ERROR); -- 2.29.2