frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Some improvements to allowing the parameters PATH and NAME to the --dirnames command line option to be left empty to use the default values if only ENC shall be set

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-03-12 13:27:40 +01:00
parent cee221e843
commit ec7fac3c0d
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -616,6 +616,8 @@ Helmut Auer <vdr@helmutauer.de>
--genindex --genindex
for suggesting to disable EPG processing for a while after a CLRE command for suggesting to disable EPG processing for a while after a CLRE command
for suggesting to read the epg.data file in a separate thread for suggesting to read the epg.data file in a separate thread
for some improvements to allowing the parameters PATH and NAME to the --dirnames
command line option to be left empty to use the default values if only ENC shall be set
Jeremy Hall <jhall@UU.NET> Jeremy Hall <jhall@UU.NET>
for fixing an incomplete initialization of the filter parameters in eit.c for fixing an incomplete initialization of the filter parameters in eit.c

3
HISTORY
View File

@ -7741,7 +7741,8 @@ Video Disk Recorder Revision History
"lib$$i-*.so" (previously only "libvdr-*.so") and also descends into subdirectories "lib$$i-*.so" (previously only "libvdr-*.so") and also descends into subdirectories
of the plugin source. of the plugin source.
- The parameters PATH and NAME to the --dirnames command line option may now be left - The parameters PATH and NAME to the --dirnames command line option may now be left
empty to use the default values if only ENC shall be set. empty to use the default values if only ENC shall be set (thanks to Helmut Auer for
some improvements to this change).
- Fixed a possible "Channel not available" if a recording starts on a system with - Fixed a possible "Channel not available" if a recording starts on a system with
bonded devices (thanks to Siegfried Bosch). bonded devices (thanks to Siegfried Bosch).
- Fixed stopping an ongoing recording on a system with bonded devices, if a timer with - Fixed stopping an ongoing recording on a system with bonded devices, if a timer with

24
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 2.54 2013/03/12 09:23:33 kls Exp $ * $Id: vdr.c 2.55 2013/03/12 13:27:40 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -287,13 +287,16 @@ int main(int argc, char *argv[])
return 2; return 2;
} }
DirectoryPathMax = n; DirectoryPathMax = n;
if (!*s)
break;
if (*s != ',') {
fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
return 2;
}
} }
s++;
if (!*s) if (!*s)
break; break;
if (*s++ != ',') {
fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
return 2;
}
if (*s != ',') { if (*s != ',') {
int n = strtol(s, &s, 10); int n = strtol(s, &s, 10);
if (n <= 0 || n > NAME_MAX) { // NAME_MAX excludes the terminating 0 if (n <= 0 || n > NAME_MAX) { // NAME_MAX excludes the terminating 0
@ -301,13 +304,16 @@ int main(int argc, char *argv[])
return 2; return 2;
} }
DirectoryNameMax = n; DirectoryNameMax = n;
if (!*s)
break;
if (*s != ',') {
fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
return 2;
}
} }
s++;
if (!*s) if (!*s)
break; break;
if (*s++ != ',') {
fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg);
return 2;
}
int n = strtol(s, &s, 10); int n = strtol(s, &s, 10);
if (n != 0 && n != 1) { if (n != 0 && n != 1) {
fprintf(stderr, "vdr: invalid directory encoding: %s\n", optarg); fprintf(stderr, "vdr: invalid directory encoding: %s\n", optarg);