Changeset 6424 for trunk/Ohana/src/opihi/lib.shell/string.c

Timestamp:

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

Author:

eugene

Message:

various minor fixes

File:

• trunk/Ohana/src/opihi/lib.shell/string.c (modified) (3 diffs)

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++);