From bb2cd672e8b8841d93f702d7717fc4daed008793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= Date: Sat, 2 Jan 2021 03:08:35 +0200 Subject: [PATCH] [preload] Seperate logging from executing for open* calls --- scratchbox2/preload/vperm_filestatgates.c | 44 ++++++++++------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/scratchbox2/preload/vperm_filestatgates.c b/scratchbox2/preload/vperm_filestatgates.c index b14aff7e..4939a9e4 100644 --- a/scratchbox2/preload/vperm_filestatgates.c +++ b/scratchbox2/preload/vperm_filestatgates.c @@ -1156,36 +1156,30 @@ static int vperm_multiopen( { FILE *f = NULL; - - if (open_2_ptr) { - if (log_enabled) { - SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(path='%s',flags=0x%X)", - __func__, realfnname, pathname, flags); - } + if (log_enabled) { + if (open_2_ptr) + SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(path='%s',flags=0x%X)", + __func__, realfnname, pathname, flags); + if (open_2va_ptr) + SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(path='%s',flags=0x%X,mode=0%o)", + __func__, realfnname, pathname, flags, modebits); + + if (openat_3_ptr) + SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(dirfd=%d,path='%s',flags=0x%X)", + __func__, realfnname, dirfd, pathname, flags); + if (open_3va_ptr) + SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(dirfd=%d,path='%s',flags=0x%X,mode=0%o)", + __func__, realfnname, dirfd, pathname, flags, modebits); + } + if (open_2_ptr) return ((*open_2_ptr)(pathname, flags)); - } - if (open_2va_ptr) { - if (log_enabled) { - SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(path='%s',flags=0x%X,mode=0%o)", - __func__, realfnname, pathname, flags, modebits); - } + if (open_2va_ptr) return ((*open_2va_ptr)(pathname, flags, modebits)); - } - if (openat_3_ptr) { - if (log_enabled) { - SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(dirfd=%d,path='%s',flags=0x%X)", - __func__, realfnname, dirfd, pathname, flags); - } + if (openat_3_ptr) return ((*openat_3_ptr)(dirfd, pathname, flags)); - } - if (open_3va_ptr) { - if (log_enabled) { - SB_LOG(SB_LOGLEVEL_DEBUG, "%s: fd=%s(dirfd=%d,path='%s',flags=0x%X,mode=0%o)", - __func__, realfnname, dirfd, pathname, flags, modebits); - } + if (open_3va_ptr) return ((*open_3va_ptr)(dirfd, pathname, flags, modebits)); - } if (creat_ptr) { if (log_enabled) {