| 1 |
zzam 09/06/04 12:37:15 |
| 2 |
|
| 3 |
Added: vdr-1.6.0-extensions-72-gcc-4.4.diff |
| 4 |
Log: |
| 5 |
Update to extensions patch v72. Do not support streamdevext patch for now. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: vdr-1.6.0-extensions-72-gcc-4.4.diff |
| 15 |
=================================================================== |
| 16 |
diff -ru vdr-1.6.0-orig/menu.c vdr-1.6.0/menu.c |
| 17 |
--- vdr-1.6.0-orig/menu.c 2009-06-04 10:55:14.481017158 +0200 |
| 18 |
+++ vdr-1.6.0/menu.c 2009-06-04 10:57:12.690998810 +0200 |
| 19 |
@@ -777,14 +777,14 @@ |
| 20 |
} |
| 21 |
#endif /* PINPLUGIN */ |
| 22 |
#ifdef USE_LIEMIEXT |
| 23 |
- char* p = strrchr(data.file, '~'); |
| 24 |
+ const char* p = strrchr(data.file, '~'); |
| 25 |
if (p) { |
| 26 |
p++; |
| 27 |
Utf8Strn0Cpy(name, p, sizeof(name)); |
| 28 |
Utf8Strn0Cpy(path, data.file, sizeof(path)); |
| 29 |
- p = strrchr(path, '~'); |
| 30 |
- if (p) |
| 31 |
- p[0] = 0; |
| 32 |
+ char *p2 = strrchr(path, '~'); |
| 33 |
+ if (p2) |
| 34 |
+ p2[0] = 0; |
| 35 |
} |
| 36 |
else { |
| 37 |
Utf8Strn0Cpy(name, data.file, sizeof(name)); |
| 38 |
diff -ru vdr-1.6.0-orig/videodir.c vdr-1.6.0/videodir.c |
| 39 |
--- vdr-1.6.0-orig/videodir.c 2009-06-04 10:55:14.477693736 +0200 |
| 40 |
+++ vdr-1.6.0/videodir.c 2009-06-04 10:55:24.531019647 +0200 |
| 41 |
@@ -199,9 +199,10 @@ |
| 42 |
#ifdef USE_HARDLINKCUTTER |
| 43 |
static bool StatNearestDir(const char *FileName, struct stat *Stat) |
| 44 |
{ |
| 45 |
- cString Name(FileName); |
| 46 |
+ char *Name = strdup(FileName); |
| 47 |
+ cString Name_str(Name, true); /* manage free for us */ |
| 48 |
char *p; |
| 49 |
- while ((p = strrchr((const char*)Name + 1, '/')) != NULL) { |
| 50 |
+ while ((p = strrchr(Name + 1, '/')) != NULL) { |
| 51 |
*p = 0; // truncate at last '/' |
| 52 |
if (stat(Name, Stat) == 0) { |
| 53 |
isyslog("StatNearestDir: Stating %s", (const char*)Name); |
Archives