[gnucula-commits] Gnucula Conversions.cpp,1.7,1.8 Conversions.h,1.9,1.10 GnuUploadQueue.cpp,1.7,1.8 GnuUploadQueue.h,1.7,1.8 GnuUploadShell.cpp,1.10,1.11 GnuUploadShell.h,1.10,1.11 GnuWordHash.cpp,1.8,1.9 GnuWordHash.h,1.7,1.8 Sha1.cpp,1.7,1.8 Sha1.h,1.8,1.9 stdafx.h,1.14,1.15 tiger.cpp,1.4,1.5 tiger.h,1.5,1.6 tigertree2.cpp,1.1,1.2 tigertree2.h,1.1,1.2

[<ri...@us...>]

Update of /cvsroot/gnucula/Gnucula
In directory sc8-pr-cvs1:/tmp/cvs-serv5110

Modified Files:
	Conversions.cpp Conversions.h GnuUploadQueue.cpp 
	GnuUploadQueue.h GnuUploadShell.cpp GnuUploadShell.h 
	GnuWordHash.cpp GnuWordHash.h Sha1.cpp Sha1.h stdafx.h 
	tiger.cpp tiger.h tigertree2.cpp tigertree2.h 
Log Message:
Mostly just syntax fixes. Unicode strings added.


Index: Conversions.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/Conversions.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Conversions.cpp	8 Jul 2003 08:11:03 -0000	1.7
--- Conversions.cpp	10 Jul 2003 08:31:41 -0000	1.8
***************
*** 28,31 ****
--- 28,37 ----
  #include "Conversions.h"
  
+ #ifdef OPENGCC
+ #include <stdlib.h>
+ #include <stdio.h>
+ using namespace std;
+ #endif
+ 
  // Get rid of ugly warnings
  #pragma warning (disable : 4786)
***************
*** 122,130 ****
  	char buff[16];
  
! 	::sprintf (buff, "%u", in);
  
  	return buff;
  }
  
  CharString IPtoStr(IP in)
  {
--- 128,137 ----
  	char buff[16];
  
! 	::sprintf(buff, "%u", in);
  
  	return buff;
  }
  
+ #ifndef OPENGCC
  CharString IPtoStr(IP in)
  {
***************
*** 183,186 ****
--- 190,194 ----
  	return out;
  }
+ #endif
  
  CharString EncodeBase16(const unsigned char* buffer, unsigned int bufLen)
***************
*** 190,195 ****
--- 198,208 ----
  	for (int i = 0; i < bufLen; i++)
  	{
+ 		#ifndef OPENGCC // no EOS, += doesn't work; neither does this workaround...
  		Base16Buff += base16Chars[buffer[i] >> 4];
  		Base16Buff += base16Chars[buffer[i] & 0xf];
+ 		#else
+ 		Base16Buff.AddString(base16Chars[buffer[i] >> 4], 1);
+ 		Base16Buff.AddString(base16Chars[buffer[i] & 0xf], 1);
+ 		#endif
  	}
  	return Base16Buff;
