Changeset 10 for trunk/txlib/txscript.c

Timestamp:

02/22/06 13:03:35 (3 years ago)

Author:

jvw

Message:

Fix FileDialog? trap, other minor updates

Files:

• trunk/txlib/txscript.c (modified) (5 diffs)

trunk/txlib/txscript.c

@@ -50 +50 @@
 #define TXSC_P_PROMPT       ";;prompt"
 #define TXSC_P_ERRORS       ";;error"
+
+#define TXSC_PARAMS         10                  // substitutable parameters
 
 static  char       *runhelp[] =
@@ -105 +107 @@
 };
 #endif
-
-
-// Substitute $n parameters in a string by supplied values; n = 0..9
-static ULONG txsSubstituteParams                // RET   nr of substitutions
-(
-   char               *string,                  // IN    base string
-   char              **values,                  // IN    values to substitute
-   char               *result                   // OUT   substituted (MAXLIN)
-);
 
 
@@ -184 +177 @@
                TxRepl( scrline, '\n', '\0');
                TxRepl( scrline, '\r', '\0');    // mainly for Linux/Unix ...
-               txsSubstituteParams( scrline, params, command);
+               txsSubstituteParams( scrline, params,  TXSC_PARAMS,
+                                             TXMAXLN, command);
 
                if ( (strlen( command) > 0) &&   // not empty, and
@@ -413 +407 @@
 /*---------------------------------------------------------------------------*/
 
-/*****************************************************************************/
-// Substitute $n parameters in a string by supplied values; n = 0..9
-/*****************************************************************************/
-static ULONG txsSubstituteParams                // RET   nr of substitutions
+
+/*****************************************************************************/
+// Substitute $n parameters in a string by supplied values; n = 0..9 (maximum)
+/*****************************************************************************/
+ULONG txsSubstituteParams                       // RET   nr of substitutions
 (
    char               *string,                  // IN    base string
    char              **values,                  // IN    values to substitute
+   int                 count,                   // IN    number of values
+   int                 size,                    // IN    size of output buffer
    char               *result                   // OUT   substituted (MAXLIN)
 )
@@ -438 +435 @@
          bs++;                                  // skip  $
          si  = (int) ((*bs) - '0');             // index 0..9
-         if (values[si] != NULL)                // value available ?
+         if ((si < count) &&
+             (values[si] != NULL))              // value available ?
          {
             rl += strlen( values[si]);
-            if (rl < TXMAXLN)                   // room to grow ?
+            if (rl < size)                      // room to grow ?
             {
                strcpy(  rs,  values[si]);       // copy value