mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-07 10:33:26 +02:00
Code Issues Wiki Activity

Bug 298615: cygpath >= 1.56 treads space as separator.

Browse source
This commit is contained in:
Markus Schorn 2010-01-14 13:55:54 +00:00
parent a05892cd10
commit 7ce6589439
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/CygPath.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2009 QNX Software Systems and others. * Copyright (c) 2000, 2010 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.utils; package org.eclipse.cdt.utils;
@ -29,6 +30,7 @@ public class CygPath {
private final Process cygpath; private final Process cygpath;
private final BufferedReader stdout; private final BufferedReader stdout;
private final BufferedWriter stdin; private final BufferedWriter stdin;
private boolean fSpaceIsSeparator= false;
public CygPath(String command) throws IOException { public CygPath(String command) throws IOException {
if (!Platform.getOS().equals(Platform.OS_WIN32)) if (!Platform.getOS().equals(Platform.OS_WIN32))
@ -39,7 +41,17 @@ public class CygPath {
stdin = new BufferedWriter(new OutputStreamWriter(cygpath.getOutputStream())); stdin = new BufferedWriter(new OutputStreamWriter(cygpath.getOutputStream()));
stdout = new BufferedReader(new InputStreamReader(cygpath.getInputStream())); stdout = new BufferedReader(new InputStreamReader(cygpath.getInputStream()));
try { try {
getFileName("test"); //$NON-NLS-1$ // test for older cygpath getFileName("test"); //$NON-NLS-1$ // test for older cygpath
// Bug 298615: Test for versions that tread space as a separator
getFileName("a b"); //$NON-NLS-1$
if (stdout.ready()) {
fSpaceIsSeparator= true;
// Read off everything
while(stdout.ready()) {
stdout.read();
}
}
} catch (IOException e) { } catch (IOException e) {
dispose(); dispose();
useOldCygPath = true; useOldCygPath = true;
@ -58,6 +70,14 @@ public class CygPath {
if (useOldCygPath) { if (useOldCygPath) {
return internalgetFileName(name); return internalgetFileName(name);
} }
if (fSpaceIsSeparator && name.indexOf(' ') != -1) {
return internalgetFileName(name);
}
// Clear everything from stdout
while(stdout.ready()) {
stdout.read();
}
stdin.write(name + "\n"); //$NON-NLS-1$ stdin.write(name + "\n"); //$NON-NLS-1$
stdin.flush(); stdin.flush();
String str = stdout.readLine(); String str = stdout.readLine();
@ -79,10 +99,6 @@ public class CygPath {
} }
} }
/**
* @param path
* @return
*/
private String internalgetFileName(String path) throws IOException { private String internalgetFileName(String path) throws IOException {
Process cygPath = null; Process cygPath = null;
BufferedReader reader = null; BufferedReader reader = null;