From 8a6096353acd9542accc853c88594ca9e586e869 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 8 Nov 2006 12:50:02 +0000 Subject: [PATCH] Prevent crash if logbook "global" is accessed SVN revision: 1746 --- src/elogd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/elogd.c b/src/elogd.c index 066362aa..ed91a917 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -24504,7 +24504,7 @@ void server_loop(void) for (i = 0;; i++) { if (!enumgrp(i, str)) break; - if (strieq(logbook, str)) + if (strieq(logbook, str) && !strieq(logbook, "global")) break; } @@ -25677,6 +25677,10 @@ int main(int argc, char *argv[]) if (!logbook_dir[0]) strcpy(logbook_dir, "logbooks"); + /* strip trailing dir separator */ + if (logbook_dir[strlen(logbook_dir)-1] == DIR_SEPARATOR) + logbook_dir[strlen(logbook_dir)-1] = 0; + /* check for directories */ if (logbook_dir[0] && stat(logbook_dir, &finfo) < 0) {