summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Utils/logging.cpp2
-rw-r--r--src/Hooks/dumpoops.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Utils/logging.cpp b/lib/Utils/logging.cpp
index 15104b8c..58d14ee9 100644
--- a/lib/Utils/logging.cpp
+++ b/lib/Utils/logging.cpp
@@ -46,7 +46,7 @@ void verror_msg(const char *s, va_list p, const char* strerr)
if (prefix_len) {
memmove(msg + prefix_len, msg, used);
used += prefix_len;
- strcpy(msg, msg_prefix);
+ memcpy(msg, msg_prefix, prefix_len);
}
if (strerr) {
if (s[0]) { /* not perror_nomsg? */
diff --git a/src/Hooks/dumpoops.cpp b/src/Hooks/dumpoops.cpp
index 5cad151b..208cb240 100644
--- a/src/Hooks/dumpoops.cpp
+++ b/src/Hooks/dumpoops.cpp
@@ -29,7 +29,8 @@ int main(int argc, char **argv)
log("usage: %s FILE", argv[0]);
return 1;
}
- msg_prefix = xasprintf("%s: ", argv[0]);
+ char *slash = strrchr(argv[0], '/');
+ msg_prefix = xasprintf("%s: ", slash ? slash+1 : argv[0]);
CKerneloopsScanner scanner;
int cnt = scanner.ScanSysLogFile(argv[1]);