Changeset afbf668 for functions.c

Timestamp:

Mar 1, 2004, 12:42:56 PM (20 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

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

Children:

948b942

Parents:

c61918e

Message:

	pexec will now incrimentally display data as it is output
	  by the child process.  Additionally, commands running under
	  pexec may now be killed by quitting out of the popless window.
	Added muxevents select loop dispatcher.  File descriptors may
	  be registered with muxevents and handlers will be dispatched
	  to when data is available for non-blocking read/write/except.
	Switched the stderr_redir stuff to use muxevents.

File:

• functions.c (modified) (1 diff)

functions.c

@@ -2241 +2241 @@
   strcat(newbuff, redirect);
 
-  p=popen(newbuff, "r");
-  out=owl_malloc(1024);
-  size=1024;
-  strcpy(out, "");
-  while (fgets(buff2, 1024, p)!=NULL) {
-    size+=1024;
-    out=owl_realloc(out, size);
-    strcat(out, buff2);
-  }
-  pclose(p);
-
-  if (type==1) {
-    owl_function_popless_text(out);
-  } else if (type==0) {
-    return out;
-  } else if (type==2) {
-    owl_function_adminmsg(buff, out);
+  if (type == 1) {
+    owl_popexec_new(newbuff);
   } else {
-    owl_function_popless_text(out);
-  }
-  owl_free(out);
+    p=popen(newbuff, "r");
+    out=owl_malloc(1024);
+    size=1024;
+    strcpy(out, "");
+    while (fgets(buff2, 1024, p)!=NULL) {
+      size+=1024;
+      out=owl_realloc(out, size);
+      strcat(out, buff2);
+    }
+    pclose(p);
+    
+    if (type==1) {
+      owl_function_popless_text(out);
+    } else if (type==0) {
+      return out;
+    } else if (type==2) {
+      owl_function_adminmsg(buff, out);
+    } else {
+      owl_function_popless_text(out);
+    }
+    owl_free(out);
+  }
   return NULL;
 }