15813303 SUNBT7195261 mkisofs picks wrong charset file definition s11u1-sru
authorJiri Kukacka <jiri.kukacka@oracle.com>
Wed, 09 Apr 2014 06:29:35 -0700
branchs11u1-sru
changeset 3161 b292d8c2be95
parent 3148 bb9303d6e615
child 3164 7648a39bf1b4
15813303 SUNBT7195261 mkisofs picks wrong charset file definition
components/cdrtools/patches/sic_nls.c.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cdrtools/patches/sic_nls.c.patch	Wed Apr 09 06:29:35 2014 -0700
@@ -0,0 +1,20 @@
+Patch originated from https://lists.berlios.de/pipermail/cdrecord-developers/2014-January/000128.html
+This bug is already fixed in version 3.01a22.
+
+--- cdrtools-3.00/libsiconv/sic_nls.c.orig	st led  8 18:08:37 2014
++++ cdrtools-3.00/libsiconv/sic_nls.c	st led  8 18:10:09 2014
[email protected]@ -288,11 +288,10 @@
+ 	char	*p;
+ 	FILE	*f;
+ 
+-	if ((f = fopen(name, "r")) != NULL)
+-		return (f);
+-
++	/* If the name contains slash, try to open it directly. If it fails, do
++	 * not attempt anything else. */
+ 	if (strchr(name, '/'))
+-		return ((FILE *)NULL);
++		return (fopen(name, "r"));
+ 
+ 	if (ins_base == NULL)
+ 		(void) sic_base();