--- linuxsampler/trunk/src/network/lscpserver.cpp 2007/10/11 18:53:29 1399 +++ linuxsampler/trunk/src/network/lscpserver.cpp 2007/10/12 09:12:22 1403 @@ -58,7 +58,7 @@ !(c == '*') && !(c == '+') && !(c == ',') && !(c == '-') && !(c == '.') && !(c == '/') && !(c == ':') && !(c == ';') && !(c == '<') && !(c == '=') && !(c == '>') && !(c == '?') && - !(c == '@') && !(c == '[') && !(c == '\\') && !(c == ']') && + !(c == '@') && !(c == '[') && !(c == ']') && !(c == '^') && !(c == '_') && !(c == '`') && !(c == '{') && !(c == '|') && !(c == '}') && !(c == '~') ) { @@ -2416,7 +2416,7 @@ try { DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir); - result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description)); + result.Add("DESCRIPTION", _escapeLscpResponse(info.Description)); result.Add("CREATED", info.Created); result.Add("MODIFIED", info.Modified); } catch (Exception e) { @@ -2600,11 +2600,11 @@ result.Add("SIZE", (int)info.Size); result.Add("CREATED", info.Created); result.Add("MODIFIED", info.Modified); - result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description)); + result.Add("DESCRIPTION", _escapeLscpResponse(info.Description)); result.Add("IS_DRUM", info.IsDrum); - result.Add("PRODUCT", InstrumentsDb::toEscapedText(info.Product)); - result.Add("ARTISTS", InstrumentsDb::toEscapedText(info.Artists)); - result.Add("KEYWORDS", InstrumentsDb::toEscapedText(info.Keywords)); + result.Add("PRODUCT", _escapeLscpResponse(info.Product)); + result.Add("ARTISTS", _escapeLscpResponse(info.Artists)); + result.Add("KEYWORDS", _escapeLscpResponse(info.Keywords)); } catch (Exception e) { result.Error(e); }