From 543b4d41ea7dc6e96c1e0148dd099afa579cee57 Mon Sep 17 00:00:00 2001 From: Jochen Dolze Date: Thu, 28 Jul 2011 21:07:43 +0200 Subject: Changed kabel1-logo, changed prosieben-logo --- command/markad-standalone.cpp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'command/markad-standalone.cpp') diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp index 47d9eaa..10ed7a2 100644 --- a/command/markad-standalone.cpp +++ b/command/markad-standalone.cpp @@ -1123,7 +1123,7 @@ void cMarkAdStandalone::ProcessFile() AddMark(&tempmark); } } - skipped=demux->Skipped(); + if (demux) skipped=demux->Skipped(); } void cMarkAdStandalone::Process() @@ -1934,6 +1934,11 @@ bool cMarkAdStandalone::CreatePidfile() } fclose(oldpid); } + else + { + // fopen above sets the error to 2, reset it here! + errno=0; + } if (duplicate) { free(buf); @@ -2036,7 +2041,17 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig * } } - isyslog("starting v%s",VERSION); + long lb; + errno=0; + lb=sysconf(_SC_LONG_BIT); + if (errno==0) + { + isyslog("starting v%s (%libit)",VERSION,lb); + } + else + { + isyslog("starting v%s",VERSION); + } isyslog("on %s",Directory); if (!bDecodeAudio) @@ -2065,7 +2080,11 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig * bIgnoreTimerInfo=true; } - if (!CheckTS()) return; + if (!CheckTS()) { + esyslog("no files found"); + abort=true; + return; + } if (isTS) { -- cgit v1.2.3