mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 13:05:22 +02:00
Code Issues Wiki Activity

dstore - deal with \r\n in upload(IInputStream...) same as upload(File...)

Browse source
This commit is contained in:
David McKnight 2007-11-07 17:21:35 +00:00
parent 98f5efc654
commit 002b3f7d0a
1 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -251,6 +251,19 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
int available = bufInputStream.available(); int available = bufInputStream.available();
// line separator of local machine
String localLineSep = System.getProperty("line.separator"); //$NON-NLS-1$
// line separator of remote machine
String targetLineSep = "\n"; //$NON-NLS-1$
if (!unixStyle) {
targetLineSep = "\r\n"; //$NON-NLS-1$
}
int localLineSepLength = localLineSep.length();
long totalSent = 0; long totalSent = 0;
// upload bytes while available // upload bytes while available
@ -273,12 +286,36 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
if (!isBinary && hostEncoding != null) if (!isBinary && hostEncoding != null)
{ {
String tempStr = new String(buffer, 0, bytesRead); String tempStr = new String(buffer, 0, bytesRead);
// if the line end characters of the local and remote machines are different, we need to replace them
if (!localLineSep.equals(targetLineSep)) {
int index = tempStr.indexOf(localLineSep);
StringBuffer buf = new StringBuffer();
boolean lineEndFound = false;
int lastIndex = 0;
while (index != -1) {
buf = buf.append(tempStr.substring(lastIndex, index));
buf = buf.append(targetLineSep);
if (!lineEndFound) {
lineEndFound = true;
}
lastIndex = index+localLineSepLength;
index = tempStr.indexOf(localLineSep, lastIndex);
}
if (lineEndFound) {
buf = buf.append(tempStr.substring(lastIndex));
tempStr = buf.toString();
}
}
// hack for zOS - \r causes problems for compilers
// if (osName != null && (osName.startsWith("z") || osName.equalsIgnoreCase("aix")))
// {
// tempStr = tempStr.replace('\r', ' ');
// }
convBytes = tempStr.getBytes(hostEncoding); convBytes = tempStr.getBytes(hostEncoding);