Attachment #192801 for bug #271617

View | Details | Raw Unified | Return to bug 271617
Collapse All | Expand All

Lines 2252-2258 Link Here

(-)vdr-1.6.0.orig/menu.c (-1 / +1 lines)
2252	priority = recording->priority;	2252	priority = recording->priority;
2253	lifetime = recording->lifetime;	2253	lifetime = recording->lifetime;
2254		2254
2255	char* p = strrchr(recording->Name(), '~');	2255	char p = (char ) strrchr(recording->Name(), '~');
2256	if (p) {	2256	if (p) {
2257	p++;	2257	p++;
2258	Utf8Strn0Cpy(name, p, sizeof(name));	2258	Utf8Strn0Cpy(name, p, sizeof(name));




     Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
     Subtitle = SubtitleBuffer;
     }
  char *macroTITLE   = (char *) strstr(Timer->File(), TIMERMACRO_TITLE);
  char *macroEPISODE = (char *) strstr(Timer->File(), TIMERMACRO_EPISODE);
  if (macroTITLE || macroEPISODE) {
     name = strdup(Timer->File());
     name = strreplace(name, TIMERMACRO_TITLE, Title);

      }
  fileName = strdup(FileName);
  FileName += strlen(VideoDirectory) + 1;
  char *p = (char *) strrchr(FileName, '/');

  name = NULL;
  dvdname = NULL;

  if (recording) {
     cThreadLock DeletedRecordingsLock(&DeletedRecordings);
     Del(recording, false);
     char *ext = (char *) strrchr(recording->FileName(), '.');
     if (ext) {
        strncpy(ext, DELEXT, strlen(ext));
        recording->fileSizeMB = DirSizeMB(recording->FileName());




     char *strtok_next;
     FileName = strtok_r(p, delim, &strtok_next);
     // image type:
     char *Extension = (char *) strrchr(FileName, '.');
     if (Extension) {
        if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
           Jpeg = true;

     if (FileName) {
        if (grabImageDir) {
           cString s;
           char *slash = (char *) strrchr(FileName, '/');
           if (!slash) {
              s = AddDirectory(grabImageDir, FileName);
              FileName = s;
              }
           slash = (char *) strrchr(FileName, '/'); // there definitely is one
           *slash = 0;
           char *r = realpath(FileName, RealFileName);
           *slash = '/';

Lines 183-189 Link Here

(-)vdr-1.6.0.orig/videodir.c (-1 / +1 lines)
183	{	183	{
184	cString Name(FileName);	184	cString Name(FileName);
185	char *p;	185	char *p;
186	while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {	186	while ((p = (char ) strrchr((const char)Name + 1, '/')) != NULL) {
187	*p = 0; // truncate at last '/'	187	*p = 0; // truncate at last '/'
188	if (stat(Name, Stat) == 0) {	188	if (stat(Name, Stat) == 0) {
189	isyslog("StatNearestDir: Stating %s", (const char*)Name);	189	isyslog("StatNearestDir: Stating %s", (const char*)Name);

Return to bug 271617

Lines 530-537 Link Here

(-)vdr-1.6.0.orig/recording.c (-4 / +4 lines)
530	Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);	530	Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
531	Subtitle = SubtitleBuffer;	531	Subtitle = SubtitleBuffer;
532	}	532	}
533	char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE);	533	char macroTITLE = (char ) strstr(Timer->File(), TIMERMACRO_TITLE);
534	char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);	534	char macroEPISODE = (char ) strstr(Timer->File(), TIMERMACRO_EPISODE);
535	if (macroTITLE \|\| macroEPISODE) {	535	if (macroTITLE \|\| macroEPISODE) {
536	name = strdup(Timer->File());	536	name = strdup(Timer->File());
537	name = strreplace(name, TIMERMACRO_TITLE, Title);	537	name = strreplace(name, TIMERMACRO_TITLE, Title);
Lines 580-586 Link Here
580	}	580	}
581	fileName = strdup(FileName);	581	fileName = strdup(FileName);
582	FileName += strlen(VideoDirectory) + 1;	582	FileName += strlen(VideoDirectory) + 1;
583	char *p = strrchr(FileName, '/');	583	char p = (char ) strrchr(FileName, '/');
584		584
585	name = NULL;	585	name = NULL;
586	dvdname = NULL;	586	dvdname = NULL;
Lines 1528-1534 Link Here
1528	if (recording) {	1528	if (recording) {
1529	cThreadLock DeletedRecordingsLock(&DeletedRecordings);	1529	cThreadLock DeletedRecordingsLock(&DeletedRecordings);
1530	Del(recording, false);	1530	Del(recording, false);
1531	char *ext = strrchr(recording->FileName(), '.');	1531	char ext = (char ) strrchr(recording->FileName(), '.');
1532	if (ext) {	1532	if (ext) {
1533	strncpy(ext, DELEXT, strlen(ext));	1533	strncpy(ext, DELEXT, strlen(ext));
1534	recording->fileSizeMB = DirSizeMB(recording->FileName());	1534	recording->fileSizeMB = DirSizeMB(recording->FileName());

Lines 738-744 Link Here

(-)vdr-1.6.0.orig/svdrp.c (-3 / +3 lines)
738	char *strtok_next;	738	char *strtok_next;
739	FileName = strtok_r(p, delim, &strtok_next);	739	FileName = strtok_r(p, delim, &strtok_next);
740	// image type:	740	// image type:
741	char *Extension = strrchr(FileName, '.');	741	char Extension = (char ) strrchr(FileName, '.');
742	if (Extension) {	742	if (Extension) {
743	if (strcasecmp(Extension, ".jpg") == 0 \|\| strcasecmp(Extension, ".jpeg") == 0)	743	if (strcasecmp(Extension, ".jpg") == 0 \|\| strcasecmp(Extension, ".jpeg") == 0)
744	Jpeg = true;	744	Jpeg = true;
Lines 798-809 Link Here
798	if (FileName) {	798	if (FileName) {
799	if (grabImageDir) {	799	if (grabImageDir) {
800	cString s;	800	cString s;
801	char *slash = strrchr(FileName, '/');	801	char slash = (char ) strrchr(FileName, '/');
802	if (!slash) {	802	if (!slash) {
803	s = AddDirectory(grabImageDir, FileName);	803	s = AddDirectory(grabImageDir, FileName);
804	FileName = s;	804	FileName = s;
805	}	805	}
806	slash = strrchr(FileName, '/'); // there definitely is one	806	slash = (char *) strrchr(FileName, '/'); // there definitely is one
807	*slash = 0;	807	*slash = 0;
808	char *r = realpath(FileName, RealFileName);	808	char *r = realpath(FileName, RealFileName);
809	*slash = '/';	809	*slash = '/';