frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limiting the length of the recording name in timers created via SVDRP in case VDR is run with --vfat

Browse Source
This commit is contained in:
Klaus Schmidinger
2008-02-10 13:41:43 +01:00
parent 5a44b8b801
commit e1eb84db49
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
svdrp.c
View File

@@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection.
*
* $Id: svdrp.c 1.105 2008/01/13 15:06:25 kls Exp $
* $Id: svdrp.c 1.106 2008/02/10 13:37:18 kls Exp $
*/
#include "svdrp.h"
@@ -40,6 +40,8 @@
#include "tools.h"
#include "videodir.h"
#define VFAT_MAX_FILENAME 40 // same as MAX_SUBTITLE_LENGTH in recording.c
// --- cSocket ---------------------------------------------------------------
cSocket::cSocket(int Port, int Queue)
@@ -1179,6 +1181,16 @@ void cSVDRP::CmdMODT(const char *Option)
Reply(501, "Error in timer settings");
return;
}
else if (VfatFileSystem) {
const char *FileName = timer->File();
const char *p = strrchr(FileName, '~');
if (!p)
p = FileName;
if (strlen(p) > VFAT_MAX_FILENAME) {
Reply(501, "File name too long for VFAT file system");
return;
}
}
*timer = t;
Timers.SetModified();
isyslog("timer %s modified (%s)", *timer->ToDescr(), timer->HasFlags(tfActive) ? "active" : "inactive");
@@ -1285,6 +1297,17 @@ void cSVDRP::CmdNEWT(const char *Option)
if (*Option) {
cTimer *timer = new cTimer;
if (timer->Parse(Option)) {
if (VfatFileSystem) {
const char *FileName = timer->File();
const char *p = strrchr(FileName, '~');
if (!p)
p = FileName;
if (strlen(p) > VFAT_MAX_FILENAME) {
Reply(501, "File name too long for VFAT file system");
delete timer;
return;
}
}
cTimer *t = Timers.GetTimer(timer);
if (!t) {
Timers.Add(timer);