***************
*** 199,203 ****
  {
  	memset(buffer, 0, DecodeLengthBase16(base16BufLen));
!   
  	for (int i = 0; i < base16BufLen; i++)
  	{
--- 212,216 ----
  {
  	memset(buffer, 0, DecodeLengthBase16(base16BufLen));
! 
  	for (int i = 0; i < base16BufLen; i++)
  	{
***************
*** 206,210 ****
          // Check to make sure that the given word falls inside a valid range
  		byte word = 0;
!         
  		if (lookup < 0 || lookup >= BASE16_LOOKUP_MAX)
  			word = 0xFF;
--- 219,223 ----
          // Check to make sure that the given word falls inside a valid range
  		byte word = 0;
! 
  		if (lookup < 0 || lookup >= BASE16_LOOKUP_MAX)
  			word = 0xFF;
***************
*** 215,219 ****
  		{
  			buffer[i/2] = word << 4;
! 		} 
  		else
  		{
--- 228,232 ----
  		{
  			buffer[i/2] = word << 4;
! 		}
  		else
  		{
***************
*** 236,240 ****
  {
  	CharString Base32Buff;
!     
  	unsigned int i, index;
  	unsigned char word;
--- 249,253 ----
  {
  	CharString Base32Buff;
! 
  	unsigned int i, index;
  	unsigned char word;
***************
*** 263,269 ****
  
  		// assert(word < 32);
  
- 		Base32Buff += (char) base32Chars[word];
-         
  		//*(base32Buffer++) = (char) base32Chars[word];
  	} // end for
--- 276,285 ----
  
  		// assert(word < 32);
+ 		#ifdef OPENGCC // no EOS, += doesn't work; neither does this workaround...
+ 		Base32Buff.AddString(base32Chars[word], 1);
+ 		#else
+ 		Base32Buff += base32Chars[word];
+ 		#endif
  
  		//*(base32Buffer++) = (char) base32Chars[word];
  	} // end for
***************
*** 323,326 ****
--- 339,343 ----
  }
  
+ #ifndef OPENGCC
  // Converts a string representation to a CTime
  CTime StrToCTime(CharString& str)
***************
*** 435,438 ****
--- 452,456 ----
  	return strBlocked;
  }
+ #endif // OPENGCC
  
  CharString HashIDtoTag(int HashID)
***************
*** 483,488 ****
  CharString CommaIze(CharString in)
  {
! 	if (in.GetLength() > 3)
! 		return CommaIze(in.Left(in.GetLength() - 3)) + "," + in.Right(3);
  	else
  		return in;
--- 501,513 ----
  CharString CommaIze(CharString in)
  {
! 	int Len = in.GetLength();
! 
! 	if (Len > 3)
! 	{
! 		CharString out;
! 		for (int pos = Len % 4; pos < Len; pos + 4, Len++)
! 			out.Insert(pos, ",");
! 		return out;
! 	}
  	else
  		return in;
***************
*** 497,510 ****
  	//char*  buffer;
  
! 	CharString strNumber(_fcvt(dNumber, 2, &decimal, &sign));
  	
! 	if (decimal == 0)
! 		strNumber.Insert(0, "0.");
! 	else if (decimal == -1)
! 		strNumber.Insert(0, "0.0");
! 	else if (decimal < -1)
! 		return "0.00";
! 	else
! 		strNumber.Insert(decimal, '.');
  
  	return strNumber;
--- 522,537 ----
  	//char*  buffer;
  
! 	CharString strNumber(FloatToString(dNumber));
! 
! //CharString strNumber(_fcvt(dNumber, 2, &decimal, &sign));
  	
! //	if (decimal == 0)
! //		strNumber.Insert(0, "0.");
! //	else if (decimal == -1)
! //		strNumber.Insert(0, "0.0");
! //	else if (decimal < -1)
! //		return "0.00";
! //	else
! //		strNumber.Insert(decimal, '.');
  
  	return strNumber;
***************
*** 523,527 ****
  
  		if (result.GetLength() > 2)
! 			result.Insert( result.GetLength() - 2, ".");
  		else
  		{
--- 550,554 ----
  
  		if (result.GetLength() > 2)
! 			result.Insert(result.GetLength() - 2, ".");
  		else
  		{
***************
*** 564,568 ****
  		{
  			copy++;
! 			Front = Front.Left(spacepos) + " " + DWrdtoStr(copy);
  		}
  	}
--- 591,596 ----
  		{
  			copy++;
! 			Front = Front.Left(spacepos) + " ";
! 			Front += DWrdtoStr(copy);
  		}
  	}
***************
*** 573,577 ****
  	
  	if (dotpos != -1)
! 		Front += FileName.Right( FileName.GetLength() - dotpos);
  
  	return Front;
--- 601,605 ----
  	
  	if (dotpos != -1)
! 		Front += FileName.Right(FileName.GetLength() - dotpos);
  
  	return Front;
***************
*** 681,682 ****
--- 709,832 ----
  }
  
+ 
+ wchar_t *AsciiToWide(char *ConvertMe, int& Len)
+ {
+ 	int i = 0;
+ 	if (Len <= 0)
+ 	{ // we need to get the proper Len
+ 		for (i = 0; *(ConvertMe + i) != '\0'; i++) {
+ 			; }
+ 		Len = i;
+ 	}
+ 
+ 	wchar_t *ConvertedArray = new wchar_t[Len];
+ 	for (i = 0; i < Len; i++)
+ 		ConvertedArray[i] = (wchar_t) *(ConvertMe + i);
+ 	ConvertedArray[i] = '\0';
+ 
+ 	return ConvertedArray;
+ }
+ 
+ char *FloatToString(double in)
+ { // check that this works; untested
+ int i;
+ int temp_int = (int) in;
+ char *part_one = IntToString(temp_int);
+ in = (in - temp_int) * 100000;
+ temp_int = (int) in;
+ char *part_two = IntToString(temp_int);
+ 
+ for (i = 0; *(part_one + i) != '\0'; i++) {
+ 	; }
+ temp_int = i;
+ for (i = 0; *(part_two + i) != '\0'; i++) {
+ 	; }
+ temp_int += i + 1; // +1 for '.'
+ 
+ char return_array[temp_int];
+ char *return_me = return_array;
+ 
+ for (i = 0; *(part_one + i) != '\0'; i++)
+ 	*(return_me + i) = *(part_one + i);
+ temp_int = i + 1;
+ *(return_me + temp_int) = '.';
+ for (i = 0; *(part_two + i) != '\0'; i++)
+ 	*(return_me + i + temp_int) = *(part_one + i);
+ *(return_me + i + temp_int) = '\0';
+ 
+ return return_me;
+ }
+ 
+ char *IntToString(int number)
+ { // with significant thanks owed to other open implementations...
+ static char buf[21];
+ char *p = buf + 20;
+ if (number >= 0)
+ 	{
+ 	do
+ 		{
+ 		*--p = '0' + (number % 10);
+ 		number /= 10;
+ 		} while (number != 0);
+ 
+ 	return p;
+ 	}
+ else			/* number < 0 */
+ 	{
+ 	do
+ 		{
+ 		*--p = '0' - (number % 10);
+ 		number /= 10;
+ 		} while (number != 0);
+ 
+ 	*--p = '-';
+ 	}
+ return p;
+ }
+ 
+ float StringToFloat(char *convert_me)
+ {
+ 	int i = 0, j = 0;
+ 	float return_me = 0;
+ 	static char temp[7];
+ 	for (i = 0; (*(convert_me + i) != '.' && *(convert_me + i) != '\0' && i < 7); i++)
+ 		temp[i] = *(convert_me + i);
+ 
+ 	temp[i] = '\0';
+ 	return_me = StringToInt(temp);
+ 	if (*(convert_me + i) == '.')
+ 	{
+ 		j = i;
+ 		for (i = 0; (*(convert_me + i + j) != '\0' && *(convert_me + i + j) != '\n' && i < 7); i++)
+ 			temp[i] = *(convert_me + i + j);
+ 		temp[i] = '\0';
+ 
+ 		return_me += atof(temp);
+ 	}
+ 	return return_me;
+ }
+ 
+ int StringToInt(char *convert_me)
+ {
+ 	return atoi(convert_me);
+ }
+ 
+ #ifdef OPENGCC
+ int atoi(CharString convert_me)
+ {
+ int Len = convert_me.GetLength();
+ char TempArray[Len];
+ char *Temp = TempArray;
+ convert_me.CopyText(Temp);
+ return atoi(convert_me);
+ }
+ 
+ int atol(CharString convert_me)
+ {
+ int Len = convert_me.GetLength();
+ char TempArray[Len];
+ char *Temp = TempArray;
+ convert_me.CopyText(Temp);
+ return atol(convert_me);
+ }
+ #endif

Index: Conversions.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/Conversions.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Conversions.h	9 Jul 2003 05:50:08 -0000	1.9
--- Conversions.h	10 Jul 2003 08:31:41 -0000	1.10
***************
*** 33,36 ****
--- 33,37 ----
  #else
  #include "./platform/opengcc/typedefs.h"
+ 
  #endif
  
***************
*** 39,42 ****
--- 40,44 ----
  CharString DWrdtoStr(UINT);		// Convert DWORD to a CharString
  
+ #ifndef OPENGCC // need IP and CTime workarounds
  CharString IPtoStr(IP);			// Convert IP to CharString
  IP      StrtoIP(CharString in);	// Convert CharString to an IP
***************
*** 47,50 ****
--- 49,53 ----
  CTime	StrToCTime(CharString& str);	// Converts a string representation to a CTime
  CharString CTimeToStr(CTime& time);	// reverse of above
+ #endif
  
  CharString EncodeBase16(const byte* buffer, unsigned int bufLen);
***************
*** 61,66 ****
--- 64,71 ----
  CharString GetSpeedString(DWORD dwSpeed);
  
+ #ifndef OPENGCC
  BlockedHost StrtoBlocked(CharString strBlocked);
  CharString		BlockedtoStr(BlockedHost badHost);
+ #endif
  
  CharString HashIDtoTag(int HashID);
***************
*** 74,77 ****
--- 79,94 ----
  CharString GetPercentage(DWORD , DWORD );
  CharString IncrementName(CharString);
+ 
+ wchar_t *AsciiToWide(char *, int&);
+ 
+ char *FloatToString(double);
+ char *IntToString(int);
+ float StringToFloat(char *);
+ int StringToInt(char *);
+ 
+ #ifdef OPENGCC
+ int atoi(CharString);
+ int atol(CharString);
+ #endif
  
  #endif // CONVERSIONS_H

Index: GnuUploadQueue.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuUploadQueue.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GnuUploadQueue.cpp	31 May 2003 01:17:58 -0000	1.7
--- GnuUploadQueue.cpp	10 Jul 2003 08:31:41 -0000	1.8
***************
*** 2,6 ****
  
  	Gnucula - A Gnutella Library Based on GnucDNA
!     Copyright (C) 2000-2002 John Marshall
  
      This library is free software; you can redistribute it and/or
--- 2,6 ----
  
  	Gnucula - A Gnutella Library Based on GnucDNA
!     Copyright (C) 2000-2003 John Marshall
  
      This library is free software; you can redistribute it and/or
***************
*** 23,29 ****
  
  ********************************************************************************/
- 
- 
- #include "stdafx.h"
  
  #include "GnuPrefs.h"
--- 23,26 ----

Index: GnuUploadQueue.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuUploadQueue.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GnuUploadQueue.h	9 Jul 2003 06:37:44 -0000	1.7
--- GnuUploadQueue.h	10 Jul 2003 08:31:41 -0000	1.8
***************
*** 24,27 ****
--- 24,30 ----
  ********************************************************************************/
  
+ #ifndef GNU_UPLOAD_QUEUE_H
+ #define GNU_UPLOAD_QUEUE_H
+ 
  
  #ifndef OPENGCC
***************
*** 30,36 ****
  #endif
  
- #ifndef GNU_UPLOAD_QUEUE_H
- #define GNU_UPLOAD_QUEUE_H
- 
  #include "stdafx.h"
  #include "GnuUploadShell.h"
--- 33,36 ----
***************
*** 45,49 ****
  	int		UploadID;
  	IP      Host;
! 	CString RequestURI;
  	int     SecsLeft;
  
--- 45,49 ----
  	int		UploadID;
  	IP      Host;
! 	CharString RequestURI;
  	int     SecsLeft;
  

Index: GnuUploadShell.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuUploadShell.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GnuUploadShell.cpp	4 Jul 2003 20:23:12 -0000	1.10
--- GnuUploadShell.cpp	10 Jul 2003 08:31:41 -0000	1.11
***************
*** 126,130 ****
  }
  
! void CGnuUploadShell::ParseRequest(CString Handshake)
  {
  	if (!m_Socket)
--- 126,130 ----
  }
  
! void CGnuUploadShell::ParseRequest(CharString Handshake)
  {
  	if (!m_Socket)
***************
*** 150,154 ****
  	
  	//Parse Request-Line
! 	CString FirstLine = Handshake.Left(Handshake.Find("\r\n") );
  	FirstLine.MakeLower();
  
--- 150,154 ----
  	
  	//Parse Request-Line
! 	CharString FirstLine = Handshake.Left(Handshake.Find("\r\n") );
  	FirstLine.MakeLower();
  
***************
*** 188,192 ****
  	m_RequestURI = DecodeURL(m_RequestURI);
  
! 	CString LowRequestURI = m_RequestURI;
  	LowRequestURI.MakeLower();
  	
--- 188,192 ----
  	m_RequestURI = DecodeURL(m_RequestURI);
  
! 	CharString LowRequestURI = m_RequestURI;
  	LowRequestURI.MakeLower();
  	
***************
*** 201,205 ****
  	else if (LowRequestURI.Left(5) == "/get/")
  	{
! 		CString IndexString = m_RequestURI.Mid(5, m_RequestURI.Find("/", 5) - 5);
  		
  		m_Index = atoi(IndexString);	
--- 201,205 ----
  	else if (LowRequestURI.Left(5) == "/get/")
  	{
! 		CharString IndexString = m_RequestURI.Mid(5, m_RequestURI.Find("/", 5) - 5);
  		
  		m_Index = atoi(IndexString);	
***************
*** 226,230 ****
  
  	// Parse X-Gnutella-Content-URN
! 	CString urn = ParsedHeaders.FindHeader("X-Gnutella-Content-URN");
  	urn.MakeLower();
  
--- 226,230 ----
  
  	// Parse X-Gnutella-Content-URN
! 	CharString urn = ParsedHeaders.FindHeader("X-Gnutella-Content-URN");
  	urn.MakeLower();
  
***************
*** 240,244 ****
  	if (m_Index)
  	{
! 		CString UploadPath = m_pShare->GetFilePath(m_Index);
  		m_Name = m_pShare->GetFileName(m_Index);
  
--- 240,244 ----
  	if (m_Index)
  	{
! 		CharString UploadPath = m_pShare->GetFilePath(m_Index);
  		m_Name = m_pShare->GetFileName(m_Index);
  
***************
*** 310,315 ****
  
  	// Parse Keep-Alive, set as default in HTTP/1.1
! 	m_KeepAlive = (m_HTTPVersion == "HTTP/1.1") ? true : false;
! 	CString ConnectionValue = ParsedHeaders.FindHeader("Connection");
  	ConnectionValue.MakeLower();
  
--- 310,315 ----
  
  	// Parse Keep-Alive, set as default in HTTP/1.1
! 	m_KeepAlive = (m_HTTPVersion == "HTTP/1.1") ? true : false; // ? extension probably not needed
! 	CharString ConnectionValue = ParsedHeaders.FindHeader("Connection");
  	ConnectionValue.MakeLower();
  
***************
*** 331,336 ****
  	{
  		//For each header
! 		CString HeaderName  = ParsedHeaders.m_Headers[i].Name;
! 		CString HeaderValue = ParsedHeaders.m_Headers[i].Value;
  		HeaderName.MakeLower();
  
--- 331,336 ----
  	{
  		//For each header
! 		CharString HeaderName  = ParsedHeaders.m_Headers[i].Name;
! 		CharString HeaderValue = ParsedHeaders.m_Headers[i].Value;
  		HeaderName.MakeLower();
  
***************
*** 488,492 ****
  }
  
! CString CGnuUploadShell::GetFilePath()
  {
  	return m_pShare->GetFilePath(m_Index);
--- 488,492 ----
  }
  
! CharString CGnuUploadShell::GetFilePath()
  {
  	return m_pShare->GetFilePath(m_Index);
***************
*** 495,499 ****
  void CGnuUploadShell::RunFile()
  {
! 	CString Path = GetFilePath();
  				
  	if (Path != "")
--- 495,499 ----
  void CGnuUploadShell::RunFile()
  {
! 	CharString Path = GetFilePath();
  				
  	if (Path != "")
***************
*** 675,679 ****
  }
  
! bool CGnuUploadShell::ParseRangeHeader(CString Value)
  {
  	// Example HeaderValue: "bytes=100-200"
--- 675,679 ----
  }
  
! bool CGnuUploadShell::ParseRangeHeader(CharString Value)
  {
  	// Example HeaderValue: "bytes=100-200"
***************
*** 697,702 ****
  
  	// bytes=FirstValue-LastValue
! 	CString FirstValue = Value.Mid(6, dashpos-6);
! 	CString LastValue  = Value.Mid(dashpos+1);
  
  	// Full range request
--- 697,702 ----
  
  	// bytes=FirstValue-LastValue
! 	CharString FirstValue = Value.Mid(6, dashpos-6);
! 	CharString LastValue  = Value.Mid(dashpos+1);
  
  	// Full range request

Index: GnuUploadShell.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuUploadShell.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GnuUploadShell.h	4 Jul 2003 20:23:12 -0000	1.10
--- GnuUploadShell.h	10 Jul 2003 08:31:41 -0000	1.11
***************
*** 27,30 ****
--- 27,33 ----
  #ifndef OPENGCC
  #pragma once
+ typedef CString CharString;
+ #else
+ #include "./platform/opengcc/typedefs.h"
  #endif
  
***************
*** 60,64 ****
  	int GetETD();
  
! 	CString GetFilePath();
  	void RunFile();
  
--- 63,67 ----
  	int GetETD();
  
! 	CharString GetFilePath();
  	void RunFile();
  
***************
*** 69,87 ****
  	int  		m_Attempts;
  
! 	CString m_Name;
  	int     m_Index;
  	CFileLock m_File;
  	//CFile   m_CheckFile;
  	//CFile	m_MirrorFile;
! 	CString m_Sha1Hash;
  	
! 	CString m_TigerHash;
  	bool    m_TigerTreeRequest;
  	byte*   m_TigerTree;
  	int     m_TreeSize;
  	
! 	CString m_RequestURI;
! 	CString m_HTTPMethod;
! 	CString m_HTTPVersion;
  
  	bool    m_IsPartial;
--- 72,90 ----
  	int  		m_Attempts;
  
! 	CharString m_Name;
  	int     m_Index;
  	CFileLock m_File;
  	//CFile   m_CheckFile;
  	//CFile	m_MirrorFile;
! 	CharString m_Sha1Hash;
  	
! 	CharString m_TigerHash;
  	bool    m_TigerTreeRequest;
  	byte*   m_TigerTree;
  	int     m_TreeSize;
  	
! 	CharString m_RequestURI;
! 	CharString m_HTTPMethod;
! 	CharString m_HTTPVersion;
  
  	bool    m_IsPartial;
***************
*** 94,98 ****
  	int			m_CurrentPos;
  	DWORD   m_Status;
! 	CString m_Error;
  	bool		m_UpdatedInSecond;
  	
--- 97,101 ----
  	int			m_CurrentPos;
  	DWORD   m_Status;
! 	CharString m_Error;
  	bool		m_UpdatedInSecond;
  	
***************
*** 104,108 ****
  	int  		m_QueuePos;
  
! 	CString m_Handshake;
  
  	int			m_BytesSent;
--- 107,111 ----
  	int  		m_QueuePos;
  
! 	CharString m_Handshake;
  
  	int			m_BytesSent;

Index: GnuWordHash.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuWordHash.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GnuWordHash.cpp	6 Jul 2003 20:35:33 -0000	1.8
--- GnuWordHash.cpp	10 Jul 2003 08:31:41 -0000	1.9
***************
*** 299,303 ****
  }
  
! void CGnuWordHash::BreakupName(std::basic_string<char> Name, std::vector< std::basic_string<char> > &Keywords)
  {
  	// all non-alphanumric characters 0 - 127 are treated as spaces, except for apostraphe
--- 299,303 ----
  }
  
! void CGnuWordHash::BreakupName(std::basic_string<char> Name, std::vector<std::basic_string<char>> &Keywords)
  {
  	// all non-alphanumric characters 0 - 127 are treated as spaces, except for apostraphe
***************
*** 384,389 ****
  {
  	// Break Query into individual words
! 	std::vector< std::basic_string<char> > Keywords;
! 	BreakupName( (LPCTSTR) SearchQuery.QueryText, Keywords);
  
  
--- 384,389 ----
  {
  	// Break Query into individual words
! 	std::vector<std::basic_string<char>> Keywords;
! 	BreakupName((LPCTSTR) SearchQuery.QueryText, Keywords);
  
  
***************
*** 393,400 ****
  	for (i = 0; i < SearchQuery.QueryExtended.size(); i++)
  	{
! 		CString QueryEx = SearchQuery.QueryExtended[i];
  		QueryEx.MakeLower();
  
- 
  		// detect urn:etc...
  		
--- 393,399 ----
  	for (i = 0; i < SearchQuery.QueryExtended.size(); i++)
  	{
! 		CharString QueryEx = SearchQuery.QueryExtended[i];
  		QueryEx.MakeLower();
  
  		// detect urn:etc...
  		
***************
*** 404,409 ****
  			// Insert [HashID]:[hash] into table
  			Keywords.push_back((LPCTSTR) QueryEx) ;
! 
! 				
  		// break out meta data
  		BreakupMeta(QueryEx, Keywords);
--- 403,407 ----
  			// Insert [HashID]:[hash] into table
  			Keywords.push_back((LPCTSTR) QueryEx) ;
! 		
  		// break out meta data
  		BreakupMeta(QueryEx, Keywords);
***************
*** 419,423 ****
  		UINT WordHash = Hash(Keywords[i], TABLE_BITS);
  
- 
  		// Intersect with local files to get results
  		if (LocalMatch)
--- 417,420 ----
***************
*** 547,551 ****
  }
  
! void CGnuWordHash::BreakupMeta(CString &QueryEx, std::vector< std::basic_string<char> > &Keywords)
  {
  	// Get rid of <?xml version='1.0'?>
--- 544,548 ----
  }
  
! void CGnuWordHash::BreakupMeta(CharString &QueryEx, std::vector< std::basic_string<char> > &Keywords)
  {
  	// Get rid of <?xml version='1.0'?>
***************
*** 582,586 ****
  		if (SpacePos != -1)
  		{
! 			CString MetaName = QueryEx.Left(SpacePos);
  			
  			if (!MetaName.IsEmpty())
--- 579,583 ----
  		if (SpacePos != -1)
  		{
! 			CharString MetaName = QueryEx.Left(SpacePos);
  			
  			if (!MetaName.IsEmpty())
***************
*** 595,599 ****
  			while (EqualPos != -1 && SpacePos != -1 && SpacePos < EqualPos)
  			{
! 				CString AttributeName = QueryEx.Mid(SpacePos + 1, EqualPos - SpacePos - 1);
  				
  				int FrontQuotePos = QueryEx.Find("'", EqualPos);
--- 592,596 ----
  			while (EqualPos != -1 && SpacePos != -1 && SpacePos < EqualPos)
  			{
! 				CharString AttributeName = QueryEx.Mid(SpacePos + 1, EqualPos - SpacePos - 1);
  				
  				int FrontQuotePos = QueryEx.Find("'", EqualPos);
***************
*** 602,613 ****
  				if (!AttributeName.IsEmpty() && FrontQuotePos < BackQuotePos)
  				{
! 					CString AttributeValue = QueryEx.Mid(FrontQuotePos + 1, BackQuotePos - FrontQuotePos - 1);
  
  					// Break up any value into keywords
  					std::vector< std::basic_string<char> > KeyValues;
! 					BreakupName( (LPCTSTR) AttributeValue, KeyValues);
  
  					for (int i = 0; i < KeyValues.size(); i++)
! 						Keywords.push_back( (LPCTSTR) (MetaName + "." + AttributeName + "=" + KeyValues[i].c_str()) ) ;
  				}
  				else
--- 599,610 ----
  				if (!AttributeName.IsEmpty() && FrontQuotePos < BackQuotePos)
  				{
! 					CharString AttributeValue = QueryEx.Mid(FrontQuotePos + 1, BackQuotePos - FrontQuotePos - 1);
  
  					// Break up any value into keywords
  					std::vector< std::basic_string<char> > KeyValues;
! 					BreakupName((LPCTSTR) AttributeValue, KeyValues);
  
  					for (int i = 0; i < KeyValues.size(); i++)
! 						Keywords.push_back((LPCTSTR) (MetaName + "." + AttributeName + "=" + KeyValues[i].c_str()) ) ;
  				}
  				else
***************
*** 620,624 ****
  			}
  		}
- 
  	}
  }
--- 617,620 ----

Index: GnuWordHash.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuWordHash.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GnuWordHash.h	28 May 2003 21:01:56 -0000	1.7
--- GnuWordHash.h	10 Jul 2003 08:31:41 -0000	1.8
***************
*** 2,6 ****
  
  	Gnucula - A Gnutella Library Based on GnucDNA
!     Copyright (C) 2000-2002 John Marshall
  
      This library is free software; you can redistribute it and/or
--- 2,6 ----
  
  	Gnucula - A Gnutella Library Based on GnucDNA
!     Copyright (C) 2000-2003 John Marshall
  
      This library is free software; you can redistribute it and/or
***************
*** 24,35 ****
  ********************************************************************************/
  
  
  #ifndef OPENGCC
  #pragma once
  #endif
  
- #ifndef GNU_WORD_HASH_H
- #define GNU_WORD_HASH_H
- 
  
  #define TABLE_BITS		16
--- 24,38 ----
  ********************************************************************************/
  
+ #ifndef GNU_WORD_HASH_H
+ #define GNU_WORD_HASH_H
+ 
  
  #ifndef OPENGCC
  #pragma once
+ typedef CString CharString;
+ #else
+ #include "./platform/opengcc/typedefs.h"
  #endif
  
  
  #define TABLE_BITS		16
***************
*** 56,60 ****
  
  	void BreakupName(std::basic_string<char> Name, std::vector< std::basic_string<char> > &Keywords);
! 	void BreakupMeta(CString &QueryEx, std::vector< std::basic_string<char> > &Keywords);
  
  	void AddWord(std::vector< std::basic_string<char> > &Keywords, std::basic_string<char> Word);
--- 59,63 ----
  
  	void BreakupName(std::basic_string<char> Name, std::vector< std::basic_string<char> > &Keywords);
! 	void BreakupMeta(CharString &QueryEx, std::vector< std::basic_string<char> > &Keywords);
  
  	void AddWord(std::vector< std::basic_string<char> > &Keywords, std::basic_string<char> Word);

Index: Sha1.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/Sha1.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Sha1.cpp	8 Jul 2003 00:33:08 -0000	1.7
--- Sha1.cpp	10 Jul 2003 08:31:41 -0000	1.8
***************
*** 384,388 ****
  
  // from conversions, not here in DNA anymore
! CharString EncodeBase32(const unsigned char* buffer, unsigned int bufLen)
  {
  	CharString Base32Buff;
--- 384,388 ----
  
  // from conversions, not here in DNA anymore
! /*CharString EncodeBase32(const unsigned char* buffer, unsigned int bufLen)
  {
  	CharString Base32Buff;
***************
*** 394,398 ****
      for(i = 0, index = 0; i < bufLen;)
      {
!         /* Is the current word going to span a byte boundary? */
          if (index > 3)
          {
--- 394,398 ----
      for(i = 0, index = 0; i < bufLen;)
      {
!         /* Is the current word going to span a byte boundary? *//*
          if (index > 3)
          {
***************
*** 424,426 ****
  
      return Base32Buff;
! }
--- 424,426 ----
  
      return Base32Buff;
! }*/

Index: Sha1.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/Sha1.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Sha1.h	9 Jul 2003 05:50:08 -0000	1.8
--- Sha1.h	10 Jul 2003 08:31:41 -0000	1.9
***************
*** 35,39 ****
  void	SubSha1toBase32(BYTE *out, const BYTE *in);
  
! CharString EncodeBase32(const byte* buffer, unsigned int bufLen);
  
  #if 1
--- 35,39 ----
  void	SubSha1toBase32(BYTE *out, const BYTE *in);
  
! // CharString EncodeBase32(const byte* buffer, unsigned int bufLen);
  
  #if 1

Index: stdafx.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/stdafx.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** stdafx.h	9 Jul 2003 05:50:08 -0000	1.14
--- stdafx.h	10 Jul 2003 08:31:41 -0000	1.15
***************
*** 92,95 ****
--- 92,96 ----
  #include "platform/opengcc/typedefs.h" // some type workarounds
  #include "platform/opengcc/strings.h"
+ #include "platform/opengcc/w_strings.h"
  #include "zlib/zlib.h"
  #endif // end OPENGCC 
***************
*** 104,109 ****
  
  
! // Debugging
! #define new DEBUG_NEW
  
  // Master Version
--- 105,110 ----
  
  
! // Debugging (screws up 'new' keyword; disabled.)
! // #define new DEBUG_NEW
  
  // Master Version

Index: tiger.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/tiger.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tiger.cpp	4 Jul 2003 22:06:13 -0000	1.4
--- tiger.cpp	10 Jul 2003 08:31:41 -0000	1.5
***************
*** 154,158 ****
--- 154,160 ----
  void tiger_compress(word64 *str, word64 state[3])
  {
+ #ifndef OPENGCC // right shift count >= width of type (compiler error)
    tiger_compress_macro(((word64*)str), ((word64*)state));
+ #endif
  }
  
***************
*** 170,176 ****
--- 172,180 ----
    unsigned char temp[64];
  
+   #ifndef OPENGCC // integer constant out of range (compiler error)
    res[0]=0x0123456789ABCDEF;
    res[1]=0xFEDCBA9876543210;
    res[2]=0xF096A5B4C3B2E187;
+   #endif
  
    for (i=length; i>=64; i-=64)

Index: tiger.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/tiger.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tiger.h	4 Jul 2003 20:23:12 -0000	1.5
--- tiger.h	10 Jul 2003 08:31:41 -0000	1.6
***************
*** 9,13 ****
--- 9,18 ----
  #define TIGER_H
  
+ #ifndef OPENGCC
  typedef unsigned __int64	word64;
+ #else
+ #include "platform/opengcc/typedefs.h"
+ #endif
+ 
  typedef unsigned int		word32;
  typedef unsigned short int	word16;

Index: tigertree2.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/tigertree2.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tigertree2.cpp	4 Jul 2003 20:23:12 -0000	1.1
--- tigertree2.cpp	10 Jul 2003 08:31:41 -0000	1.2
***************
*** 43,47 ****
   */
  
! #include "StdAfx.h"
  #include "tigertree2.h"
  
--- 43,47 ----
   */
  
! #include "stdafx.h"
  #include "tigertree2.h"
  

Index: tigertree2.h
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/tigertree2.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tigertree2.h	4 Jul 2003 20:23:12 -0000	1.1
--- tigertree2.h	10 Jul 2003 08:31:41 -0000	1.2
***************
*** 15,19 ****
--- 15,24 ----
   * $Id$
   */
+ #ifndef TIGERTREE2_H
+ #define TIGERTREE2_H
+ 
+ #ifndef OPENGCC
  #pragma once
+ #endif
  
  #include "tiger.h"
***************
*** 60,61 ****
--- 65,68 ----
  static void tt2_block(TT2_CONTEXT *ctx);
  static void tt2_compose(TT2_CONTEXT *ctx);
+ 
+ #endif TIGERTREE2_H