equal
deleted
inserted
replaced
14 #include "ioutils.h" |
14 #include "ioutils.h" |
15 #include "command_base.h" |
15 #include "command_base.h" |
16 |
16 |
17 _LIT(KCifExt, ".cif"); |
17 _LIT(KCifExt, ".cif"); |
18 _LIT(KCifPathVar, "CIF_PATH"); |
18 _LIT(KCifPathVar, "CIF_PATH"); |
19 _LIT(KCifPath, "\\resource\\cif\\fshell"); |
|
20 _LIT(KEnumSeparator, ","); |
19 _LIT(KEnumSeparator, ","); |
21 _LIT(KEnumQuote, "\""); |
20 _LIT(KEnumQuote, "\""); |
22 _LIT(KNewLine, "\r\n"); |
21 _LIT(KNewLine, "\r\n"); |
23 _LIT(KPartialCommandStart, "=="); |
22 _LIT(KPartialCommandStart, "=="); |
24 _LIT(KCommandStart, "\r\n=="); |
23 _LIT(KCommandStart, "\r\n=="); |
225 |
224 |
226 EXPORT_C CCommandInfoFile* CCommandInfoFile::NewL(RFs& aFs, const CEnvironment& aEnvironment, const TDesC& aCommandName) |
225 EXPORT_C CCommandInfoFile* CCommandInfoFile::NewL(RFs& aFs, const CEnvironment& aEnvironment, const TDesC& aCommandName) |
227 { |
226 { |
228 TFileName2 fileName; |
227 TFileName2 fileName; |
229 TRAPD(err, fileName.Copy(aEnvironment.GetAsDesL(KCifPathVar))); |
228 TRAPD(err, fileName.Copy(aEnvironment.GetAsDesL(KCifPathVar))); |
230 if (err) fileName.Copy(KCifPath); |
229 if (err) fileName.Copy(KFshellCifPath); |
231 |
230 |
232 // Search the drive the command is running from first (rather than what the session path happens to be, which was the previous behaviour) |
231 // Search the drive the command is running from first (rather than what the session path happens to be, which was the previous behaviour) |
233 if (!fileName.HasDriveLetter()) fileName.Insert(0, _L("?:")); |
232 if (!fileName.HasDriveLetter()) fileName.Insert(0, _L("?:")); |
234 fileName[0] = RProcess().FileName()[0]; |
233 fileName[0] = RProcess().FileName()[0]; |
235 |
234 |