Skip to content

Commit

Permalink
Update libcwrap.h for glibc 2.38
Browse files Browse the repository at this point in the history
  • Loading branch information
@th-otto
th-otto committed Dec 22, 2023
1 parent 3b327d2 commit f877881
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 34 deletions.
52 changes: 52 additions & 0 deletions include/linux/libcwrap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ extern "C" {
#endif
#define SYMVER(name, ver) SYMVER1(name, ver)

#include <features.h>

/*
* avoid references to __isoc23_strtol*,
* which are only available in glibc >= 2.38
*/
#undef __GLIBC_USE_C2X_STRTOL
#define __GLIBC_USE_C2X_STRTOL 0

#if defined(__i386__) || defined(__x86_64__)

/* Symbols redirected to earlier glibc versions */
Expand Down Expand Up @@ -131,6 +140,8 @@ SYMVER(exp2, GLIBC_2.2.5)
SYMVER(exp2f, GLIBC_2.2.5)
SYMVER(expf, GLIBC_2.2.5)
SYMVER(fmemopen, GLIBC_2.2.5)
SYMVER(fmod, GLIBC_2.2.5)
SYMVER(fmodf, GLIBC_2.2.5)
SYMVER(forkpty, GLIBC_2.2.5)
SYMVER(gai_cancel, GLIBC_2.2.5)
SYMVER(gai_error, GLIBC_2.2.5)
Expand Down Expand Up @@ -749,6 +760,38 @@ SYMVER(__iseqsigf128, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(__iseqsigl, GLIBC_DONT_USE_THIS_VERSION_2.25)
SYMVER(__isinff128, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(__isnanf128, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(__isoc23_fscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_fwscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_scanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_sscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoimax, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtol, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtol_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoll, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoll_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoul, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoul_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoull, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoull_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_strtoumax, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_swscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_vfscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_vfwscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_vscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_vsscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_vswscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_vwscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoimax, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstol, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstol_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoll, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoll_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoul, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoul_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoull, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoull_l, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wcstoumax, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__isoc23_wscanf, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__issignaling, GLIBC_DONT_USE_THIS_VERSION_2.18)
SYMVER(__issignalingf, GLIBC_DONT_USE_THIS_VERSION_2.18)
SYMVER(__issignalingf128, GLIBC_DONT_USE_THIS_VERSION_2.26)
Expand Down Expand Up @@ -809,6 +852,7 @@ SYMVER(__powf_finite, GLIBC_DONT_USE_THIS_VERSION_2.15)
SYMVER(__powl_finite, GLIBC_DONT_USE_THIS_VERSION_2.15)
#if defined(__i386__)
SYMVER(__ppoll64, GLIBC_DONT_USE_THIS_VERSION_2.34)
SYMVER(__ppoll64_chk, GLIBC_DONT_USE_THIS_VERSION_2.37)
#endif
SYMVER(__ppoll_chk, GLIBC_DONT_USE_THIS_VERSION_2.16)
#if defined(__i386__)
Expand Down Expand Up @@ -868,6 +912,8 @@ SYMVER(__sqrtl_finite, GLIBC_DONT_USE_THIS_VERSION_2.15)
#if defined(__i386__)
SYMVER(__stat64_time64, GLIBC_DONT_USE_THIS_VERSION_2.34)
#endif
SYMVER(__strlcat_chk, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__strlcpy_chk, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__strtof128_internal, GLIBC_DONT_USE_THIS_VERSION_2.26)
#if defined(__i386__)
SYMVER(__thrd_sleep64, GLIBC_DONT_USE_THIS_VERSION_2.34)
Expand All @@ -885,6 +931,8 @@ SYMVER(__utimes64, GLIBC_DONT_USE_THIS_VERSION_2.34)
SYMVER(__wait3_time64, GLIBC_DONT_USE_THIS_VERSION_2.34)
SYMVER(__wait4_time64, GLIBC_DONT_USE_THIS_VERSION_2.34)
#endif
SYMVER(__wcslcat_chk, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__wcslcpy_chk, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(__wcstof128_internal, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(__x86_get_cpuid_feature_leaf, GLIBC_DONT_USE_THIS_VERSION_2.33)
SYMVER(__y0_finite, GLIBC_DONT_USE_THIS_VERSION_2.15)
Expand Down Expand Up @@ -1689,6 +1737,8 @@ SYMVER(strfromf32x, GLIBC_DONT_USE_THIS_VERSION_2.27)
SYMVER(strfromf64, GLIBC_DONT_USE_THIS_VERSION_2.27)
SYMVER(strfromf64x, GLIBC_DONT_USE_THIS_VERSION_2.27)
SYMVER(strfroml, GLIBC_DONT_USE_THIS_VERSION_2.25)
SYMVER(strlcat, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(strlcpy, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(strtof128, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(strtof128_l, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(strtof32, GLIBC_DONT_USE_THIS_VERSION_2.27)
Expand Down Expand Up @@ -1768,6 +1818,8 @@ SYMVER(ufromfpxf32x, GLIBC_DONT_USE_THIS_VERSION_2.27)
SYMVER(ufromfpxf64, GLIBC_DONT_USE_THIS_VERSION_2.27)
SYMVER(ufromfpxf64x, GLIBC_DONT_USE_THIS_VERSION_2.27)
SYMVER(ufromfpxl, GLIBC_DONT_USE_THIS_VERSION_2.25)
SYMVER(wcslcat, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(wcslcpy, GLIBC_DONT_USE_THIS_VERSION_2.38)
SYMVER(wcstof128, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(wcstof128_l, GLIBC_DONT_USE_THIS_VERSION_2.26)
SYMVER(wcstof32, GLIBC_DONT_USE_THIS_VERSION_2.27)
Expand Down
40 changes: 40 additions & 0 deletions src/cp_st_km.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Codepage KEYBCS2
* for czech
* https://cs.wikipedia.org/wiki/K%C3%B3d_Kamenick%C3%BDch
* https://en.wikipedia.org/wiki/Kamenick%C3%BD_encoding
*/
static nls_wchar_t const atari_kamenicky_to_unicode[256] = {
/* 00 */ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
/* 08 */ 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
/* 10 */ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
/* 18 */ 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
/* 20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
/* 28 */ 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
/* 30 */ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
/* 38 */ 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
/* 40 */ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
/* 48 */ 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
/* 50 */ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
/* 58 */ 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
/* 60 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
/* 68 */ 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
/* 70 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
/* 78 */ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
/* 80 */ 0x010c, 0x00fc, 0x00e9, 0x010f, 0x00e4, 0x010e, 0x0164, 0x010d,
/* 88 */ 0x011b, 0x011a, 0x0139, 0x00cd, 0x013e, 0x013a, 0x00c4, 0x00c1,
/* 90 */ 0x00c9, 0x017e, 0x017d, 0x00f4, 0x00f6, 0x00d3, 0x016f, 0x00da,
/* 98 */ 0x00fd, 0x00d6, 0x00dc, 0x0160, 0x013d, 0x00dd, 0x0158, 0x0165,
/* a0 */ 0x00e1, 0x00ed, 0x00f3, 0x00fa, 0x0148, 0x0147, 0x016e, 0x00d4,
/* a8 */ 0x0161, 0x0159, 0x0155, 0x0154, 0x00bc, 0x00a1, 0x00ab, 0x00bb, /* 0xad should be 0xa7 (section sign) */
/* b0 */ 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
/* b8 */ 0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
/* c0 */ 0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f,
/* c8 */ 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
/* d0 */ 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b,
/* d8 */ 0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
/* e0 */ 0x03b1, 0x00df, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4,
/* e8 */ 0x03a6, 0x0398, 0x03a9, 0x03b4, 0x221e, 0x03c6, 0x03b5, 0x2229,
/* f0 */ 0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248,
/* f8 */ 0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0
};
35 changes: 1 addition & 34 deletions src/rscview.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1392,40 +1392,7 @@ static void print_version(void)

/* ------------------------------------------------------------------------- */

#if defined(__LINUX_GLIBC_WRAP_H)

/* ugly hack to get __libc_start_main versioned */

#if __GLIBC_PREREQ(2, 34)

#define STR_(s) #s
#define STR(s) STR_(s)
#include <dlfcn.h>

#ifdef __UCLIBC__
#define __libc_start_main __uClibc_main
#endif

int __libc_start_main(
int (*main)(int,char**,char**), int ac, char **av,
int (*init)(void), void (*fini)(void),
void (*rtld_fini)(void), void *stack_end);
int __libc_start_main(
int (*main)(int,char**,char**), int ac, char **av,
int (*init)(void), void (*fini)(void),
void (*rtld_fini)(void), void *stack_end)
{
typeof(__libc_start_main) *real_lsm;
if ((*(void**)&real_lsm = dlsym(RTLD_NEXT, STR(__libc_start_main))) != 0)
return real_lsm(main, ac, av, init, fini, rtld_fini, stack_end);
fputs("BUG: dlsym error\n", stderr);
return 1;
}
#undef STR
#undef STR_
#endif
#endif

#include "linux/libcmain.h"

int main(int argc, char **argv)
{
Expand Down

0 comments on commit f877881

Please sign in to comment.