Changeset 2906 for neercs/trunk/src/grab.cTweet

Timestamp:

Oct 10, 2008, 12:24:51 AM (14 years ago)

Author:

Pascal Terjan

Message:

• Cleanup my term after a grab

File:

• neercs/trunk/src/grab.c (modified) (4 diffs)

neercs/trunk/src/grab.c

@@ -40 +40 @@
     char fdstr[1024];
     struct mytrace *parent, *child;
-    int i, fd = 0, mode, ret;
+    int i, fd = 0, ret;
     char to_open[3];
+    int mode[3];
     struct stat stat_buf;
+    struct termios tos;
 
     debug("pty is %s", ptyname);
@@ -54 +56 @@
 
     child = mytrace_fork(parent);
-    mytrace_write(parent, 1, "\x1b]0;\x07", 5);
-    mytrace_write(parent, 1, "\x1b[1000l", 7);
-    mytrace_write(parent, 1, "\x1b[?12l\x1b[?25h", 12);
+    mytrace_write(parent, 1, "\x1b[H\x1b[2J", 7);
     mytrace_write(parent, 1, "\n[Process stolen by neercs]\n", 28);
-    /* FIXME Reset the term */
+    mytrace_tcgets(parent, 1, &tos);
+    tos.c_lflag |= ICANON|ECHO;
+    mytrace_tcsets(parent, 1, &tos);
     mytrace_close(parent, 1);
-
     mytrace_exit(parent, 0);
     mytrace_detach(parent);
@@ -72 +73 @@
         lstat(fdstr, &stat_buf);
         if((stat_buf.st_mode & S_IRUSR) && (stat_buf.st_mode & S_IWUSR))
-            mode = O_RDWR;
+            mode[i] = O_RDWR;
         else if(stat_buf.st_mode & S_IWUSR)
-            mode = O_WRONLY;
+            mode[i] = O_WRONLY;
         else
-            mode = O_RDONLY;
+            mode[i] = O_RDONLY;
 
         if(stat(fdstr, &stat_buf) < 0)
@@ -128 +129 @@
         if(!to_open[i])
             continue;
-        fd = mytrace_open(child, ptyname, mode);
+        fd = mytrace_open(child, ptyname, mode[i]);
         if(fd < 0)
         {