[Qemacs-commit] qemacs qe.h shell.c latex-mode.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        13/12/24 23:42:10

Modified files:
        .              : qe.h shell.c latex-mode.c 

Log message:
        simplified shell process interface, added ssh command
        
        * more generic new_shell_buffer API, takes cmd, caption, flags
        * added ssh command to open ssh connections

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/qemacs/latex-mode.c?cvsroot=qemacs&r1=1.32&r2=1.33

Patches:
Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- qe.h        23 Dec 2013 23:26:43 -0000      1.102
+++ qe.h        24 Dec 2013 23:42:10 -0000      1.103
@@ -1776,9 +1776,14 @@
 int qe_bitmap_format_to_pix_fmt(int format);
 
 /* shell.c */
-EditBuffer *new_shell_buffer(EditBuffer *b0, const char *name,
-                             const char *path, const char **argv,
-                             int is_shell);
+const char *get_shell(void);
+
+#define SF_INTERACTIVE   0x01
+#define SF_COLOR         0x02
+#define SF_INFINITE      0x04
+EditBuffer *new_shell_buffer(EditBuffer *b0, const char *bufname,
+                             const char *caption, const char *cmd,
+                             int shell_flags);
 
 #define QASSERT(e)      do { if (!(e)) fprintf(stderr, "%s:%d: assertion 
failed: %s\n", __FILE__, __LINE__, #e); } while (0)
 

Index: shell.c
===================================================================
RCS file: /sources/qemacs/qemacs/shell.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- shell.c     24 Dec 2013 16:12:48 -0000      1.69
+++ shell.c     24 Dec 2013 23:42:10 -0000      1.70
@@ -70,7 +70,6 @@
     int utf8_len, utf8_pos;
     EditBuffer *b;
     EditBuffer *b_color; /* color buffer, one byte per char */
-    int is_shell; /* only used to display final message */
     struct QEmacsState *qe_state;
     const char *ka1, *ka3, *kb2, *kc1, *kc3, *kcbt, *kspd;
     const char *kbeg, *kbs, *kent, *kdch1, *kich1;
@@ -80,12 +79,11 @@
     const char *kf11, *kf12, *kf13, *kf14, *kf15;
     const char *kf16, *kf17, *kf18, *kf19, *kf20;
     const char *khome, *kend, *kmous, *knp, *kpp;
+    const char *caption;  /* process caption for exit message */
+    int shell_flags;
 
 } ShellState;
 
-/* move to mode */
-static int shell_launched = 0;
-
 /* CG: these variables should be encapsulated in a global structure */
 static char error_buffer[MAX_BUFFERNAME_SIZE];
 static int error_offset = -1;
@@ -156,13 +154,24 @@
     return -1;
 }
 
+const char *get_shell(void)
+{
+    const char *shell_path;
+
+    /* find shell name */
+    shell_path = getenv("SHELL");
+    if (!shell_path)
+        shell_path = "/bin/sh";
+
+    return shell_path;
+}
+
 #define TTY_XSIZE  80
 #define TTY_YSIZE  25
 #define TTY_YSIZE_INFINITE  10000
 
