diff options
| author | Anton Arapov <aarapov@redhat.com> | 2009-07-31 15:31:03 +0200 |
|---|---|---|
| committer | Anton Arapov <aarapov@redhat.com> | 2009-07-31 15:31:03 +0200 |
| commit | 996d63d23a6223d91d85d6aac7bc5aba470bec8b (patch) | |
| tree | b2dd228206f028fa4d5e6f3dd0fa872f7d9cdca0 | |
| parent | 8dc84c58d3e095e2738a6f8e7c48aea8e90ed235 (diff) | |
| parent | 39581495b85d8c20eb992962250af3044244dab3 (diff) | |
| download | abrt-996d63d23a6223d91d85d6aac7bc5aba470bec8b.tar.gz abrt-996d63d23a6223d91d85d6aac7bc5aba470bec8b.tar.xz abrt-996d63d23a6223d91d85d6aac7bc5aba470bec8b.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
| -rw-r--r-- | lib/Utils/logging.cpp | 2 | ||||
| -rw-r--r-- | src/Hooks/dumpoops.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Utils/logging.cpp b/lib/Utils/logging.cpp index 15104b8..58d14ee 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 5cad151..208cb24 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]); |