Changeset cba04e0

Timestamp:

Jan 11, 2007, 11:02:24 AM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

12e5f17

Parents:

dcc1335

Message:

* Make yes/no not segfault when there is no current messge.
* Make yes/no return types consistant with the rest of commands.c.

File:

• commands.c (modified) (3 diffs)

commands.c

@@ -2440 +2440 @@
 }
 
-void owl_command_yes(void)
-{
-  owl_message *m = owl_view_get_element(owl_global_get_current_view(&g),
-                                        owl_global_get_curmsg(&g));
+char *owl_command_yes(void)
+{
+  owl_message *m;
+  owl_view *v;
+
+  v = owl_global_get_current_view(&g);
+
+  /* bail if there's no current message */
+  if (owl_view_get_size(v) < 1) {
+    owl_function_error("No current message.");
+    return NULL;
+  }
+
+  m = owl_view_get_element(v, owl_global_get_curmsg(&g));
   if(!owl_message_is_question(m)) {
     owl_function_error("That message isn't a question.");
@@ -2460 +2470 @@
   owl_function_command_norv(cmd);
   owl_message_set_isanswered(m);
+  return NULL;
 }
 
 char *owl_command_no(void)
 {
-  owl_message *m = owl_view_get_element(owl_global_get_current_view(&g),
-                                        owl_global_get_curmsg(&g));
+  owl_message *m;
+  owl_view *v;
+
+  v = owl_global_get_current_view(&g);
+
+  /* bail if there's no current message */
+  if (owl_view_get_size(v) < 1) {
+    owl_function_error("No current message.");
+    return NULL;
+  }
+
+  m = owl_view_get_element(v, owl_global_get_curmsg(&g));
   if(!owl_message_is_question(m)) {
     owl_function_error("That message isn't a question.");
@@ -2482 +2503 @@
   owl_function_command_norv(cmd);
   owl_message_set_isanswered(m);
+  return NULL;
 }