diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2022-10-23 15:51:28 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2022-10-23 17:20:31 +0200 |
commit | a86c4fe93f130752a862ff0a5ee75f073c3586b1 (patch) | |
tree | 30a4b67b1450fe22831196a435781219b8ba26e7 /src/libtracelog | |
parent | include limits.h instead of manually defining LINE_MAX (diff) | |
download | firejail-a86c4fe93f130752a862ff0a5ee75f073c3586b1.tar.gz firejail-a86c4fe93f130752a862ff0a5ee75f073c3586b1.tar.zst firejail-a86c4fe93f130752a862ff0a5ee75f073c3586b1.zip |
check for availability of symbols instead of glibc defines
in musl they are just redefines of the non-64 versions
Diffstat (limited to 'src/libtracelog')
-rw-r--r-- | src/libtracelog/libtracelog.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c index 760ac7612..fc2eba638 100644 --- a/src/libtracelog/libtracelog.c +++ b/src/libtracelog/libtracelog.c | |||
@@ -39,8 +39,6 @@ | |||
39 | // break recursivity on fopen call | 39 | // break recursivity on fopen call |
40 | typedef FILE *(*orig_fopen_t)(const char *pathname, const char *mode); | 40 | typedef FILE *(*orig_fopen_t)(const char *pathname, const char *mode); |
41 | static orig_fopen_t orig_fopen = NULL; | 41 | static orig_fopen_t orig_fopen = NULL; |
42 | typedef FILE *(*orig_fopen64_t)(const char *pathname, const char *mode); | ||
43 | static orig_fopen64_t orig_fopen64 = NULL; | ||
44 | 42 | ||
45 | // | 43 | // |
46 | // blacklist storage | 44 | // blacklist storage |
@@ -405,7 +403,9 @@ FILE *fopen(const char *pathname, const char *mode) { | |||
405 | return rv; | 403 | return rv; |
406 | } | 404 | } |
407 | 405 | ||
408 | #ifdef __GLIBC__ | 406 | #ifndef fopen64 |
407 | typedef FILE *(*orig_fopen64_t)(const char *pathname, const char *mode); | ||
408 | static orig_fopen64_t orig_fopen64 = NULL; | ||
409 | FILE *fopen64(const char *pathname, const char *mode) { | 409 | FILE *fopen64(const char *pathname, const char *mode) { |
410 | #ifdef DEBUG | 410 | #ifdef DEBUG |
411 | printf("%s %s\n", __FUNCTION__, pathname); | 411 | printf("%s %s\n", __FUNCTION__, pathname); |
@@ -420,7 +420,7 @@ FILE *fopen64(const char *pathname, const char *mode) { | |||
420 | FILE *rv = orig_fopen64(pathname, mode); | 420 | FILE *rv = orig_fopen64(pathname, mode); |
421 | return rv; | 421 | return rv; |
422 | } | 422 | } |
423 | #endif /* __GLIBC__ */ | 423 | #endif |
424 | 424 | ||
425 | 425 | ||
426 | // freopen | 426 | // freopen |
@@ -441,7 +441,7 @@ FILE *freopen(const char *pathname, const char *mode, FILE *stream) { | |||
441 | return rv; | 441 | return rv; |
442 | } | 442 | } |
443 | 443 | ||
444 | #ifdef __GLIBC__ | 444 | #ifndef freopen64 |
445 | typedef FILE *(*orig_freopen64_t)(const char *pathname, const char *mode, FILE *stream); | 445 | typedef FILE *(*orig_freopen64_t)(const char *pathname, const char *mode, FILE *stream); |
446 | static orig_freopen64_t orig_freopen64 = NULL; | 446 | static orig_freopen64_t orig_freopen64 = NULL; |
447 | FILE *freopen64(const char *pathname, const char *mode, FILE *stream) { | 447 | FILE *freopen64(const char *pathname, const char *mode, FILE *stream) { |
@@ -458,7 +458,7 @@ FILE *freopen64(const char *pathname, const char *mode, FILE *stream) { | |||
458 | FILE *rv = orig_freopen64(pathname, mode, stream); | 458 | FILE *rv = orig_freopen64(pathname, mode, stream); |
459 | return rv; | 459 | return rv; |
460 | } | 460 | } |
461 | #endif /* __GLIBC__ */ | 461 | #endif |
462 | 462 | ||
463 | // unlink | 463 | // unlink |
464 | typedef int (*orig_unlink_t)(const char *pathname); | 464 | typedef int (*orig_unlink_t)(const char *pathname); |
@@ -565,7 +565,7 @@ int stat(const char *pathname, struct stat *buf) { | |||
565 | return rv; | 565 | return rv; |
566 | } | 566 | } |
567 | 567 | ||
568 | #ifdef __GLIBC__ | 568 | #ifndef stat64 |
569 | typedef int (*orig_stat64_t)(const char *pathname, struct stat64 *buf); | 569 | typedef int (*orig_stat64_t)(const char *pathname, struct stat64 *buf); |
570 | static orig_stat64_t orig_stat64 = NULL; | 570 | static orig_stat64_t orig_stat64 = NULL; |
571 | int stat64(const char *pathname, struct stat64 *buf) { | 571 | int stat64(const char *pathname, struct stat64 *buf) { |
@@ -582,7 +582,7 @@ int stat64(const char *pathname, struct stat64 *buf) { | |||
582 | int rv = orig_stat64(pathname, buf); | 582 | int rv = orig_stat64(pathname, buf); |
583 | return rv; | 583 | return rv; |
584 | } | 584 | } |
585 | #endif /* __GLIBC__ */ | 585 | #endif |
586 | 586 | ||
587 | typedef int (*orig_lstat_t)(const char *pathname, struct stat *buf); | 587 | typedef int (*orig_lstat_t)(const char *pathname, struct stat *buf); |
588 | static orig_lstat_t orig_lstat = NULL; | 588 | static orig_lstat_t orig_lstat = NULL; |
@@ -601,7 +601,7 @@ int lstat(const char *pathname, struct stat *buf) { | |||
601 | return rv; | 601 | return rv; |
602 | } | 602 | } |
603 | 603 | ||
604 | #ifdef __GLIBC__ | 604 | #ifndef lstat64 |
605 | typedef int (*orig_lstat64_t)(const char *pathname, struct stat64 *buf); | 605 | typedef int (*orig_lstat64_t)(const char *pathname, struct stat64 *buf); |
606 | static orig_lstat64_t orig_lstat64 = NULL; | 606 | static orig_lstat64_t orig_lstat64 = NULL; |
607 | int lstat64(const char *pathname, struct stat64 *buf) { | 607 | int lstat64(const char *pathname, struct stat64 *buf) { |
@@ -618,7 +618,7 @@ int lstat64(const char *pathname, struct stat64 *buf) { | |||
618 | int rv = orig_lstat64(pathname, buf); | 618 | int rv = orig_lstat64(pathname, buf); |
619 | return rv; | 619 | return rv; |
620 | } | 620 | } |
621 | #endif /* __GLIBC__ */ | 621 | #endif |
622 | 622 | ||
623 | // access | 623 | // access |
624 | typedef int (*orig_access_t)(const char *pathname, int mode); | 624 | typedef int (*orig_access_t)(const char *pathname, int mode); |