source: popexec.c @ 685e96f

release-1.10release-1.6release-1.7release-1.8release-1.9
Last change on this file since 685e96f was b928b3a, checked in by David Benjamin <davidben@mit.edu>, 15 years ago
Remove popwin special-casing Finally, we can have our cake! Now that libpanel takes care of stacking, we can get rid of a lot of the painting logic that has to think about and special-case window order. Here's the first of the lobotomies. Signed-off-by: David Benjamin <davidben@mit.edu>
  • Property mode set to 100644
File size: 4.6 KB
RevLine 
[afbf668]1#include "owl.h"
2#ifdef HAVE_SYS_IOCTL_H
3#include <sys/ioctl.h>
4#endif
5#ifdef HAVE_SYS_FILIO_H
6#include <sys/filio.h>
7#endif
8#include <sys/wait.h>
9
10/* starts up popexec in a new viewwin */
[e19eb97]11owl_popexec *owl_popexec_new(const char *command)
[afbf668]12{
13  owl_popexec *pe;
14  owl_popwin *pw;
15  owl_viewwin *v;
16  int pipefds[2], child_write_fd, parent_read_fd;
[0e5afa2]17  pid_t pid;
[afbf668]18
19  pe = owl_malloc(sizeof(owl_popexec));
20  if (!pe) return NULL;
21  pe->winactive=0;
22  pe->pid=0;
23  pe->refcount=0;
24
25  pw=owl_global_get_popwin(&g);
26  pe->vwin=v=owl_global_get_viewwin(&g);
27
28  owl_popwin_up(pw);
[2a17b63]29  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
[afbf668]30  owl_viewwin_init_text(v, owl_popwin_get_curswin(pw),
31                        owl_popwin_get_lines(pw), owl_popwin_get_cols(pw),
32                        "");
33  owl_viewwin_redisplay(v, 0);
34  owl_global_set_needrefresh(&g);
35  owl_viewwin_set_onclose_hook(v, owl_popexec_viewwin_onclose, pe);
36  pe->refcount++;
37
38  if (0 != pipe(pipefds)) {
39    owl_function_error("owl_function_popless_exec: pipe failed\n");
40    return NULL;
41  }
42  parent_read_fd = pipefds[0];
43  child_write_fd = pipefds[1];
44  pid = fork();
45  if (pid == -1) {
46    close(pipefds[0]);
47    close(pipefds[1]);
48    owl_function_error("owl_function_popless_exec: fork failed\n");
49    return NULL;
50  } else if (pid != 0) {
[40c6657]51    close(child_write_fd);
[afbf668]52    /* still in owl */
53    pe->pid=pid;
54    pe->winactive=1;
[18fdd5f9]55    pe->dispatch = owl_select_add_io_dispatch(parent_read_fd, OWL_IO_READ|OWL_IO_EXCEPT, &owl_popexec_inputhandler, &owl_popexec_delete_dispatch, pe);
[afbf668]56    pe->refcount++;
57  } else {
58    /* in the child process */
59    int i;
60    int fdlimit = sysconf(_SC_OPEN_MAX);
61
62    for (i=0; i<fdlimit; i++) {
63      if (i!=child_write_fd) close(i);
64    }
65    dup2(child_write_fd, 1 /*stdout*/);
66    dup2(child_write_fd, 2 /*stderr*/);
67    close(child_write_fd);
68
[7565f8f]69    execl("/bin/sh", "sh", "-c", command, (const char *)NULL);
[afbf668]70    _exit(127);
71  }
72
73  return pe;
74}
75
[18fdd5f9]76void owl_popexec_inputhandler(const owl_io_dispatch *d, void *data)
[1971b59]77{
[18fdd5f9]78  owl_popexec *pe = data;
[afbf668]79  int navail, bread, rv_navail;
80  char *buf;
81  int status;
82
83  if (!pe) return;
84
85  /* If pe->winactive is 0 then the vwin has closed.
86   * If pe->pid is 0 then the child has already been reaped.
[40c6657]87   * if d->fd is -1 then the fd has been closed out.
[afbf668]88   * Under these cases we want to get to a state where:
89   *   - data read until end if child running
90   *   - child reaped
91   *   - fd closed
92   *   - callback removed
93   */
94
95  /* the viewwin has closed */
[40c6657]96  if (!pe->pid && !pe->winactive) {
[18fdd5f9]97    owl_select_remove_io_dispatch(d);
[afbf668]98    return;
99  }
100
[4d86e06]101  if (0 != (rv_navail = ioctl(d->fd, FIONREAD, &navail))) {
[afbf668]102    owl_function_debugmsg("ioctl error");
103  }
104
105  /* check to see if the child has ended gracefully and no more data is
106   * ready to be read... */
107  if (navail==0 && pe->pid>0 && waitpid(pe->pid, &status, WNOHANG) > 0) {
108    owl_function_debugmsg("waitpid got child status: <%d>\n", status);
109    pe->pid = 0;
110    if (pe->winactive) { 
111      owl_viewwin_append_text(pe->vwin, "\n");
112      owl_viewwin_redisplay(pe->vwin, 1);
113    }
[18fdd5f9]114    owl_select_remove_io_dispatch(d);
[afbf668]115    return;
116  }
117
[40c6657]118  if (d->fd<0 || !pe->pid || !pe->winactive || rv_navail) {
[afbf668]119    owl_function_error("popexec should not have reached this point");
120    return;
121  }
122
123  if (navail<=0) return;
124  if (navail>1024) { navail = 1024; }
125  buf = owl_malloc(navail+1);
[40c6657]126  owl_function_debugmsg("about to read %d", navail);
127  bread = read(d->fd, buf, navail);
[afbf668]128  if (bread<0) {
129    perror("read");
130    owl_function_debugmsg("read error");
131  }
132  if (buf[navail-1] != '\0') {
133    buf[navail] = '\0';
134  }
[40c6657]135  owl_function_debugmsg("got data:  <%s>", buf);
[afbf668]136  if (pe->winactive) {
137    owl_viewwin_append_text(pe->vwin, buf);
138    owl_viewwin_redisplay(pe->vwin, 1);
139  }
140  owl_free(buf);
141 
142}
143
[18fdd5f9]144void owl_popexec_delete_dispatch(const owl_io_dispatch *d)
[40c6657]145{
146  owl_popexec *pe = d->data;
147  close(d->fd);
148  owl_popexec_unref(pe);
149}
150
[1971b59]151void owl_popexec_viewwin_onclose(owl_viewwin *vwin, void *data)
152{
[4d86e06]153  owl_popexec *pe = data;
[afbf668]154  int status, rv;
155
156  pe->winactive = 0;
[18fdd5f9]157  if (pe->dispatch->fd > 0) {
158    owl_select_remove_io_dispatch(pe->dispatch);
[afbf668]159  }
160  if (pe->pid) {
161    /* TODO: we should handle the case where SIGTERM isn't good enough */
162    rv = kill(pe->pid, SIGTERM);
163    owl_function_debugmsg("kill of pid %d returned %d", pe->pid, rv);
164    rv = waitpid(pe->pid, &status, 0);
165    owl_function_debugmsg("waidpid returned %d, status %d", rv, status);
166    pe->pid = 0;
167  }
[8721756]168  owl_function_debugmsg("unref of %p from onclose", pe);
[afbf668]169  owl_popexec_unref(pe);
170}
171
[1971b59]172void owl_popexec_unref(owl_popexec *pe)
173{
[8721756]174  owl_function_debugmsg("unref of %p was %d", pe, pe->refcount);
[afbf668]175  pe->refcount--;
176  if (pe->refcount<=0) {
[8721756]177    owl_function_debugmsg("doing free of %p", pe);
[afbf668]178    owl_free(pe);
179  }
180}
Note: See TracBrowser for help on using the repository browser.