frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed cReadLine::Read() for lines that end with the infamous "\r\n"

This commit is contained in:
Klaus Schmidinger 2006-03-19 12:28:16 +01:00
parent 94afe13373
commit 2eab16a310
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -964,6 +964,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
exceeds the maximum channel number exceeds the maximum channel number
for suggesting to also set the language codes when setting the audio track descriptions for suggesting to also set the language codes when setting the audio track descriptions
for reporting a problem in setting the audio language codes in 'Transfer-Mode' for reporting a problem in setting the audio language codes in 'Transfer-Mode'
for fixing cReadLine::Read() for lines that end with the infamous "\r\n"
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

4
HISTORY
View File

@ -4415,7 +4415,7 @@ Video Disk Recorder Revision History
- Fixed cSchedule::GetFollowingEvent() in case there is currently no present event - Fixed cSchedule::GetFollowingEvent() in case there is currently no present event
running (thanks to Pekka Mauno). running (thanks to Pekka Mauno).
2006-02-28: Version 1.3.45 2006-03-19: Version 1.3.45
- Fixed updating the "Info" button in the "Timers" menu. - Fixed updating the "Info" button in the "Timers" menu.
- Reduced the number of events to actually check when setting events to timers. - Reduced the number of events to actually check when setting events to timers.
@ -4424,3 +4424,5 @@ Video Disk Recorder Revision History
- The status changes of EPG events are now logged for all channels that have timers. - The status changes of EPG events are now logged for all channels that have timers.
- Removed the log message "deleting plugin: ..." when shutting down VDR (thanks to - Removed the log message "deleting plugin: ..." when shutting down VDR (thanks to
Christoph Haubrich for reporting that this is irritating when calling "vdr --help"). Christoph Haubrich for reporting that this is irritating when calling "vdr --help").
- Fixed cReadLine::Read() for lines that end with the infamous "\r\n" (thanks to
Rolf Ahrenberg).

10
tools.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: tools.c 1.114 2006/02/05 11:05:56 kls Exp $ * $Id: tools.c 1.115 2006/03/19 12:28:16 kls Exp $
*/ */
#include "tools.h" #include "tools.h"
@ -829,8 +829,14 @@ char *cReadLine::Read(FILE *f)
int n = getline(&buffer, &size, f); int n = getline(&buffer, &size, f);
if (n > 0) { if (n > 0) {
n--; n--;
if (buffer[n] == '\n') if (buffer[n] == '\n') {
buffer[n] = 0; buffer[n] = 0;
if (n > 0) {
n--;
if (buffer[n] == '\r')
buffer[n] = 0;
}
}
return buffer; return buffer;
} }
return NULL; return NULL;