diff --git a/proj/intercept/src/intercept.c b/proj/intercept/src/intercept.c index 041d009..c7d0f9c 100644 --- a/proj/intercept/src/intercept.c +++ b/proj/intercept/src/intercept.c @@ -82,38 +82,38 @@ extern int __real_ftruncate(int, off_t); #define ret_addr __builtin_return_address(0) -#define if_invalid(name) if (strcmp(buf, "ok") != 0) { fprintf(stderr, "intercept: %s: invalid command: '%s'\n", #name, buf); } +#define if_invalid(name) if (strcmp(msg_buf, "ok") != 0) { fprintf(stderr, "intercept: %s: invalid command: '%s'\n", #name, msg_buf); } -#define if_modify_int(name, type_1, var_1) if (strncmp(buf, "modify ", 7) == 0) { \ +#define if_modify_int(name, type_1, var_1) if (strncmp(msg_buf, "modify ", 7) == 0) { \ char *end_ptr = NULL; \ - long val = strtol(buf + 7, &end_ptr, 0); \ - if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != buf + 7) { \ + long val = strtol(msg_buf + 7, &end_ptr, 0); \ + if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != msg_buf + 7) { \ var_1 = (type_1)val; \ } else { \ - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", #name, buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", #name, msg_buf + 7); \ } } -#define if_modify_int_int(name, type_1, var_1, type_2, var_2) if (strncmp(buf, "modify ", 7) == 0) { \ +#define if_modify_int_int(name, type_1, var_1, type_2, var_2) if (strncmp(msg_buf, "modify ", 7) == 0) { \ char *end_ptr_1 = NULL, *end_ptr_2 = NULL; \ - long val_1 = strtol(buf + 7, &end_ptr_1, 0); \ + long val_1 = strtol(msg_buf + 7, &end_ptr_1, 0); \ long val_2 = 0; \ if (end_ptr_1 != NULL) val_2 = strtol(end_ptr_1 + 1, &end_ptr_2, 0); \ - if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != buf + 7 && \ + if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != msg_buf + 7 && \ end_ptr_2 != NULL && end_ptr_2[0] == 0 && end_ptr_2 != end_ptr_1 + 1) \ { \ var_1 = (type_1)val_1; \ var_2 = (type_2)val_2; \ } else { \ - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", #name, buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", #name, msg_buf + 7); \ } } -#define if_modify_int_int_int(name, type_1, var_1, type_2, var_2, type_3, var_3) if (strncmp(buf, "modify ", 7) == 0) { \ +#define if_modify_int_int_int(name, type_1, var_1, type_2, var_2, type_3, var_3) if (strncmp(msg_buf, "modify ", 7) == 0) { \ char *end_ptr_1 = NULL, *end_ptr_2 = NULL, *end_ptr_3; \ - long val_1 = strtol(buf + 7, &end_ptr_1, 0); \ + long val_1 = strtol(msg_buf + 7, &end_ptr_1, 0); \ long val_2 = 0, val_3 = 0; \ if (end_ptr_1 != NULL) val_2 = strtol(end_ptr_1 + 1, &end_ptr_2, 0); \ if (end_ptr_2 != NULL) val_3 = strtol(end_ptr_2 + 1, &end_ptr_3, 0); \ - if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != buf + 7 && \ + if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != msg_buf + 7 && \ end_ptr_2 != NULL && end_ptr_2[0] == ',' && end_ptr_2 != end_ptr_1 + 1 && \ end_ptr_3 != NULL && end_ptr_3[0] == 0 && end_ptr_3 != end_ptr_2 + 1) \ { \ @@ -121,155 +121,155 @@ extern int __real_ftruncate(int, off_t); var_2 = (type_2)val_2; \ var_3 = (type_3)val_3; \ } else { \ - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", #name, buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", #name, msg_buf + 7); \ } } -#define if_return if (strcmp(buf, "return") == 0) { \ +#define if_return if (strcmp(msg_buf, "return") == 0) { \ msg("return"); \ return; } -#define if_return_int(name) if (strncmp(buf, "return ", 7) == 0) { \ +#define if_return_int(name) if (strncmp(msg_buf, "return ", 7) == 0) { \ char *end_ptr = NULL; \ - long val = strtol(buf + 7, &end_ptr, 0); \ - if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != buf + 7) { \ + long val = strtol(msg_buf + 7, &end_ptr, 0); \ + if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != msg_buf + 7) { \ msg("return %i", val); \ return val; \ } else { \ - fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, msg_buf + 7); \ } } -#define if_return_int_errno(name) if (strncmp(buf, "return ", 7) == 0) { \ +#define if_return_int_errno(name) if (strncmp(msg_buf, "return ", 7) == 0) { \ char *end_ptr = NULL; \ - long val = strtol(buf + 7, &end_ptr, 0); \ - if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != buf + 7) { \ + long val = strtol(msg_buf + 7, &end_ptr, 0); \ + if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != msg_buf + 7) { \ msg("return %i; errno %s", val, strerrorname_np(errno)); \ return val; \ } else { \ - fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, msg_buf + 7); \ } } -#define if_return_int_errno_int(name, type_1, var_1, name_1) if (strncmp(buf, "return ", 7) == 0) { \ +#define if_return_int_errno_int(name, type_1, var_1, name_1) if (strncmp(msg_buf, "return ", 7) == 0) { \ char *end_ptr_1 = NULL, *end_ptr_2 = NULL; \ - long val_1 = strtol(buf + 7, &end_ptr_1, 0); \ + long val_1 = strtol(msg_buf + 7, &end_ptr_1, 0); \ long val_2 = 0; \ if (end_ptr_1 != NULL) val_2 = strtol(end_ptr_1 + 1, &end_ptr_2, 0); \ - if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != buf + 7 && \ + if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != msg_buf + 7 && \ end_ptr_2 != NULL && end_ptr_2[0] == 0 && end_ptr_2 != end_ptr_1 + 1) \ { \ var_1 = (type_1)val_2; \ msg("return %i; errno %s; %s=%i", val_1, strerrorname_np(errno), name_1, var_1); \ return val_1; \ } else { \ - fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, msg_buf + 7); \ } } -#define if_return_ptr_errno(name) if (strncmp(buf, "return ", 7) == 0) { \ +#define if_return_ptr_errno(name) if (strncmp(msg_buf, "return ", 7) == 0) { \ char *end_ptr = NULL; \ - long val = strtol(buf + 7, &end_ptr, 0); \ - if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != buf + 7) { \ + long val = strtol(msg_buf + 7, &end_ptr, 0); \ + if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != msg_buf + 7) { \ msg("return %p; errno %s", val, strerrorname_np(errno)); \ return (void *)val; \ } else { \ - fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in return command: '%s'\n", #name, msg_buf + 7); \ } } -#define if_error_1_ptr_errno(name, err1) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ +#define if_error_1_ptr_errno(name, err1) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %p; errno %s", NULL, strerrorname_np(errno)); \ return NULL; } -#define if_error_1_int_errno(name, err1) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ +#define if_error_1_int_errno(name, err1) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %i; errno %s", -1, strerrorname_np(errno)); \ return -1; } -#define if_error_2_int_errno(name, err1, err2) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ - } else if (strcmp(buf + 5, #err2) == 0) { errno = err2; \ +#define if_error_2_int_errno(name, err1, err2) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ + } else if (strcmp(msg_buf + 5, #err2) == 0) { errno = err2; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %i; errno %s", -1, strerrorname_np(errno)); \ return -1; } -#define if_error_3_int_errno(name, err1, err2, err3) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ - } else if (strcmp(buf + 5, #err2) == 0) { errno = err2; \ - } else if (strcmp(buf + 5, #err3) == 0) { errno = err3; \ +#define if_error_3_int_errno(name, err1, err2, err3) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ + } else if (strcmp(msg_buf + 5, #err2) == 0) { errno = err2; \ + } else if (strcmp(msg_buf + 5, #err3) == 0) { errno = err3; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %i; errno %s", -1, strerrorname_np(errno)); \ return -1; } -#define if_error_5_int_errno(name, err1, err2, err3, err4, err5) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ - } else if (strcmp(buf + 5, #err2) == 0) { errno = err2; \ - } else if (strcmp(buf + 5, #err3) == 0) { errno = err3; \ - } else if (strcmp(buf + 5, #err4) == 0) { errno = err4; \ - } else if (strcmp(buf + 5, #err5) == 0) { errno = err5; \ +#define if_error_5_int_errno(name, err1, err2, err3, err4, err5) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ + } else if (strcmp(msg_buf + 5, #err2) == 0) { errno = err2; \ + } else if (strcmp(msg_buf + 5, #err3) == 0) { errno = err3; \ + } else if (strcmp(msg_buf + 5, #err4) == 0) { errno = err4; \ + } else if (strcmp(msg_buf + 5, #err5) == 0) { errno = err5; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %i; errno %s", -1, strerrorname_np(errno)); \ return -1; } -#define if_error_7_int_errno(name, err1, err2, err3, err4, err5, err6, err7) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ - } else if (strcmp(buf + 5, #err2) == 0) { errno = err2; \ - } else if (strcmp(buf + 5, #err3) == 0) { errno = err3; \ - } else if (strcmp(buf + 5, #err4) == 0) { errno = err4; \ - } else if (strcmp(buf + 5, #err5) == 0) { errno = err5; \ - } else if (strcmp(buf + 5, #err6) == 0) { errno = err6; \ - } else if (strcmp(buf + 5, #err7) == 0) { errno = err7; \ +#define if_error_7_int_errno(name, err1, err2, err3, err4, err5, err6, err7) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ + } else if (strcmp(msg_buf + 5, #err2) == 0) { errno = err2; \ + } else if (strcmp(msg_buf + 5, #err3) == 0) { errno = err3; \ + } else if (strcmp(msg_buf + 5, #err4) == 0) { errno = err4; \ + } else if (strcmp(msg_buf + 5, #err5) == 0) { errno = err5; \ + } else if (strcmp(msg_buf + 5, #err6) == 0) { errno = err6; \ + } else if (strcmp(msg_buf + 5, #err7) == 0) { errno = err7; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %i; errno %s", -1, strerrorname_np(errno)); \ return -1; } -#define if_error_8_ptr_errno(name, err1, err2, err3, err4, err5, err6, err7, err8) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ - } else if (strcmp(buf + 5, #err2) == 0) { errno = err2; \ - } else if (strcmp(buf + 5, #err3) == 0) { errno = err3; \ - } else if (strcmp(buf + 5, #err4) == 0) { errno = err4; \ - } else if (strcmp(buf + 5, #err5) == 0) { errno = err5; \ - } else if (strcmp(buf + 5, #err6) == 0) { errno = err6; \ - } else if (strcmp(buf + 5, #err6) == 0) { errno = err7; \ - } else if (strcmp(buf + 5, #err8) == 0) { errno = err8; \ +#define if_error_8_ptr_errno(name, err1, err2, err3, err4, err5, err6, err7, err8) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ + } else if (strcmp(msg_buf + 5, #err2) == 0) { errno = err2; \ + } else if (strcmp(msg_buf + 5, #err3) == 0) { errno = err3; \ + } else if (strcmp(msg_buf + 5, #err4) == 0) { errno = err4; \ + } else if (strcmp(msg_buf + 5, #err5) == 0) { errno = err5; \ + } else if (strcmp(msg_buf + 5, #err6) == 0) { errno = err6; \ + } else if (strcmp(msg_buf + 5, #err6) == 0) { errno = err7; \ + } else if (strcmp(msg_buf + 5, #err8) == 0) { errno = err8; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %p; errno %s", NULL, strerrorname_np(errno)); \ return NULL; } -#define if_error_10_map_errno(name, err1, err2, err3, err4, err5, err6, err7, err8, err9, err10) if (strncmp(buf, "fail ", 5) == 0) { \ - if (strcmp(buf + 5, #err1) == 0) { errno = err1; \ - } else if (strcmp(buf + 5, #err2) == 0) { errno = err2; \ - } else if (strcmp(buf + 5, #err3) == 0) { errno = err3; \ - } else if (strcmp(buf + 5, #err4) == 0) { errno = err4; \ - } else if (strcmp(buf + 5, #err5) == 0) { errno = err5; \ - } else if (strcmp(buf + 5, #err6) == 0) { errno = err6; \ - } else if (strcmp(buf + 5, #err7) == 0) { errno = err7; \ - } else if (strcmp(buf + 5, #err8) == 0) { errno = err8; \ - } else if (strcmp(buf + 5, #err9) == 0) { errno = err9; \ - } else if (strcmp(buf + 5, #err10) == 0) { errno = err10; \ +#define if_error_10_map_errno(name, err1, err2, err3, err4, err5, err6, err7, err8, err9, err10) if (strncmp(msg_buf, "fail ", 5) == 0) { \ + if (strcmp(msg_buf + 5, #err1) == 0) { errno = err1; \ + } else if (strcmp(msg_buf + 5, #err2) == 0) { errno = err2; \ + } else if (strcmp(msg_buf + 5, #err3) == 0) { errno = err3; \ + } else if (strcmp(msg_buf + 5, #err4) == 0) { errno = err4; \ + } else if (strcmp(msg_buf + 5, #err5) == 0) { errno = err5; \ + } else if (strcmp(msg_buf + 5, #err6) == 0) { errno = err6; \ + } else if (strcmp(msg_buf + 5, #err7) == 0) { errno = err7; \ + } else if (strcmp(msg_buf + 5, #err8) == 0) { errno = err8; \ + } else if (strcmp(msg_buf + 5, #err9) == 0) { errno = err9; \ + } else if (strcmp(msg_buf + 5, #err10) == 0) { errno = err10; \ } else { \ errno = 0; \ - fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, buf + 5); \ + fprintf(stderr, "intercept: %s: invalid error code in fail command: '%s'\n", #name, msg_buf + 5); \ } \ msg("return %i; errno %s", MAP_FAILED, strerrorname_np(errno)); \ return MAP_FAILED; } @@ -574,8 +574,8 @@ void *sym(malloc)(size_t size) { init(); msg("malloc(%li): %p", size, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(malloc, size_t, size) else if_return_ptr_errno(malloc) else if_error_1_ptr_errno(malloc, ENOMEM) @@ -590,8 +590,8 @@ void *sym(calloc)(size_t nmemb, size_t size) { init(); msg("calloc(%li, %li): %p", nmemb, size, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int_int(calloc, size_t, nmemb, size_t, size) else if_return_ptr_errno(calloc) else if_error_1_ptr_errno(calloc, ENOMEM) @@ -606,8 +606,8 @@ void *sym(realloc)(void *ptr, size_t size) { init(); msg("realloc(%p, %li): %p", ptr, size, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int_int(realloc, void *, ptr, size_t, size) else if_return_ptr_errno(realloc) else if_error_1_ptr_errno(realloc, ENOMEM) @@ -622,8 +622,8 @@ void *sym(reallocarray)(void *ptr, size_t nmemb, size_t size) { init(); msg("reallocarray(%p, %li): %p", ptr, size, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int_int_int(reallocarray, void *, ptr, size_t, nmemb, size_t, size) else if_return_ptr_errno(reallocarray) else if_error_1_ptr_errno(reallocarray, ENOMEM) @@ -638,8 +638,8 @@ void sym(free)(void *ptr) { init(); msg("free(%p): %p", ptr, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(free, void *, ptr) else if_return else if_invalid(free) @@ -652,9 +652,9 @@ int sym(getopt)(const int argc, char *const argv[], const char *shortopts) { init(); msg("getopt(%i, %as, %es): %p", argc, argv, argc, shortopts, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { // modify ,, // TODO getopt modify fprintf(stderr, "intercept: %s: modify command not implemented\n", "getopt"); @@ -670,8 +670,8 @@ void sym(exit)(int status) { init(); msg("exit(%i): %p", status, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int("exit", int, status) else if_invalid(getopt) } @@ -682,8 +682,8 @@ int sym(close)(int fildes) { init(); msg("close(%i): %p", fildes, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(close, int, fildes) else if_return_int_errno(close) else if_error_3_int_errno(close, EBADF, EINTR, EIO) @@ -756,12 +756,12 @@ int sym(sigaction)(int sig, const struct sigaction *restrict act, struct sigacti msg("sigaction(%i:%s, %p:{}, %p): %p", sig, sigstr, act, oact, ret_addr); } if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { // TODO sigaction modify fprintf(stderr, "intercept: %s: modify command not implemented\n", "sigaction"); - } else if (strncmp(buf, "return ", 7) == 0) { + } else if (strncmp(msg_buf, "return ", 7) == 0) { // TODO sigaction return fprintf(stderr, "intercept: %s: return command not implemented\n", "sigaction"); } else if_error_1_int_errno(sigaction, EINVAL) @@ -798,8 +798,8 @@ int sym(sem_init)(sem_t *sem, int pshared, unsigned int value) { init(); msg("sem_init(%p, %i, %u): %p", sem, pshared, value, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int_int_int(sem_init, sem_t *, sem, int, pshared, unsigned int, value) else if_return_int_errno(sem_init) else if_error_2_int_errno(sem_init, EINVAL, ENOSYS) @@ -832,20 +832,20 @@ sem_t *sym(sem_open)(const char *name, int oflag, ...) { char overwrite[BUFFER_SIZE]; if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { // modify , // modify ,,, char *val_1 = NULL, *end_ptr_1 = NULL, *end_ptr_2 = NULL, *end_ptr_3 = NULL, *end_ptr_4 = NULL; long val_2 = 0, val_3 = 0, val_4 = 0; - if (buf[7] == '"') { + if (msg_buf[7] == '"') { // modify "",... - val_1 = strtostr(buf + 7, &end_ptr_1, overwrite); + val_1 = strtostr(msg_buf + 7, &end_ptr_1, overwrite); if (val_1 == NULL) end_ptr_1 = NULL; } else { // modify ,... - val_1 = (char *)strtol(buf + 7, &end_ptr_1, 0); + val_1 = (char *)strtol(msg_buf + 7, &end_ptr_1, 0); } if (end_ptr_1 != NULL && end_ptr_1[0] != 0) { if (end_ptr_1[1] == '|') { @@ -866,7 +866,7 @@ sem_t *sym(sem_open)(const char *name, int oflag, ...) { if (end_ptr_2 != NULL && end_ptr_2[0] != 0) val_3 = strtol(end_ptr_2 + 1, &end_ptr_3, 0); if (end_ptr_3 != NULL && end_ptr_3[0] != 0) val_4 = strtol(end_ptr_3 + 1, &end_ptr_4, 0); - if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != buf + 7 && + if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != msg_buf + 7 && end_ptr_2 != NULL && (end_ptr_2[0] == 0 || end_ptr_2[0] == ',') && end_ptr_2 != end_ptr_1 + 1 && (end_ptr_2[0] == 0 || (end_ptr_3 != NULL && end_ptr_3[0] == ',' && end_ptr_3 != end_ptr_2 + 1 && end_ptr_4 != NULL && end_ptr_4[0] == 0 && end_ptr_4 != end_ptr_3 + 1))) @@ -878,7 +878,7 @@ sem_t *sym(sem_open)(const char *name, int oflag, ...) { value = val_4; } } else { - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "sem_open", buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "sem_open", msg_buf + 7); \ } } else if_return_ptr_errno(sem_open) else if_error_8_ptr_errno(sem_open, EACCES, EEXIST, EINVAL, EMFILE, ENAMETOOLONG, ENFILE, ENOENT, ENOMEM) @@ -899,8 +899,8 @@ int sym(sem_post)(sem_t *sem) { init(); msg("sem_post(%p): %p", sem, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(sem_post, sem_t *, sem) else if_return_int_errno(sem_post) else if_error_2_int_errno(sem_post, EINVAL, EOVERFLOW) @@ -915,8 +915,8 @@ int sym(sem_wait)(sem_t *sem) { init(); msg("sem_wait(%p): %p", sem, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(sem_wait, sem_t *, sem) else if_return_int_errno(sem_wait) else if_error_2_int_errno(sem_wait, EINTR, EINVAL) @@ -931,8 +931,8 @@ int sym(sem_trywait)(sem_t *sem) { init(); msg("sem_trywait(%p): %p", sem, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(sem_trywait, sem_t *, sem) else if_return_int_errno(sem_trywait) else if_error_3_int_errno(sem_trywait, EAGAIN, EINTR, EINVAL) @@ -948,13 +948,13 @@ int sym(sem_timedwait)(sem_t *restrict sem, const struct timespec *restrict abs_ msg("sem_timedwait(%p, %p:{tv_sec: %li, tv_nsec: %li}): %p", sem, abs_timeout, abs_timeout->tv_sec, abs_timeout->tv_nsec, ret_addr); struct timespec overwrite; if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { // modfiy , // modify ,{,} char *end_ptr_1 = NULL, *end_ptr_2 = NULL, *end_ptr_3 = NULL; - long val_1 = strtol(buf + 7, &end_ptr_1, 0); + long val_1 = strtol(msg_buf + 7, &end_ptr_1, 0); struct timespec *val_2 = 0; if (end_ptr_1 != NULL && end_ptr_1[0] != 0) { if (end_ptr_1[1] == '{') { @@ -971,13 +971,13 @@ int sym(sem_timedwait)(sem_t *restrict sem, const struct timespec *restrict abs_ val_2 = (void *)strtol(end_ptr_1 + 1, &end_ptr_2, 0); } } - if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != buf + 7 && + if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != msg_buf + 7 && end_ptr_2 != NULL && end_ptr_2[0] == 0 && end_ptr_2 != end_ptr_1 + 1) { sem = (sem_t *)val_1; abs_timeout = val_2; } else { - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "sem_timedwait", buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "sem_timedwait", msg_buf + 7); \ } } else if_return_int_errno(sem_timedwait) else if_error_3_int_errno(sem_timedwait, EINTR, EINVAL, ETIMEDOUT) @@ -992,8 +992,8 @@ int sym(sem_getvalue)(sem_t *restrict sem, int *restrict value) { init(); msg("sem_getvalue(%p, %p): %p", sem, value, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int_int(sem_getvalue, sem_t *, sem, int *, value) else if_return_int_errno_int(sem_getvalue, int, *value, "value") else if_error_1_int_errno(sem_getvalue, EINVAL) @@ -1012,8 +1012,8 @@ int sym(sem_close)(sem_t *sem) { init(); msg("sem_close(%p): %p", sem, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(sem_close, sem_t *, sem) else if_return_int_errno(sem_close) else if_error_1_int_errno(sem_close, EINVAL) @@ -1029,22 +1029,22 @@ int sym(sem_unlink)(const char *name) { msg("sem_unlink(%es): %p", name, ret_addr); char overwrite[BUFFER_SIZE]; if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { char *end_ptr = NULL, *val = NULL; - if (buf[7] == '"') { + if (msg_buf[7] == '"') { // modify "" - val = strtostr(buf + 7, &end_ptr, overwrite); + val = strtostr(msg_buf + 7, &end_ptr, overwrite); if (val == NULL) end_ptr = NULL; } else { // modify - val = (char *)strtol(buf + 7, &end_ptr, 0); + val = (char *)strtol(msg_buf + 7, &end_ptr, 0); } - if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != buf + 7) { + if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != msg_buf + 7) { name = val; } else { - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "sem_unlink", buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "sem_unlink", msg_buf + 7); \ } } else if_return_int_errno(sem_unlink) else if_error_3_int_errno(sem_unlink, EACCES, ENAMETOOLONG, ENOENT) @@ -1059,8 +1059,8 @@ int sym(sem_destroy)(sem_t *sem) { init(); msg("sem_destroy(%p): %p", sem, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int(sem_destroy, sem_t *, sem) else if_return_int_errno(sem_destroy) else if_error_1_int_errno(sem_destroy, EINVAL) @@ -1084,19 +1084,19 @@ int sym(shm_open)(const char *name, int oflag, mode_t mode_arg) { msg("shm_open(%es, 0%o:%s, 0%03o): %p", name, oflag, ostr, mode_arg, ret_addr); char overwrite[BUFFER_SIZE]; if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { // modify ,, char *val_1 = NULL, *end_ptr_1 = NULL, *end_ptr_2 = NULL, *end_ptr_3 = NULL; long val_2 = 0, val_3 = 0; - if (buf[7] == '"') { + if (msg_buf[7] == '"') { // modify "",... - val_1 = strtostr(buf + 7, &end_ptr_1, overwrite); + val_1 = strtostr(msg_buf + 7, &end_ptr_1, overwrite); if (val_1 == NULL) end_ptr_1 = NULL; } else { // modify ,... - val_1 = (char *)strtol(buf + 7, &end_ptr_1, 0); + val_1 = (char *)strtol(msg_buf + 7, &end_ptr_1, 0); } if (end_ptr_1 != NULL && end_ptr_1[0] != 0) { if (end_ptr_1[1] == '|') { @@ -1128,7 +1128,7 @@ int sym(shm_open)(const char *name, int oflag, mode_t mode_arg) { } if (end_ptr_2 != NULL && end_ptr_2[0] != 0) val_3 = strtol(end_ptr_2 + 1, &end_ptr_3, 0); - if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != buf + 7 && + if (end_ptr_1 != NULL && end_ptr_1[0] == ',' && end_ptr_1 != msg_buf + 7 && end_ptr_2 != NULL && end_ptr_2[0] == ',' && end_ptr_2 != end_ptr_1 + 1 && end_ptr_3 != NULL && end_ptr_3[0] == 0 && end_ptr_3 != end_ptr_2 + 1) { @@ -1136,7 +1136,7 @@ int sym(shm_open)(const char *name, int oflag, mode_t mode_arg) { oflag = (int)val_2; mode_arg = val_3; } else { - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "shm_open", buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "shm_open", msg_buf + 7); \ } } else if_return_int_errno(shm_open) else if_error_7_int_errno(shm_open, EACCES, EEXIST, EINVAL, EMFILE, ENAMETOOLONG, ENFILE, ENOENT) @@ -1152,22 +1152,22 @@ int sym(shm_unlink)(const char *name) { msg("shm_unlink(%es): %p", name, ret_addr); char overwrite[BUFFER_SIZE]; if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { char *end_ptr = NULL, *val = NULL; - if (buf[7] == '"') { + if (msg_buf[7] == '"') { // modify "" - val = strtostr(buf + 7, &end_ptr, overwrite); + val = strtostr(msg_buf + 7, &end_ptr, overwrite); if (val == NULL) end_ptr = NULL; } else { // modify - val = (char *)strtol(buf + 7, &end_ptr, 0); + val = (char *)strtol(msg_buf + 7, &end_ptr, 0); } - if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != buf + 7) { + if (end_ptr != NULL && end_ptr[0] == 0 && end_ptr != msg_buf + 7) { name = val; } else { - fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "shm_unlink", buf + 7); \ + fprintf(stderr, "intercept: %s: invalid args in modify command: '%s'\n", "shm_unlink", msg_buf + 7); \ } } else if_return_int_errno(shm_unlink) else if_error_3_int_errno(shm_unlink, EACCES, ENAMETOOLONG, ENOENT) @@ -1195,9 +1195,9 @@ void *sym(mmap)(void *addr, size_t len, int prot, int flags, int fildes, off_t o msg("mmap(%p, %i, 0x%x:%s, %0x%x:%s, %i, %i): %p", addr, len, prot, pstr, flags, fstr, fildes, off, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); - if (strncmp(buf, "modify ", 7) == 0) { + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); + if (strncmp(msg_buf, "modify ", 7) == 0) { // TODO mmap modify fprintf(stderr, "intercept: %s: modify command not implemented\n", "mmap"); } else if_return_ptr_errno(mmap) @@ -1213,8 +1213,8 @@ int sym(munmap)(void *addr, size_t len) { init(); msg("munmap(%p, %i): %p", addr, len, ret_addr); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int_int(munmap, void *, addr, size_t, len) else if_return_int_errno(munmap) else if_error_1_int_errno(munmap, EINVAL) @@ -1229,8 +1229,8 @@ int sym(ftruncate)(int fildes, off_t length) { init(); msg("ftruncate(%i, %i): %p", fildes, length); if (mode >= 4) { - char buf[BUFFER_SIZE]; - rcv(buf, sizeof(buf)); + char msg_buf[BUFFER_SIZE]; + rcv(msg_buf, sizeof(msg_buf)); if_modify_int_int(ftruncate, int, fildes, off_t, length) else if_return_int_errno(ftruncate) else if_error_5_int_errno(ftruncate, EINTR, EINVAL, EFBIG, EIO, EBADF)