rpms/jd/devel jd-1.8.5-beta061227-remove-zero-inserted.patch, NONE, 1.1 jd.spec, 1.55, 1.56

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4814

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/devel/jd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- jd.spec	26 Dec 2006 15:47:38 -0000	1.55
+++ jd.spec	7 Jan 2007 06:18:16 -0000	1.56
@@ -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