Changes in functions.c [8b293ea:7c80ea42]

File:

• functions.c (modified) (23 diffs)

functions.c

@@ -14 +14 @@
 #include "filterproc.h"
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_command(const char *cmdbuff)
+char *owl_function_command(const char *cmdbuff)
 {
   owl_function_debugmsg("executing command: %s", cmdbuff);
@@ -21 +21 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_command_argv(const char *const *argv, int argc)
+char *owl_function_command_argv(const char *const *argv, int argc)
 {
   return owl_cmddict_execute_argv(owl_global_get_cmddict(&g),
@@ -95 +95 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_style_describe(const char *name)
-{
+char *owl_function_style_describe(const char *name) {
   const char *desc;
   char *s;
@@ -112 +111 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_cmd_describe(const char *name)
+char *owl_function_cmd_describe(const char *name)
 {
   const owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
@@ -250 +249 @@
  * owl_global_messagequeue_addmsg() for that.
  */
-G_GNUC_WARN_UNUSED_RESULT owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
+owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
 {
   owl_message *m;
@@ -271 +270 @@
  * owl_global_messagequeue_addmsg() for that.
  */
-G_GNUC_WARN_UNUSED_RESULT owl_message *owl_function_make_outgoing_loopback(const char *body)
+owl_message *owl_function_make_outgoing_loopback(const char *body)
 {
   owl_message *m;
@@ -1228 +1227 @@
 }
 
-static void _dirty_everything(gpointer data, gpointer user_data) {
-  owl_window *w = data;
+static void _dirty_everything(owl_window *w) {
   if (!owl_window_is_realized(w))
     return;
   owl_window_dirty(w);
-  owl_window_children_foreach(w, _dirty_everything, NULL);
+  owl_window_children_foreach(w, (GFunc)_dirty_everything, NULL);
 }
 
@@ -1239 +1237 @@
 {
   /* Ask every widget to redraw itself. */
-  _dirty_everything(owl_window_get_screen(), NULL);
+  _dirty_everything(owl_window_get_screen());
   /* Force ncurses to redisplay everything. */
   clearok(stdscr, TRUE);
@@ -1841 +1839 @@
     if (enter) {
       owl_history *hist = owl_global_get_cmd_history(&g);
-      owl_history_store(hist, buff);
-      owl_history_reset(hist);
+      owl_history_store(hist, buff, false);
       owl_function_command_norv(buff);
     } else {
@@ -1901 +1898 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_editwin *owl_function_start_question(const char *line)
+owl_editwin *owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1916 +1913 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_editwin *owl_function_start_password(const char *line)
+owl_editwin *owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
@@ -1933 +1930 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_exec(int argc, const char *const *argv, const char *buff, int type)
+char *owl_function_exec(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -1976 +1973 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_perl(int argc, const char *const *argv, const char *buff, int type)
+char *owl_function_perl(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -2146 +2143 @@
  * Returns the name of the negated filter, which the caller must free.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_create_negative_filter(const char *filtername)
+char *owl_function_create_negative_filter(const char *filtername)
 {
   char *newname;
@@ -2243 +2240 @@
  * If 'related' is nonzero, encompass unclasses and .d classes as well.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_classinstfilt(const char *c, const char *i, int related) 
+char *owl_function_classinstfilt(const char *c, const char *i, int related) 
 {
   owl_filter *f;
@@ -2330 +2327 @@
  * the filter, which the caller must free.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_zuserfilt(const char *longuser)
+char *owl_function_zuserfilt(const char *longuser)
 {
   owl_filter *f;
@@ -2376 +2373 @@
  * Returns the name of the filter, which the caller must free.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_aimuserfilt(const char *user)
+char *owl_function_aimuserfilt(const char *user)
 {
   owl_filter *f;
@@ -2414 +2411 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_typefilt(const char *type)
+char *owl_function_typefilt(const char *type)
 {
   owl_filter *f;
@@ -2470 +2467 @@
 }
 
-static G_GNUC_WARN_UNUSED_RESULT char *owl_function_smartfilter_cc(const owl_message *m)
-{
+static char *owl_function_smartfilter_cc(const owl_message *m) {
   const char *ccs;
   char *ccs_quoted;
@@ -2522 +2518 @@
  *    name to the AIM conversation with that user 
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_smartfilter(int type, int invert_related)
+char *owl_function_smartfilter(int type, int invert_related)
 {
   const owl_view *v;
@@ -2861 +2857 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_keymap_summary(const char *name)
+char *owl_function_keymap_summary(const char *name)
 {
   const owl_keymap *km 
@@ -2975 +2971 @@
 /* strips formatting from ztext and returns the unformatted text. 
  * caller is responsible for freeing. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_ztext_stylestrip(const char *zt)
+char *owl_function_ztext_stylestrip(const char *zt)
 {
   owl_fmtext fm;
@@ -3156 +3152 @@
     }
     
-    /* if it exited, spawn a new one */
+    /* if it exited, fork & exec a new one */
     if (owl_global_get_newmsgproc_pid(&g)==0) {
+      pid_t i;
       int myargc;
-      char **argv = owl_parseline(owl_global_get_newmsgproc(&g), &myargc);
-      if (myargc < 0) {
-        owl_function_debugmsg("Could not parse newmsgproc '%s': unbalanced quotes?",
-                              owl_global_get_newmsgproc(&g));
-      } else if (myargc > 0) {
-        /* Spawn the child. */
-        pid_t pid;
-        GError *error = NULL;
-        owl_function_debugmsg("About to exec \"%s\" with %d arguments", argv[0], myargc);
-        if (g_spawn_async(NULL, argv, NULL,
-                          G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
-                          NULL, NULL, &pid, &error)) {
-          owl_global_set_newmsgproc_pid(&g, pid);
-          owl_function_debugmsg("I'm the parent and I started a new newmsgproc with pid %i", pid);
-        } else {
-          owl_function_debugmsg("Cannot run newmsgproc '%s': %s",
-                                owl_global_get_newmsgproc(&g), error->message);
-          g_error_free(error);
-        }
+      i=fork();
+      if (i) {
+        /* parent set the child's pid */
+        owl_global_set_newmsgproc_pid(&g, i);
+        owl_function_debugmsg("I'm the parent and I started a new newmsgproc with pid %i", i);
+      } else {
+        /* child exec's the program */
+        char **parsed;
+        parsed=owl_parseline(owl_global_get_newmsgproc(&g), &myargc);
+        if (myargc < 0) {
+          owl_function_debugmsg("Could not parse newmsgproc '%s': unbalanced quotes?", owl_global_get_newmsgproc(&g));
+        }
+        if (myargc <= 0) {
+          _exit(127);
+        }
+        owl_function_debugmsg("About to exec \"%s\" with %d arguments", parsed[0], myargc);
+        
+        execvp(parsed[0], parsed);
+        
+        
+        /* was there an error exec'ing? */
+        owl_function_debugmsg("Cannot run newmsgproc '%s': cannot exec '%s': %s", 
+                              owl_global_get_newmsgproc(&g), parsed[0], strerror(errno));
+        _exit(127);
       }
-      g_strfreev(argv);
     }
   }