Changeset 103 for trunk/NewView/StartupUnit.pas

Timestamp:

Mar 26, 2007, 8:35:37 PM (18 years ago)

Author:

RBRi

Message:

use StringUtilsUnit

File:

• trunk/NewView/StartupUnit.pas (modified) (2 diffs)

trunk/NewView/StartupUnit.pas

@@ -25 +25 @@
 // Look for any items that are actually specifiying environment
 // variables, and expand them to the contents of the variables
-Procedure TranslateIPFEnvironmentVars( Items: TStrings;
-                                       ExpandedItems: TStrings );
+Procedure TranslateIPFEnvironmentVars(const Items: TStrings; ExpandedItems: TStrings );
 
 // Given a filename, which may or may not contain a path or extension,
@@ -47 +46 @@
   DebugUnit,
   PMWin,
-  ACLStringUtility,
   HelpManagerUnit,
+  StringUtilsUnit,
   FileUtilsUnit;
 
 // Look for any items that are actually specifiying environment
 // variables, and expand them to the contents of the variables
-Procedure TranslateIPFEnvironmentVars( Items: TStrings;
-                                       ExpandedItems: TStrings );
+Procedure TranslateIPFEnvironmentVars(const Items: TStrings; ExpandedItems: TStrings );
 var
-  i: longint;
-  Item: string;
-  EnvironmentVarValue: string;
+  i : longint;
+  tmpItem: string;
+  tmpEnvironmentVarValue: string;
 begin
   LogEvent(LogStartup, 'Translating environment vars' );
   for i := 0 to Items.Count - 1 do
   begin
-    Item := Items[ i ];
+    tmpItem := Items[ i ];
 
-    Item := StrUnQuote( Item ); // remove single quotes
-    Item := StrUnDoubleQuote( Item ); // remove double quotes
+    tmpItem := StrTrimChars(tmpItem, [Quote]); // remove single quotes
+    tmpItem := StrTrimChars(tmpItem, [DoubleQuote]); // remove double quotes
 
-    LogEvent(LogStartup, '  Item: ' + Item );
-    EnvironmentVarValue := GetEnv( Uppercase( Item ) );
+    LogEvent(LogStartup, '  Checking for environment var: ' + tmpItem );
+    tmpEnvironmentVarValue := GetEnv( Uppercase( tmpItem ) );
     if DosError = 0 then
     begin
       // environment var exists - use it's value
-      LogEvent(LogStartup, '    Translated: ' + EnvironmentVarValue );
-      while EnvironmentVarValue <> '' do
-      begin
-         Item := ExtractNextValue( EnvironmentVarValue, '+' );
-         ExpandedItems.Add( Item );
-      end;
+      LogEvent(LogStartup, '    Environment var found; translated to: ' + tmpEnvironmentVarValue);
+      StrExtractStrings(ExpandedItems, tmpEnvironmentVarValue, ['+'], #0);
     end
     else
     begin
       // not an environment var
-      ExpandedItems.Add( Item );
+      ExpandedItems.Add( tmpItem );
     end;
   end;