* [PATCH] libkeymap: fix double kbdfile open
@ 2024-05-17 22:30 Sertonix
2024-05-20 10:44 ` Alexey Gladkov
0 siblings, 1 reply; 2+ messages in thread
From: Sertonix @ 2024-05-17 22:30 UTC (permalink / raw)
To: kbd
976867c3a84 (Rewrite libkbdfile library) changed kbdfile_find to error
when the file descriptor was already opened. Make sure kbdfile_find
isn't called again when kbdfile is found in include_dirpath1.
Signed-off-by: Sertonix <sertonix@posteo.net>
---
src/libkeymap/analyze.l | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l
index 9c4c747..dd94206 100644
--- a/src/libkeymap/analyze.l
+++ b/src/libkeymap/analyze.l
@@ -177,7 +177,7 @@ find_standard_incl_file(struct lk_ctx *ctx, char *s, struct kbdfile *fp)
i--;
pathname = kbdfile_get_pathname(ctx->stack[i]);
- if (kbdfile_find(s, include_dirpath1, include_suffixes, fp)) {
+ if (rc = kbdfile_find(s, include_dirpath1, include_suffixes, fp)) {
if ((rc = find_incl_file_near_fn(ctx, s, pathname, fp)) == -1)
return rc;
}
--
2.45.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] libkeymap: fix double kbdfile open
2024-05-17 22:30 [PATCH] libkeymap: fix double kbdfile open Sertonix
@ 2024-05-20 10:44 ` Alexey Gladkov
0 siblings, 0 replies; 2+ messages in thread
From: Alexey Gladkov @ 2024-05-20 10:44 UTC (permalink / raw)
To: Sertonix; +Cc: kbd
On Fri, May 17, 2024 at 10:30:11PM +0000, Sertonix wrote:
>
> 976867c3a84 (Rewrite libkbdfile library) changed kbdfile_find to error
> when the file descriptor was already opened. Make sure kbdfile_find
> isn't called again when kbdfile is found in include_dirpath1.
Applied. Thanks!
> Signed-off-by: Sertonix <sertonix@posteo.net>
> ---
> src/libkeymap/analyze.l | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l
> index 9c4c747..dd94206 100644
> --- a/src/libkeymap/analyze.l
> +++ b/src/libkeymap/analyze.l
> @@ -177,7 +177,7 @@ find_standard_incl_file(struct lk_ctx *ctx, char *s, struct kbdfile *fp)
> i--;
> pathname = kbdfile_get_pathname(ctx->stack[i]);
>
> - if (kbdfile_find(s, include_dirpath1, include_suffixes, fp)) {
> + if (rc = kbdfile_find(s, include_dirpath1, include_suffixes, fp)) {
> if ((rc = find_incl_file_near_fn(ctx, s, pathname, fp)) == -1)
> return rc;
> }
> --
> 2.45.1
>
>
--
Rgrds, legion
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-20 10:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-17 22:30 [PATCH] libkeymap: fix double kbdfile open Sertonix
2024-05-20 10:44 ` Alexey Gladkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox