Changeset 6327

Timestamp:

Feb 6, 2006, 11:42:18 AM (20 years ago)

Author:

eugene

Message:

added variable existence tests

File:

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

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

@@ -97 +97 @@
 }
 
+static char variable_true[] = "1";
+static char variable_false[] = "0";
+
 char *get_variable_ptr (char *name) {
   
   int i;
   char *local, *MacroName;
+
+  if (name == NULL) return (NULL);
+  if (*name == 0) return (NULL);
+
+  /* check for the existence of the given name (after ?) */
+  /* return a string which should not be freed */
+  if (*name == '?') {
+    value = get_variable_ptr (name[1]);
+    if (value == NULL) {
+      return variable_false;
+    }
+    return variable_true;
+  }
 
   MacroName = GetMacroName ();
@@ -128 +144 @@
   int i;
   char *local, *MacroName;
+  char *value;
+
+  if (name == NULL) return (NULL);
+  if (*name == 0) return (NULL);
+
+  /* check for the existence of the given name (after ?) */
+  /* return a string which can be freed */
+  if (*name == '?') {
+    value = get_variable_ptr (name[1]);
+    if (value == NULL) {
+      value = strcreate (variable_false);
+      return value;
+    }
+    value = strcreate (variable_true);
+    return value;
+  }
 
   MacroName = GetMacroName ();
@@ -149 +181 @@
   }
   return (NULL);
+}
+
+/* return TRUE / FALSE if name is an existant variable */
+int get_variable_exists (char *name) {
+  
+  int i;
+  char *local, *MacroName;
+
+  MacroName = GetMacroName ();
+
+  /* look for local variable first */
+  ALLOCATE (local, char, strlen(name) + strlen(MacroName) + 2);
+  sprintf (local, "%s.%s", MacroName, name);
+  for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
+    if (!strcmp(local, variables[i].name)) {
+      free (local);
+      return (TRUE);
+    }
+  }
+  free (local);
+
+  /* look for global variable */
+  for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
+    if (!strcmp(name, variables[i].name)) {
+      return (TRUE);
+    }
+  }
+  return (FALSE);
 }