-static int run_process(const char *path, const char **argv,
-                       int *fd_ptr, int *pid_ptr,
-                       int cols, int rows, int is_shell)
+static int run_process(const char *cmd, int *fd_ptr, int *pid_ptr,
+                       int cols, int rows, int shell_flags)
 {
     int pty_fd, pid, i, nb_fds;
     char tty_name[1024];
@@ -190,6 +199,15 @@
     }
     if (pid == 0) {
         /* child process */
+        const char *argv[4];
+        int argc = 0;
+
+        argv[argc++] = get_shell();
+        if (cmd) {
+            argv[argc++] = "-c";
+            argv[argc++] = cmd;
+        }
+        argv[argc] = NULL;
 
         /* detach controlling terminal */
 #ifndef CONFIG_DARWIN
@@ -200,18 +218,20 @@
         for (i = 0; i < nb_fds; i++)
             close(i);
 
-        /* open pseudo tty for standard I/O */
-        if (is_shell == 2) {
-            /* collect output from non interactive process: no input */
+        if (shell_flags & SF_INFINITE)
             setenv("LINES", "10000", 1);
-            open("/dev/null", O_RDONLY);
-            open(tty_name, O_RDWR);
-            dup(1);
-        } else {
+
+        /* open pseudo tty for standard I/O */
+        if (shell_flags & SF_INTERACTIVE) {
             /* interactive shell: input from / output to pseudo terminal */
             open(tty_name, O_RDWR);
             dup(0);
             dup(0);
+        } else {
+            /* collect output from non interactive process: no input */
+            open("/dev/null", O_RDONLY);
+            open(tty_name, O_RDWR);
+            dup(1);
         }
 #ifdef CONFIG_DARWIN
         setsid();
@@ -220,7 +240,7 @@
         unsetenv("PAGER");
         //setenv("QELEVEL", "1", 1);
 
-        execv(path, (char *const*)argv);
+        execv(argv[0], (char * const*)argv);
         exit(1);
     }
     /* return file info */
@@ -1019,7 +1039,7 @@
                 if (s->esc_params[0] == 1047 ||
                     s->esc_params[0] == 1048 ||
                     s->esc_params[0] == 1049) {
-                    if (s->is_shell == 1) {
+                    if (s->shell_flags & SF_INTERACTIVE) {
                         /* only grab keys in interactive tty buffers */
                         s->grab_keys = 1;
                         qe_grab_keys(shell_key, s);
@@ -1034,7 +1054,7 @@
                 if (s->esc_params[0] == 1047 ||
                     s->esc_params[0] == 1048 ||
                     s->esc_params[0] == 1049) {
-                    if (s->is_shell == 1) {
+                    if (s->shell_flags & SF_INTERACTIVE) {
                         qe_ungrab_keys();
                         s->grab_keys = 0;
                     }
@@ -1292,10 +1312,7 @@
     char buf[1024];
 
     *buf = 0;
-    if (s->is_shell == 1) {
-        snprintf(buf, sizeof(buf), "\nProcess shell finished\n");
-    } else
-    if (s->is_shell == 3) {
+    if (s->caption) {
         time_t ti;
         char *time_str;
 
@@ -1306,11 +1323,11 @@
         else
             status = -1;
         if (status == 0) {
-            snprintf(buf, sizeof(buf), "\nCompilation finished at %s",
-                     time_str);
+            snprintf(buf, sizeof(buf), "\n%s finished at %s",
+                     s->caption, time_str);
         } else {
-            snprintf(buf, sizeof(buf), "\nCompilation exited abnormally with 
code %d at %s",
-                     status, time_str);
+            snprintf(buf, sizeof(buf), "\n%s exited abnormally with code %d at 
%s",
+                     s->caption, status, time_str);
         }
     }
     {
@@ -1373,9 +1390,9 @@
     qe_free(&s);
 }
 
-EditBuffer *new_shell_buffer(EditBuffer *b0, const char *name,
-                             const char *path, const char **argv,
-                             int is_shell)
+EditBuffer *new_shell_buffer(EditBuffer *b0, const char *bufname,
+                             const char *caption, const char *cmd,
+                             int shell_flags)
 {
     ShellState *s;
     EditBuffer *b, *b_color;
@@ -1387,7 +1404,7 @@
         b = eb_new("", BF_SAVELOG);
     if (!b)
         return NULL;
-    eb_set_buffer_name(b, name); /* ensure that the name is unique */
+    eb_set_buffer_name(b, bufname); /* ensure that the name is unique */
 
     /* Select shell output buffer encoding from LANG setting */
     if ((lang = getenv("LANG")) != NULL && strstr(lang, "UTF-8"))
@@ -1407,12 +1424,13 @@
     s->b = b;
     s->pty_fd = -1;
     s->pid = -1;
-    s->is_shell = is_shell;
     s->qe_state = &qe_state;
+    s->caption = caption;
+    s->shell_flags = shell_flags;
     tty_init(s);
 
     /* add color buffer */
-    if (is_shell) {
+    if (shell_flags & SF_COLOR) {
         b_color = eb_new("*color*", BF_SYSTEM);
         if (!b_color) {
             if (!b0)
@@ -1428,9 +1446,11 @@
 
     /* launch shell */
     cols = TTY_XSIZE;
-    rows = (is_shell == 1) ? TTY_YSIZE : TTY_YSIZE_INFINITE;
+    rows = TTY_YSIZE;
+    if (shell_flags & SF_INFINITE)
+        rows = TTY_YSIZE_INFINITE;
 
-    if (run_process(path, argv, &s->pty_fd, &s->pid, cols, rows, is_shell) < 
0) {
+    if (run_process(cmd, &s->pty_fd, &s->pid, cols, rows, shell_flags) < 0) {
         if (!b0)
             eb_free(b);
         return NULL;
@@ -1458,22 +1478,9 @@
     return b;
 }
 
-static const char *get_shell(void)
-{
-    const char *shell_path;
-
-    /* find shell name */
-    shell_path = getenv("SHELL");
-    if (!shell_path)
-        shell_path = "/bin/sh";
-
-    return shell_path;
-}
-
 static void do_shell(EditState *s, int force)
 {
     EditBuffer *b;
-    const char *argv[2];
 
     /* CG: Should prompt for buffer name if arg:
      * find a syntax for optional string argument w/ prompt
@@ -1485,9 +1492,8 @@
     }
 
     /* create new buffer */
-    argv[0] = get_shell();
-    argv[1] = NULL;
-    b = new_shell_buffer(NULL, "*shell*", argv[0], argv, 1);
+    b = new_shell_buffer(NULL, "*shell*", "Shell process", NULL,
+                         SF_COLOR | SF_INTERACTIVE);
     if (!b)
         return;
 
@@ -1495,12 +1501,10 @@
     edit_set_mode(s, &shell_mode, NULL);
 
     put_status(s, "Press C-o to toggle between shell/edit mode");
-    shell_launched = 1;
 }
 
 static void do_man(EditState *s, const char *arg)
 {
-    const char *argv[4];
     char bufname[32];
     char cmd[128];
     EditBuffer *b;
@@ -1513,11 +1517,7 @@
         return;
 
     /* create new buffer */
-    argv[0] = get_shell();
-    argv[1] = "-c";
-    argv[2] = cmd;
-    argv[3] = NULL;
-    b = new_shell_buffer(NULL, bufname, argv[0], argv, 2);
+    b = new_shell_buffer(NULL, bufname, NULL, cmd, SF_COLOR | SF_INFINITE);
     if (!b)
         return;
 
@@ -1526,6 +1526,28 @@
     edit_set_mode(s, &pager_mode, NULL);
 }
 
+static void do_ssh(EditState *s, const char *arg)
+{
+    char bufname[64];
+    char cmd[128];
+    EditBuffer *b;
+    
+    /* Use standard ssh command */
+    snprintf(cmd, sizeof(cmd), "ssh %s", arg);
+    snprintf(bufname, sizeof(bufname), "*ssh-%s*", arg);
+
+    /* create new buffer */
+    b = new_shell_buffer(NULL, bufname, "ssh", cmd,
+                         SF_COLOR | SF_INTERACTIVE);
+    if (!b)
+        return;
+
+    switch_to_buffer(s, b);
+    edit_set_mode(s, &shell_mode, NULL);
+
+    put_status(s, "Press C-o to toggle between shell/edit mode");
+}
+
 static void shell_move_left_right(EditState *e, int dir)
 {
     if (e->interactive) {
@@ -1663,7 +1685,6 @@
 
 static void do_compile(EditState *e, const char *cmd)
 {
-    const char *argv[4];
     EditBuffer *b;
 
     /* if the buffer already exists, kill it */
@@ -1678,11 +1699,8 @@
         cmd = "make";
 
     /* create new buffer */
-    argv[0] = get_shell();
-    argv[1] = "-c";
-    argv[2] = cmd;
-    argv[3] = NULL;
-    b = new_shell_buffer(NULL, "*compilation*", argv[0], argv, 3);
+    b = new_shell_buffer(NULL, "*compilation*", "Compilation", cmd,
+                         SF_COLOR | SF_INFINITE);
     if (!b)
         return;
 
@@ -1834,6 +1852,9 @@
 static CmdDef shell_global_commands[] = {
     CMD2( KEY_CTRLXRET('\r'), KEY_NONE,
           "shell", do_shell, ESi, "ui")
+    CMD2( KEY_NONE, KEY_NONE,
+          "ssh", do_ssh, ESs,
+          "s{Open connection to (host or address@hidden: }|ssh|")
     CMD2( KEY_CTRLX(KEY_CTRL('e')), KEY_NONE,
           "compile", do_compile, ESs,
           "s{Compile command: }|compile|")

Index: latex-mode.c
===================================================================
RCS file: /sources/qemacs/qemacs/latex-mode.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- latex-mode.c        24 Dec 2013 16:12:48 -0000      1.32
+++ latex-mode.c        24 Dec 2013 23:42:10 -0000      1.33
@@ -226,7 +226,6 @@
     struct latex_function *func = (struct latex_function *)opaque;
     char cwd[MAX_FILENAME_SIZE];
     char dir[MAX_FILENAME_SIZE];
-    const char *argv[4];
     char *p;
     int len;
 
@@ -235,11 +234,6 @@
         return;
     }
 
-    argv[0] = "/bin/sh";
-    argv[1] = "-c";
-    argv[2] = cmd;
-    argv[3] = NULL;
-
     getcwd(cwd, sizeof(cwd));
 
     /* get the directory of the open file and change into it
@@ -261,7 +255,8 @@
         }
 
         /* create new buffer */
-        b = new_shell_buffer(NULL, "*LaTeX output*", argv[0], argv, 0);
+        b = new_shell_buffer(NULL, "*LaTeX output*", NULL, cmd,
+                             SF_COLOR | SF_INFINITE);
         if (b) {
             /* XXX: try to split window if necessary */
             switch_to_buffer(func->es, b);
@@ -269,9 +264,17 @@
     } else {
         int pid = fork();
         if (pid == 0) {
+            const char *argv[4];
+
             /* child process */
             setsid();
-            execv("/bin/sh", (char *const*)argv);
+
+            argv[0] = get_shell();
+            argv[1] = "-c";
+            argv[2] = cmd;
+            argv[3] = NULL;
+
+            execv(argv[0], (char * const*)argv);
             exit(1);
         }
     }