summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-09-09 09:38:41 +0000
committerOliver Bolte <obo@openoffice.org>2009-09-09 09:38:41 +0000
commitb76cb86eaa0aec1d02c5ff29c5a43e1e7a675b27 (patch)
tree7575d750165f3bbad544795339d673b97bdb956b /jvmfwk
parent78497fa4e72049611317dacf33cad591aca6a8db (diff)
CWS-TOOLING: integrate CWS mhu20
2009-09-01 15:18:43 +0200 mhu r275662 : #i32526# Fixed missing includes, and a wrong cast 2009-08-28 13:30:05 +0200 mhu r275530 : #i32526# Fixed missing includes and remaining merge conflicts. 2009-08-28 13:28:45 +0200 mhu r275529 : #i32526# osl_readLine() now implemented in sal/osl/<platform>/file.cxx 2009-08-26 19:47:53 +0200 mhu r275445 : CWS-TOOLING: rebase CWS mhu20 to trunk@275331 (milestone: DEV300:m56) 2009-08-25 15:47:00 +0200 mhu r275365 : #i32526# Also maintain phys. file offset. 2009-08-25 15:24:56 +0200 mhu r275364 : #i32526# Added buffered file I/O; refactored file.cxx into multiple files. 2009-08-24 10:38:15 +0200 mhu r275294 : #i32526# Correct OpenFlags for osl_openFile(). 2009-05-25 11:07:34 +0200 mhu r272225 : #i32526# Added support for non-seekable file handles (pipe et al.). 2009-05-25 11:01:50 +0200 mhu r272223 : #i32526# Add osl_readLine() test, cleanup obsolete tests. 2009-05-25 10:56:14 +0200 mhu r272221 : #i32526# Add missing include 2009-05-25 10:48:51 +0200 mhu r272220 : #i32526# Accept OpenJDK (IcedTea6) 1.6.0_0 version string 2009-05-15 19:18:20 +0200 mhu r271965 : #i32526# Initial osl/unx buffered file I/O implementation. 2009-05-15 17:41:57 +0200 mhu r271959 : CWS-TOOLING: rebase CWS mhu20 to trunk@271830 (milestone: DEV300:m48) 2009-03-26 17:28:53 +0100 mhu r270091 : CWS-TOOLING: rebase CWS mhu20 to trunk@270033 (milestone: DEV300:m45)
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx18
2 files changed, 11 insertions, 9 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index f3586af32bb5..56972ea0e66f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -159,7 +159,7 @@ bool SunVersion::init(const char *szVersion)
{
//1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 chars.
int len = pCur - pLast;
- if (len != 2)
+ if (len > 2)
return false;
//we've got the update: 01, 02 etc
strncpy(buf, pLast, len);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 055bdae919f3..57b7166d01f6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -241,9 +241,9 @@ FileHandleReader::readLine(rtl::OString * pLine)
{
if (m_nIndex == m_nSize)
{
- sal_uInt64 nRead;
+ sal_uInt64 nRead = 0;
switch (osl_readFile(
- m_aGuard.getHandle(), m_aBuffer, BUFFER_SIZE, &nRead))
+ m_aGuard.getHandle(), m_aBuffer, sizeof(m_aBuffer), &nRead))
{
case osl_File_E_PIPE: //HACK! for windows
nRead = 0;
@@ -256,8 +256,8 @@ FileHandleReader::readLine(rtl::OString * pLine)
m_nIndex = 0;
m_nSize = static_cast< int >(nRead);
break;
- case osl_File_E_INTR:
- continue;
+ case osl_File_E_INTR:
+ continue;
default:
return RESULT_ERROR;
@@ -483,19 +483,21 @@ bool getJavaProps(const OUString & exePath,
*/
rtl::OUString decodeOutput(const rtl::OString& s)
{
- OUString sEncoded = OStringToOUString(s, RTL_TEXTENCODING_ASCII_US);
OUStringBuffer buff(512);
sal_Int32 nIndex = 0;
do
{
- OUString aToken = sEncoded.getToken( 0, ' ', nIndex );
+ OString aToken = s.getToken( 0, ' ', nIndex );
if (aToken.getLength())
{
- sal_Unicode value = (sal_Unicode) aToken.toInt32();
+ sal_Unicode value = (sal_Unicode)(aToken.toInt32());
buff.append(value);
}
} while (nIndex >= 0);
- return buff.makeStringAndClear();
+
+ OUString sDecoded(buff.makeStringAndClear());
+ JFW_TRACE2(sDecoded);
+ return sDecoded;
}