Skip to content

Patch libedit to ignore missing history cookie #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Patch libedit to ignore missing history cookie #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e1bba0
Patch libedit to ignore missing history cookie
kai-franz Apr 22, 2025
a3a8fdd
Lint
kai-franz Apr 22, 2025
bab1b35
Add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to gflags
kai-franz Apr 23, 2025
d681207
Set DCMAKE_POLICY_VERSION_MINIMUM=3.5 for all cmake builds
kai-franz Apr 23, 2025
16793b1
Remove DCMAKE_POLICY_VERSION_MINIMUM
kai-franz Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions patches/libedit-ignore-missing-cookie.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/src/history.c b/src/history.c
index 2a8ca1a..71b3fbe 100644
--- a/src/history.c
+++ b/src/history.c
@@ -793,13 +793,12 @@ history_load(TYPE(History) *h, const char *fname)
if ((sz = getline(&line, &llen, fp)) == -1)
goto done;

- if (strncmp(line, hist_cookie, (size_t)sz) != 0)
- goto done;
-
ptr = h_malloc((max_size = 1024) * sizeof(*ptr));
if (ptr == NULL)
goto done;
- for (i = 0; (sz = getline(&line, &llen, fp)) != -1; i++) {
+ for (i = 0; (sz = getline(&line, &llen, fp)) != -1;) {
+ if (i == 0 && strncmp(line, hist_cookie, (size_t)sz) != 0)
+ continue;
if (sz > 0 && line[sz - 1] == '\n')
line[--sz] = '\0';
if (max_size < (size_t)sz) {
@@ -820,6 +819,7 @@ history_load(TYPE(History) *h, const char *fname)
i = -1;
goto oomem;
}
+ i++;
}
oomem:
h_free(ptr);
1 change: 1 addition & 0 deletions python/build_definitions/libedit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def __init__(self) -> None:
url_pattern='https://github.com/yugabyte/libedit/archive/libedit-{}.tar.gz',
build_group=BuildGroup.POTENTIALLY_INSTRUMENTED)
self.copy_sources = True
self.patches = ['libedit-ignore-missing-cookie.patch']

def get_additional_compiler_flags(self, builder: BuilderInterface) -> List[str]:
flags = ['-I%s' % os.path.join(builder.prefix_include, 'ncurses')]
Expand Down
Loading