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

Fix for [Bug 185091] Include paths are not quoted when adding from "Paths and symbols" tab

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-05-03 16:24:54 +00:00
parent 7d445dd496
commit 6a2f91110e
1 changed files with 42 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
View file

@ -296,21 +296,55 @@ public class BuildEntryStorage extends AbstractEntryStorage {
} }
private String entryValueToOptionStringValue(IOption option, ICLanguageSettingEntry entry){ private String entryValueToOptionStringValue(IOption option, ICLanguageSettingEntry entry){
String result;
boolean checkQuote = true;
if(entry.getKind() == ICLanguageSettingEntry.MACRO && entry.getValue().length() > 0){ if(entry.getKind() == ICLanguageSettingEntry.MACRO && entry.getValue().length() > 0){
return new StringBuffer(entry.getName()).append('=').append(entry.getValue()).toString(); result = new StringBuffer(entry.getName()).append('=').append(entry.getValue()).toString();
} else if(entry instanceof ICLanguageSettingPathEntry){ } else if(entry instanceof ICLanguageSettingPathEntry){
IOptionPathConverter converter = fLangData.getTool().getOptionPathConverter(); IOptionPathConverter converter = fLangData.getTool().getOptionPathConverter();
if(converter instanceof IReverseOptionPathConverter){ if(converter instanceof IReverseOptionPathConverter){
return ((IReverseOptionPathConverter)converter).convertToOptionValue(entry, option, fLangData.getTool()); result = ((IReverseOptionPathConverter)converter).convertToOptionValue(entry, option, fLangData.getTool());
} checkQuote = false;
ICLanguageSettingPathEntry pathEntry = (ICLanguageSettingPathEntry)entry; } else {
if(pathEntry.isValueWorkspacePath()){ ICLanguageSettingPathEntry pathEntry = (ICLanguageSettingPathEntry)entry;
return ManagedBuildManager.fullPathToLocation(pathEntry.getValue()); if(pathEntry.isValueWorkspacePath()){
result = ManagedBuildManager.fullPathToLocation(pathEntry.getValue());
} else {
result = entry.getName();
}
} }
} else {
result = entry.getName();
} }
return entry.getName();
if(checkQuote){
result = doubleQuotePath(result);
}
return result;
}
private String doubleQuotePath(String pathName) {
/* Trim */
pathName = pathName.trim();
/* Check if path is already double-quoted */
boolean bStartsWithQuote = pathName.indexOf('"') == 0;
boolean bEndsWithQuote = pathName.lastIndexOf('"') == pathName.length() - 1;
/* Check for spaces, backslashes or macros */
int i = pathName.indexOf(' ') + pathName.indexOf('\\') //$NON-NLS-1$ //$NON-NLS-2$
+ pathName.indexOf("${"); //$NON-NLS-1$
/* If indexof didn't fail all three times, double-quote path */
if (i != -3) {
if (!bStartsWithQuote)
pathName = "\"" + pathName; //$NON-NLS-1$
if (!bEndsWithQuote)
pathName = pathName + "\""; //$NON-NLS-1$
}
return pathName;
} }
public static String[] macroNameValueFromValue(String value){ public static String[] macroNameValueFromValue(String value){
String nv[] = new String[2]; String nv[] = new String[2];