diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2008-12-03 18:44:32 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-12-03 18:44:32 +0000 |
commit | 8bb527ec522d437af59173bb580d20e88558dae6 (patch) | |
tree | d7a901e0ec2ae3a275c246a07676592561bc60bd /dev-libs/libcdio/files | |
parent | removed syslog-ng-2.1 mask since the newer version is better (diff) | |
download | gentoo-2-8bb527ec522d437af59173bb580d20e88558dae6.tar.gz gentoo-2-8bb527ec522d437af59173bb580d20e88558dae6.tar.bz2 gentoo-2-8bb527ec522d437af59173bb580d20e88558dae6.zip |
old
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27.7 i686)
Diffstat (limited to 'dev-libs/libcdio/files')
3 files changed, 0 insertions, 114 deletions
diff --git a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777-ter.patch b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777-ter.patch deleted file mode 100644 index 2134789b1c5d..000000000000 --- a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777-ter.patch +++ /dev/null @@ -1,78 +0,0 @@ -Index: libcdio-0.78.2/src/cd-info.c -=================================================================== ---- libcdio-0.78.2.orig/src/cd-info.c -+++ libcdio-0.78.2/src/cd-info.c -@@ -518,6 +518,8 @@ print_iso9660_recurse (CdIo_t *p_cdio, c - CdioList_t *p_dirlist = _cdio_list_new (); - CdioListNode_t *entnode; - uint8_t i_joliet_level; -+ char *translated_name = (char *) malloc(4096); -+ size_t translated_name_size = 4096; - - i_joliet_level = (opts.no_joliet) - ? 0 -@@ -539,7 +541,15 @@ print_iso9660_recurse (CdIo_t *p_cdio, c - iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode); - char *psz_iso_name = p_statbuf->filename; - char _fullname[4096] = { 0, }; -- char translated_name[MAX_ISONAME+1]; -+ if (strlen(psz_iso_name) >= translated_name_size) { -+ translated_name_size = strlen(psz_iso_name)+1; -+ free(translated_name); -+ translated_name = (char *) malloc(translated_name_size); -+ if (!translated_name) { -+ report( stderr, "Error allocating memory\n" ); -+ return; -+ } -+ } - - if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) { - iso9660_name_translate_ext(psz_iso_name, translated_name, -@@ -564,6 +574,7 @@ print_iso9660_recurse (CdIo_t *p_cdio, c - p_statbuf->rr.i_symlink = 0; - } - } -+ free (translated_name); - - _cdio_list_free (p_entlist, true); - -Index: libcdio-0.78.2/src/iso-info.c -=================================================================== ---- libcdio-0.78.2.orig/src/iso-info.c -+++ libcdio-0.78.2/src/iso-info.c -@@ -205,7 +205,8 @@ print_iso9660_recurse (iso9660_t *p_iso, - CdioList_t *dirlist = _cdio_list_new (); - CdioListNode_t *entnode; - uint8_t i_joliet_level = iso9660_ifs_get_joliet_level(p_iso); -- -+ char *translated_name = (char *) malloc(4096); -+ size_t translated_name_size = 4096; - entlist = iso9660_ifs_readdir (p_iso, psz_path); - - if (opts.print_iso9660) { -@@ -224,7 +225,16 @@ print_iso9660_recurse (iso9660_t *p_iso, - iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode); - char *psz_iso_name = p_statbuf->filename; - char _fullname[4096] = { 0, }; -- char translated_name[MAX_ISONAME+1]; -+ if (strlen(psz_iso_name) >= translated_name_size) { -+ translated_name_size = strlen(psz_iso_name)+1; -+ free(translated_name); -+ translated_name = (char *) malloc(translated_name_size); -+ if (!translated_name) { -+ report( stderr, "Error allocating memory\n" ); -+ return; -+ } -+ } -+ - - if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) { - iso9660_name_translate_ext(psz_iso_name, translated_name, -@@ -258,6 +268,7 @@ print_iso9660_recurse (iso9660_t *p_iso, - p_statbuf->rr.i_symlink = 0; - } - } -+ free (translated_name); - - _cdio_list_free (entlist, true); - diff --git a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch deleted file mode 100644 index 9458eb4d3029..000000000000 --- a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/cd-info.c libcdio-0.78.2/work/libcdio-0.78.2/src/cd-info.c ---- libcdio-0.78.2-orig/work/libcdio-0.78.2/src/cd-info.c 2006-03-17 14:37:08.000000000 -0500 -+++ libcdio-0.78.2/work/libcdio-0.78.2/src/cd-info.c 2007-12-30 10:49:40.000000000 -0500 -@@ -539,7 +539,7 @@ - iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode); - char *psz_iso_name = p_statbuf->filename; - char _fullname[4096] = { 0, }; -- char translated_name[MAX_ISONAME+1]; -+ char *translated_name = (char *) alloca(strlen(psz_iso_name)+1); - - if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) { - iso9660_name_translate_ext(psz_iso_name, translated_name, -diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/iso-info.c libcdio-0.78.2/work/libcdio-0.78.2/src/iso-info.c ---- libcdio-0.78.2-orig/work/libcdio-0.78.2/src/iso-info.c 2006-03-17 14:37:08.000000000 -0500 -+++ libcdio-0.78.2/work/libcdio-0.78.2/src/iso-info.c 2007-12-30 10:49:50.000000000 -0500 -@@ -224,7 +224,8 @@ - iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode); - char *psz_iso_name = p_statbuf->filename; - char _fullname[4096] = { 0, }; -- char translated_name[MAX_ISONAME+1]; -+ char *translated_name = (char *) alloca(strlen(psz_iso_name)+1); -+ - - if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) { - iso9660_name_translate_ext(psz_iso_name, translated_name, diff --git a/dev-libs/libcdio/files/libcdio-0.78.2-gcc-4.3-includes.patch b/dev-libs/libcdio/files/libcdio-0.78.2-gcc-4.3-includes.patch deleted file mode 100644 index f35b66d22b93..000000000000 --- a/dev-libs/libcdio/files/libcdio-0.78.2-gcc-4.3-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur libcdio-0.78.2-orig/include/cdio++/iso9660.hpp libcdio-0.78.2/include/cdio++/iso9660.hpp ---- libcdio-0.78.2-orig/include/cdio++/iso9660.hpp 2006-03-07 15:04:01.000000000 -0600 -+++ libcdio-0.78.2/include/cdio++/iso9660.hpp 2007-11-18 19:41:03.000000000 -0600 -@@ -30,6 +30,7 @@ - #include <cdio/iso9660.h> - #include <cdio++/cdio.hpp> - #include <string.h> -+#include <cstdlib> - #include <vector> // vector class library - using namespace std; - |