From 0a0191bc7031dc9417818a3c8066ba4c1eacb9d8 Mon Sep 17 00:00:00 2001 From: Theron Date: Sat, 27 Jun 2020 15:41:04 -0500 Subject: fix fgetc() call --- src/armv7l/registers.c | 4 ---- src/attach.c | 5 ++--- src/x86_64/registers.c | 4 ---- whatfiles.geany | 23 ++++++++++++----------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/armv7l/registers.c b/src/armv7l/registers.c index 51ed46d..cc3cdf5 100644 --- a/src/armv7l/registers.c +++ b/src/armv7l/registers.c @@ -25,10 +25,6 @@ void check_syscall(pid_t current_pid, void *registers, HashMap map) size_t index; HashError err = find_index(current_pid, map, &index); if (err) DEBUG("unknown pid %d, syscall %ld\n", current_pid, regs->ARM_r7); - // struct String *proc_string = err ? NULL : &map->names[index]; - // char *proc_name = proc_string && proc_string->data && *proc_string->data - // ? proc_string->data - // : "[unknown]"; switch (regs->ARM_r7) { diff --git a/src/attach.c b/src/attach.c index 5a86994..7aad391 100644 --- a/src/attach.c +++ b/src/attach.c @@ -16,10 +16,9 @@ void read_file(struct String *str, size_t size, FILE *file) { - char c; + int c; for (size_t read = 0; read < size && (c = fgetc(file)) != EOF; read++) { - if (c == 255) break; // necessary on Raspbian, not sure why fgetc doesn't seem to return EOF == 0xffffffff for /proc/[PID]/comm - append_char(c, str); + append_char((char)c, str); } } diff --git a/src/x86_64/registers.c b/src/x86_64/registers.c index 3073d50..badc0c1 100644 --- a/src/x86_64/registers.c +++ b/src/x86_64/registers.c @@ -24,10 +24,6 @@ void check_syscall(pid_t current_pid, void *registers, HashMap map) size_t index; HashError err = find_index(current_pid, map, &index); if (err) DEBUG("unknown pid %d, syscall %lld\n", current_pid, regs->orig_rax); - // struct String *proc_string = err ? NULL : &map->names[index]; - // char *proc_name = proc_string && proc_string->data && *proc_string->data - // ? proc_string->data - // : "[unknown]"; switch (regs->orig_rax) { diff --git a/whatfiles.geany b/whatfiles.geany index 6ae4ba0..1810791 100644 --- a/whatfiles.geany +++ b/whatfiles.geany @@ -28,20 +28,21 @@ long_line_behaviour=1 long_line_column=72 [files] -current_page=8 -FILE_NAME_0=0;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Farmv7l%2Fregisters.c;0;4 -FILE_NAME_1=0;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fattach.c;0;4 +current_page=13 +FILE_NAME_0=2818;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Farmv7l%2Fregisters.c;0;4 +FILE_NAME_1=704;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fattach.c;0;4 FILE_NAME_2=0;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fhashmap.c;0;4 FILE_NAME_3=0;C++;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fhashmap.h;0;4 -FILE_NAME_4=0;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fstrings.c;0;4 +FILE_NAME_4=888;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fstrings.c;0;4 FILE_NAME_5=0;C++;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fstrings.h;0;4 -FILE_NAME_6=0;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Futilities.c;0;4 -FILE_NAME_7=166;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fwhatfiles.c;0;4 -FILE_NAME_8=1468;C++;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fwhatfiles.h;0;4 -FILE_NAME_9=0;C++;0;EUTF-8;1;1;0;%2Fusr%2Finclude%2Farm-linux-gnueabihf%2Fasm%2Fptrace.h;0;4 -FILE_NAME_10=0;C++;0;EUTF-8;0;1;0;%2Fusr%2Finclude%2Farm-linux-gnueabihf%2Fsys%2Fptrace.h;0;2 -FILE_NAME_11=0;C++;0;EUTF-8;1;1;0;%2Fusr%2Finclude%2Flinux%2Fptrace.h;0;4 -FILE_NAME_12=1732;C++;0;EUTF-8;0;1;0;%2Fusr%2Finclude%2Farm-linux-gnueabihf%2Fsys%2Fuser.h;0;2 +FILE_NAME_6=166;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fwhatfiles.c;0;4 +FILE_NAME_7=1087;C++;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fwhatfiles.h;0;4 +FILE_NAME_8=0;C++;0;EUTF-8;1;1;0;%2Fusr%2Finclude%2Farm-linux-gnueabihf%2Fasm%2Fptrace.h;0;4 +FILE_NAME_9=0;C++;0;EUTF-8;0;1;0;%2Fusr%2Finclude%2Farm-linux-gnueabihf%2Fsys%2Fptrace.h;0;2 +FILE_NAME_10=0;C++;0;EUTF-8;1;1;0;%2Fusr%2Finclude%2Flinux%2Fptrace.h;0;4 +FILE_NAME_11=1732;C++;0;EUTF-8;0;1;0;%2Fusr%2Finclude%2Farm-linux-gnueabihf%2Fsys%2Fuser.h;0;2 +FILE_NAME_12=683;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Futilities.c;0;4 +FILE_NAME_13=0;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fx86_64%2Fregisters.c;0;4 [VTE] last_dir=/home/pi/whatfiles -- cgit v1.2.3