rpms/jd/FC-5 jd-1.8.5-beta061227-remove-zero-inserted.patch, NONE, 1.1 jd.spec, 1.14, 1.15
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sun Jan 7 06:18:56 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4858
Modified Files:
jd.spec
Added Files:
jd-1.8.5-beta061227-remove-zero-inserted.patch
Log Message:
* Sun Jan 7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.2.beta061227
- Add fix for zero-inserted dat problem
jd-1.8.5-beta061227-remove-zero-inserted.patch:
--- NEW FILE jd-1.8.5-beta061227-remove-zero-inserted.patch ---
--- jd-1.8.5-beta061227/src/dbtree/nodetreebase.cpp.zero 2006-12-21 22:55:19.000000000 +0900
+++ jd-1.8.5-beta061227/src/dbtree/nodetreebase.cpp 2007-01-07 14:52:39.000000000 +0900
@@ -868,7 +868,7 @@
if( size_in > 1 ){
memcpy( m_buffer_lines + m_byte_buffer_lines_left , data, size_in );
m_buffer_lines[ m_byte_buffer_lines_left + size_in ] = '\0';
- add_raw_lines( m_buffer_lines );
+ add_raw_lines( m_buffer_lines, m_byte_buffer_lines_left + size_in );
}
// æ®ãã®åããããã¡ã«ã³ãã¼ãã¦ãã
@@ -921,8 +921,17 @@
//
// é¯ããçã®(è¤æ°)è¡ã®ãã¼ã¿ãåãåã£ã¦datå½¢å¼ã«å¤æã㦠add_one_dat_line() ã«åºå
//
-void NodeTreeBase::add_raw_lines( char* rawlines )
+void NodeTreeBase::add_raw_lines( char* rawlines, size_t size )
{
+ // æã
ãµã¼ãå´ã®datãã¡ã¤ã«ãå£ãã¦ãã¦ãã¼ã¿ä¸ã« \0 ã
+ // å
¥ã£ã¦ããæãããã®ã§åãé¤ã
+ for( size_t i = 0; i < size; ++i ){
+ if( rawlines[ i ] == '\0' ){
+ MISC::ERRMSG( "EOF was inserted in the middle of the raw data" );
+ rawlines[ i ] = ' ';
+ }
+ }
+
// ä¿ååã«rawãã¼ã¿ãå å·¥
rawlines = process_raw_lines( rawlines );
@@ -1014,6 +1023,7 @@
std::cout << datline << std::endl;
#endif
+ m_broken = true;
createTextNode( "broken", COLOR_CHAR );
createBrNode();
createBrNode();
--- jd-1.8.5-beta061227/src/dbtree/nodetreebase.h.zero 2006-12-21 22:05:29.000000000 +0900
+++ jd-1.8.5-beta061227/src/dbtree/nodetreebase.h 2007-01-07 14:37:48.000000000 +0900
@@ -216,7 +216,7 @@
NODE* createTextNodeN( const char* text, int n, int color_text, bool bold = false );
// 以ä¸ãæ§æ解æç¨é¢æ°
- void add_raw_lines( char* rawines );
+ void add_raw_lines( char* rawines, size_t size );
const char* add_one_dat_line( const char* datline );
void parseName( NODE* header, const char* str, int lng );
Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jd.spec 26 Dec 2006 15:48:38 -0000 1.14
+++ jd.spec 7 Jan 2007 06:18:26 -0000 1.15
@@ -16,7 +16,7 @@
# Defined by vendor
#
-%define vendor_rel 1
+%define vendor_rel 2
# Tag name changed from vendor to vendorname so as not to
# overwrite Vendor entry in Summary
%define vendorname fedora
@@ -45,6 +45,7 @@
URL: http://jd4linux.sourceforge.jp/
Source0: http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
#Source0: %{name}-%{main_ver}-%{strtag}.tgz
+Patch1: jd-1.8.5-beta061227-remove-zero-inserted.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{gtkmmdevel}
@@ -60,6 +61,8 @@
%prep
%setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch1 -p1 -b .zero
+
find . -name CVS | sort -r | xargs %{__rm} -rf
%build
@@ -106,6 +109,9 @@
%{icondir}/%{name}.png
%changelog
+* Sun Jan 7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.2.beta061227
+- Add fix for zero-inserted dat problem
+
* Tue Dec 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.1.beta061227
- 1.8.5 beta 061227
More information about the scm-commits
mailing list