Changeset 3070

Timestamp:

Jul 12, 2018, 10:11:12 PM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Minor improvement for r3069.

File:

• trunk/src/netlabs/macros/dosutil.e (modified) (1 diff)

trunk/src/netlabs/macros/dosutil.e ¶

@@ -151 +151 @@
       --p3 = verify( Spec, '=', 'M', startp)
       -- Better allow only standard env var names:
+
       -- Check first char of env var name
-      p3 = pos( '[^A-Za-z!]', Spec, startp, 'x')
-      --dprintf( 'p3 = 'p3' = pos( [^A-Za-z!], 'Spec', 'startp', x)')
-      if p3 > 0 & p3 = startp then
+      CheckSpec = substr( Spec, startp, 1)
+      p3 = pos( '[^A-Za-z!]', CheckSpec, 1, 'x')
+      --dprintf( 'p3 = 'p3' = pos( [^A-Za-z!], 'CheckSpec', 1, x)')
+      if p3 > 0 then
          -- 1st % char can't be the start of an env var. Set startp to 2nd % char.
          startp = p2
-         --dprintf( 'p3 > 0 & p3 < p2')
+         --dprintf( 'p3 > 0')
          iterate
       endif
+
       -- Check rest of env var name
-      p4 = pos( '[^A-Za-z0-9_\-!]+', Spec, startp + 1, 'x')
-      --dprintf( 'p4 = 'p4' = pos( [^A-Za-z0-9_\-!]+, 'Spec', 'startp + 1', x)')
-      if p4 > 0 & p4 < p2 then
+      CheckSpec = substr( Spec, startp + 1, p2 - startp - 1)
+      p4 = pos( '[^A-Za-z0-9_\-!]+', CheckSpec, 1, 'x')
+      --dprintf( 'p4 = 'p4' = pos( [^A-Za-z0-9_\-!]+, 'CheckSpec', 1, x)')
+      if p4 > 0 then
          -- 1st % char can't be the start of an env var. Set startp to 2nd % char.
          startp = p2
-         --dprintf( 'p4 > 0 & p4 < p2')
+         --dprintf( 'p4 > 0')
          iterate
       endif