Skip to content

Switch to GNU basename in ffi.util#804

Merged
NiLuJe merged 3 commits into
koreader:masterfrom
NiLuJe:master
Feb 7, 2019
Merged

Switch to GNU basename in ffi.util#804
NiLuJe merged 3 commits into
koreader:masterfrom
NiLuJe:master

Conversation

@NiLuJe

@NiLuJe NiLuJe commented Feb 7, 2019

Copy link
Copy Markdown
Member

The POSIX variant is unavailable on Android (c.f., #4543).

Fix koreader/koreader#4543

@NiLuJe

NiLuJe commented Feb 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Member Author

Note that, even in C, it's potentially tricky to end up with the GNU version:

NOTES
       There are two different versions of basename() - the POSIX version described above, and the GNU version, which one gets after

               #define _GNU_SOURCE         /* See feature_test_macros(7) */
               #include <string.h>

       The GNU version never modifies its argument, and returns the empty string when path has a trailing slash, and in particular also when it is "/".  There is no GNU version of dirname().

       With glibc, one gets the POSIX version of basename() when <libgen.h> is included, and the GNU version otherwise.

i.e., Even w/ _GNU_SOURCE, if you include <libgen.h>, which you need for dirname, you're screwed without a bit of extra hackiness

Frenzie
Frenzie reviewed Feb 7, 2019
View reviewed changes
Comment thread ffi-cdecl/posix_decl.c Outdated
@NiLuJe

NiLuJe commented Feb 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Member Author

Done ;).

Took the opportunity to switch lpeg to a mirror, as upstream still appears to be down.

@Frenzie

Frenzie commented Feb 7, 2019

Copy link
Copy Markdown
Member

Does Gentoo also keep older versions around?

@Frenzie

Frenzie commented Feb 7, 2019

Copy link
Copy Markdown
Member

Anyway, lgtm.

@NiLuJe

NiLuJe commented Feb 7, 2019

Copy link
Copy Markdown
Member Author

Yeah, the distfiles mirrors keep the files mirrored as long as there's an ebuild in the tree matching that version.

@NiLuJe

NiLuJe commented Feb 7, 2019

Copy link
Copy Markdown
Member Author

(Note to self: rebase).

NiLuJe added 3 commits February 8, 2019 00:14
@NiLuJe
Switch to GNU basename in ffi.util
06b3329 
The POSIX variant is unavailable on Android (c.f., #4543).
@NiLuJe
Switch lpeg to a mirror, as upstream appears to be down
227b4f6
@NiLuJe
Bump FBInk to v1.10.2
2da27c7 
Because apparently moving submodules broke checkouts on older tags?
@NiLuJe NiLuJe merged commit 99fefe3 into koreader:master Feb 7, 2019
@NiLuJe NiLuJe mentioned this pull request Jun 16, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Frenzie Frenzie Frenzie left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@NiLuJe @Frenzie