commit 90e9911484b80742b7d685a6f99e072b95e6c5b6
author robert.swiecki@gmail.com <robert.swiecki@gmail.com@f4334a76-505f-ddcd-06be-78435f765c3c> Sun Feb 15 02:05:14 2015 +0000
committer robert.swiecki@gmail.com <robert.swiecki@gmail.com@f4334a76-505f-ddcd-06be-78435f765c3c> Sun Feb 15 02:05:14 2015 +0000
tree 46996a8d1d4465140ade3854af742ddf5b75d998
parent 81189853ebb2b47ff66190bb764b40146d6d6e58

Better reporting and 64-bit rnd function

linux/ptrace.c

diff --git a/linux/ptrace.c b/linux/ptrace.c
index fc01197..a2203e8 100644
--- a/linux/ptrace.c
+++ b/linux/ptrace.c
@@ -386,8 +386,6 @@
                           size_t funcCnt, siginfo_t * si, const char *instr)
 {
     fuzzer->report[0] = '\0';
-    util_ssnprintf(fuzzer->report, sizeof(fuzzer->report),
-                   "=======================================================\n");
     util_ssnprintf(fuzzer->report, sizeof(fuzzer->report), "ORIG_FNAME: %s\n",
                    fuzzer->origFileName);
     util_ssnprintf(fuzzer->report, sizeof(fuzzer->report), "FUZZ_FNAME: %s\n", fuzzer->fileName);
@@ -398,11 +396,9 @@
     util_ssnprintf(fuzzer->report, sizeof(fuzzer->report), "INSTRUCTION: %s\n", instr);
     util_ssnprintf(fuzzer->report, sizeof(fuzzer->report), "STACK:\n");
     for (size_t i = 0; i < funcCnt; i++) {
-        util_ssnprintf(fuzzer->report, sizeof(fuzzer->report), " 0x%016llx <%s>\n",
-                       (unsigned long long)funcs[i].pc, funcs[i].func);
+        util_ssnprintf(fuzzer->report, sizeof(fuzzer->report), " <0x%016" PRIx64 "> [%s():%d]\n",
+                       (uint64_t) (long)funcs[i].pc, funcs[i].func, funcs[i].line);
     }
-    util_ssnprintf(fuzzer->report, sizeof(fuzzer->report),
-                   "=======================================================\n");
 
     return;
 }
@@ -441,7 +437,7 @@
                  instr, fuzzer->origFileName, hfuzz->fileExtn);
     } else {
         char localtmstr[PATH_MAX];
-        util_getLocalTime("%F.%H.%M.%S", localtmstr, sizeof(localtmstr));
+        util_getLocalTime("%F.%H:%M:%S", localtmstr, sizeof(localtmstr));
         snprintf(newname, sizeof(newname),
                  "%s.PC.%" PRIx64 ".CODE.%d.ADDR.%p.INSTR.%s.%s.%d.%s.%s",
                  arch_sigs[si.si_signo].descr, pc, si.si_code, si.si_addr,
@@ -460,7 +456,9 @@
 
     funcs_t funcs[_HF_MAX_FUNCS] = {
         [0 ... (_HF_MAX_FUNCS - 1)].pc = NULL,
+        [0 ... (_HF_MAX_FUNCS - 1)].line = 0,
         [0 ... (_HF_MAX_FUNCS - 1)].func = {'\0'}
+        ,
     };
 
     size_t funcCnt = arch_unwindStack(pid, funcs);