Changeset 6424 for trunk/Ohana/src/opihi

Timestamp:

Feb 13, 2006, 9:27:46 AM (20 years ago)

Author:

eugene

Message:

various minor fixes

Location:

trunk/Ohana/src/opihi

Files:

• dvo/.dvo (deleted)
• lib.shell/expand_vars.c (modified) (1 diff)
• lib.shell/string.c (modified) (3 diffs)
• lib.shell/variable.c (modified) (3 diffs)

trunk/Ohana/src/opihi/lib.shell/expand_vars.c

@@ -71 +71 @@
       *N = *Val; /* place the value of the variable in the newline */
     }
+    N--; /* we overshoot on last loop */
 
-    for (N--,L++; ISVAR(*L); L++);
-    L--;
+    /* skip past the variable in the source line */
+    /* L currently points at $ */
+    L++;
+    if (*L == '?') L++;  /* skip past ? in $?name */
+
+    while (ISVAR(*L)) L++;
+    L--; /* we overshoot */
 
     if (V0 != NULL) free (V0);

trunk/Ohana/src/opihi/lib.shell/string.c

@@ -94 +94 @@
 char *thisvar (char *string) {
 
-  int i;
+  int i, start;
   char *word;
 
@@ -100 +100 @@
   if (string[0] != '$') return ((char *) NULL);
 
-  for (i = 1; ISVAR(string[i]); i++);
-  if (i == 1) return ((char *) NULL);
-
+  /* special case $?name : check that name is valid */
+  start = 1;
+  if (string[1] == '?') start = 2;
+
+  for (i = start; ISVAR(string[i]); i++);
+  if (i == start) return ((char *) NULL);
+
+  /* the ? is part of the variable */
   word = strncreate (&string[1], i - 1);
   return (word);
@@ -207 +212 @@
 char *aftervar (char *string) {
 
-  int i, j;
+  int i, j, start;
 
   if (string == (char *) NULL) return ((char *) NULL);
   if (string[0] != '$') return ((char *) NULL);
 
-  for (i = 1; ISVAR(string[i]); i++);
-  if (i == 1) return ((char *) NULL);
+  /* special case: $?name : test only name */
+  start = 1;
+  if (string[1] == '?') start = 2;
+
+  for (i = start; ISVAR(string[i]); i++);
+  if (i == start) return ((char *) NULL);
 
   for (j = i; whitespace (string[j]); j++);

trunk/Ohana/src/opihi/lib.shell/variable.c

@@ -103 +103 @@
   
   int i;
-  char *local, *MacroName;
+  char *local, *MacroName, *value;
 
   if (name == NULL) return (NULL);
@@ -111 +111 @@
   /* return a string which should not be freed */
   if (*name == '?') {
-    value = get_variable_ptr (name[1]);
+    value = get_variable_ptr (&name[1]);
     if (value == NULL) {
       return variable_false;
@@ -152 +152 @@
   /* return a string which can be freed */
   if (*name == '?') {
-    value = get_variable_ptr (name[1]);
+    value = get_variable_ptr (&name[1]);
     if (value == NULL) {
       value = strcreate (variable_false);