think it's working?

6 files changed, 184 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 6025b29..1cb0513 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CC = gcc
 CFLAGS = -Wall
 SOURCES = $(addprefix src/, whatfiles.c attach.c utilities.c hashmap.c strings.c)
-ARCH_DIR = $(shell uname -p)
+ARCH_DIR = $(shell uname -m)
 
 all: bin/whatfiles
 
diff --git a/src/armv7l/registers.c b/src/armv7l/registers.c
new file mode 100644
index 0000000..51ed46d
--- /dev/null
+++ b/src/armv7l/registers.c
@@ -0,0 +1,124 @@
+
+#include <sys/ptrace.h>
+#include <linux/ptrace.h>
+
+#include <sys/user.h>
+#include <sys/syscall.h>
+#include <sys/wait.h>
+
+#include "../hashmap.h"
+#include "../whatfiles.h"
+
+void check_syscall(pid_t current_pid, void *registers, HashMap map)
+{
+    struct pt_regs *regs = (struct pt_regs*)registers;
+    struct String filename = {0};
+    struct String output = {0};
+    init_string(&filename, 64);
+    init_string(&output, 64);
+    char mode[MODE_LEN] = {0};
+
+    pid_t parent_tid, child_tid;
+    unsigned long flags;
+    unsigned long newsp;
+
+    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)
+    {
+    case SYS_execve:
+        DEBUG("PID %d exec'd. orig_rax: %ld\n", current_pid, regs->ARM_r7);
+        if (peek_filename(current_pid, regs->ARM_ORIG_r0, &filename)) {
+            DEBUG("associated process %d with name \"%s\"\n", current_pid, filename.data);
+            set_name(current_pid, filename.data, map);
+        }
+        break;
+    case SYS_fork:
+        DEBUG("PID %d forked. orig_rax: %ld\n", current_pid, regs->ARM_r7);
+        break;
+    case SYS_clone:
+        flags = regs->ARM_ORIG_r0;
+        newsp = regs->ARM_r1;
+        parent_tid = ptrace(PTRACE_PEEKDATA, current_pid, (void*)regs->ARM_r2, 0);
+        child_tid = ptrace(PTRACE_PEEKDATA, current_pid, (void*)regs->ARM_r4, 0);
+        DEBUG("PID %d cloned. orig_rax: %ld, flags: 0x%ld, newsp: 0x%ld, parent pid: %d, child pid: %d\n", 
+            current_pid, regs->ARM_r7, flags, newsp, parent_tid, child_tid);
+        break;
+    case SYS_creat:
+        peek_filename(current_pid, regs->ARM_ORIG_r0, &filename);
+        get_mode(regs->ARM_r1, mode);
+        build_output(mode, "creat()", regs->ARM_r1, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_open:
+        peek_filename(current_pid, regs->ARM_ORIG_r0, &filename);
+        get_mode(regs->ARM_r2, mode);
+        build_output(mode, "open()", regs->ARM_r2, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_openat:
+        peek_filename(current_pid, regs->ARM_r1, &filename);
+        get_mode(regs->ARM_r3, mode);
+        build_output(mode, "openat()", regs->ARM_r3, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_unlink:
+        peek_filename(current_pid, regs->ARM_ORIG_r0, &filename);
+        build_output("delete", "unlink()", 0, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_unlinkat:
+        peek_filename(current_pid, regs->ARM_r1, &filename);
+        build_output("delete", "unlinkat()", 0, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    default:
+        // DEBUG("syscall: %lld, pid: %d, %s\n", regs->orig_rax, current_pid, proc_name);
+        break;
+    }
+    free(filename.data);
+    free(output.data);
+}
+
+
+bool step_syscall(pid_t current_pid, int proc_status, HashMap map)
+{
+    long res;
+    struct pt_regs regs;
+    bool could_read = false;
+    // get current register values
+    // TODO: make this fault tolerant to a dead PID
+    res = ptrace(PTRACE_GETREGS, current_pid, &regs, &regs);
+    if (res == -1L) {
+        DEBUG("CURRENT PID: %d, failed to get registers\n", current_pid);
+    }
+
+    // can't get some registers for some reason
+    if (regs.ARM_ORIG_r0 != -1) {
+        could_read = true;
+        // If it's the same PID performing the same syscall (has same orig_rax) as last time, we don't care. Just means it's exiting the syscall.
+        // Might want to keep for debug mode? This might result in missing some output, in the case where two threads of the same process enter the same syscall before either exits,
+        // because they will both return the same PID to wait() when given SIGTRAP as part of the syscall-enter-exit loop. Might also result in double-printing,
+        // because if two threads (that report the same PID) enter two different syscalls before either exits, the "last" syscall for the PID won't be the entry by that thread.
+        if (!is_exiting(current_pid, regs.ARM_ORIG_r0) /*|| Debug*/) {
+            check_syscall(current_pid, (void*)&regs, map);
+        }
+        LastSyscall.pid = current_pid;
+        LastSyscall.syscall = regs.ARM_ORIG_r0;
+        check_ptrace_event(current_pid, proc_status, map);
+        // continue, catching next entry or exit from syscall
+        res = ptrace(PTRACE_SYSCALL, current_pid, 0, 0);
+        if (res == -1L) DEBUG("ptrace() failed to resume");
+    } else {
+        DEBUG("can't get registers, detaching from %d\n", current_pid);
+        res = ptrace(PTRACE_DETACH, current_pid, 0, 0); // "Under Linux, a tracee can be detached in this way regardless of which method was used to initiate tracing."
+        if (res == -1L) DEBUG("ptrace() failed to detach from %d\n", current_pid);
+    }
+    return could_read;
+}
diff --git a/src/utilities.c b/src/utilities.c
index 9bfecba..6b086ad 100644
--- a/src/utilities.c
+++ b/src/utilities.c
@@ -72,7 +72,7 @@ void get_command(pid_t current_pid, char *command, size_t len)
     }
 }
 
-bool peek_filename(pid_t pid, unsigned long long p_reg, struct String *str)
+bool peek_filename(pid_t pid, unsigned long p_reg, struct String *str)
 {
     char get_next_word = 1;
     long *addr = (long*)p_reg;
diff --git a/src/whatfiles.h b/src/whatfiles.h
index e1fd6c5..3739ead 100644
--- a/src/whatfiles.h
+++ b/src/whatfiles.h
@@ -45,7 +45,7 @@ void build_output(
 );
 void get_mode(unsigned long long m, char *mode);
 void get_command(pid_t current_pid, char *command, size_t len);
-bool peek_filename(pid_t pid, unsigned long long p_reg, struct String *str);
+bool peek_filename(pid_t pid, unsigned long p_reg, struct String *str);
 // void toggle_status(pid_t current_pid, HashMap map);
 bool is_exiting(pid_t pid, unsigned long long syscall);
 char *parse_flags(int argc, char *argv[], pid_t *pid, bool *stdout_override, bool *attach);
diff --git a/src/x86_64/registers.c b/src/x86_64/registers.c
index f975f01..3073d50 100644
--- a/src/x86_64/registers.c
+++ b/src/x86_64/registers.c
@@ -4,6 +4,7 @@
 #include <sys/syscall.h>
 #include <sys/wait.h>
 
+#include "../hashmap.h"
 #include "../whatfiles.h"
 
 // looks at the current syscall and outputs its information if it's one we're interested in
diff --git a/whatfiles.geany b/whatfiles.geany
new file mode 100644
index 0000000..378c728
--- /dev/null
+++ b/whatfiles.geany
@@ -0,0 +1,56 @@
+[editor]
+line_wrapping=false
+line_break_column=72
+auto_continue_multiline=true
+
+[file_prefs]
+final_new_line=true
+ensure_convert_new_lines=false
+strip_trailing_spaces=false
+replace_tabs=false
+
+[indentation]
+indent_width=4
+indent_type=1
+indent_hard_tab_width=8
+detect_indent=true
+detect_indent_width=true
+indent_mode=2
+
+[project]
+name=whatfiles
+base_path=/home/pi/projects/whatfiles/
+description=
+file_patterns=
+
+[long line marker]
+long_line_behaviour=1
+long_line_column=72
+
+[files]
+current_page=7
+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
+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_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=0;C;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fwhatfiles%2Fsrc%2Fwhatfiles.c;0;4
+FILE_NAME_8=0;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
+
+[VTE]
+last_dir=/home/pi/whatfiles
+
+[build-menu]
+NF_00_LB=_Make
+NF_00_CM=make
+NF_00_WD=/home/pi/whatfiles
+CFT_00_LB=_Compile
+CFT_00_CM=gcc -Wall -c "%f"
+CFT_00_WD=
+filetypes=C;