Changeset 0d935a1 for commands.c

Timestamp:

Jun 27, 2011, 4:28:51 AM (14 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

b75a8ac

Parents:

f4e857f

git-author:

Jason Gross <jgross@mit.edu> (06/27/11 01:14:13)

git-committer:

Jason Gross <jgross@mit.edu> (06/27/11 04:28:51)

Message:

Pass owl_variable * around instead of owl_vardict *.

This allows (forces) functions to do their own NULL- and type- checking
on variables.  The functions in varsubs.c get less checking, but if
these auto-generated functions are failing, something more serious is
probably wrong.

File:

• commands.c (modified) (7 diffs)

commands.c

@@ -1572 +1572 @@
   int  silent=0;
   int requirebool=0;
+  owl_variable *v;
 
   if (argc == 1) {
@@ -1594 +1595 @@
     return NULL;
   }
-  owl_variable_set_fromstring(owl_global_get_vardict(&g), var, val, !silent, requirebool);
+
+  v = owl_variable_get_var(owl_global_get_vardict(&g), var);
+  if (v == NULL) {
+    if (!silent) owl_function_error("Unknown variable %s", var);
+  } else if (requirebool && v->type != OWL_VARIABLE_BOOL) {
+    if (!silent) owl_function_error("Variable %s is not a boolean", var);
+  } else {
+    owl_variable_set_fromstring(v, val, !silent);
+  }
   return NULL;
 }
@@ -1600 +1609 @@
 char *owl_command_unset(int argc, const char *const *argv, const char *buff)
 {
+  owl_variable *v;
   const char *var, *val;
   int  silent=0;
@@ -1614 +1624 @@
     return NULL;
   }
-  owl_variable_set_fromstring(owl_global_get_vardict(&g), var, val, !silent, 1);
+
+  v = owl_variable_get_var(owl_global_get_vardict(&g), var);
+  if (v == NULL) {
+    if (!silent) owl_function_error("Unknown variable %s", var);
+  } else if (v->type != OWL_VARIABLE_BOOL) {
+    if (!silent) owl_function_error("Variable %s is not a boolean", var);
+  } else {
+    owl_variable_set_fromstring(v, val, !silent);
+  }
   return NULL;
 }
@@ -1622 +1640 @@
   const char *var;
   char *value;
+  const owl_variable *v;
 
   if (argc==1) {
@@ -1633 +1652 @@
   var=argv[1];
     
-  value = owl_variable_get_tostring(owl_global_get_vardict(&g), var);
-  if (value) {
-    owl_function_makemsg("%s = '%s'", var, value);
+  v = owl_variable_get_var(owl_global_get_vardict(&g), var);
+  if (v) {
+    value = owl_variable_get_tostring(v);
+    if (value == NULL)
+      owl_function_makemsg("%s = <null>", var);
+    else
+      owl_function_makemsg("%s = '%s'", var, value);
     g_free(value);
   } else {
@@ -2505 +2528 @@
 }
 
-char *owl_command_getvar(int argc, const char *const *argv, const char *buff)
-{
+CALLER_OWN char *owl_command_getvar(int argc, const char *const *argv, const char *buff)
+{
+  const owl_variable *v;
   if (argc != 2) {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
     return NULL;
   }
-  return owl_variable_get_tostring(owl_global_get_vardict(&g), argv[1]);
+  v = owl_variable_get_var(owl_global_get_vardict(&g), argv[1]);
+  if (v == NULL) return NULL;
+  return owl_variable_get_tostring(v);
 }