Changeset 2429 for neercsTweet

Timestamp:

Jun 15, 2008, 7:17:36 PM (12 years ago)

Author:

Pascal Terjan

Message:

• Remove one of the reads of /proc

Location:

neercs/trunk/src

Files:

• grab.c (modified) (2 diffs)
• neercs.h (modified) (1 diff)
• term.c (modified) (2 diffs)

neercs/trunk/src/grab.c

@@ -256 +256 @@
 }
 
-int grab_process(pid_t pid, int ptyfd)
+int grab_process(pid_t pid, char *ptyname, int ptyfd)
 {
     struct termios t;
     int i, fd = 0, mode, ret;
-    char tty[1024];
     char fdstr[1024];
     struct stat stat_buf;
 
-    snprintf(fdstr, sizeof(fdstr), "/proc/%d/fd/%d", getpid(), ptyfd);
-    if ((i = readlink(fdstr, tty, sizeof(tty)-1)) == -1) {
-        fprintf(stderr, "readlink failed\n");
-        return -1;
-    }
-    tty[i] = 0;
-    debug("Our pty is %s", tty);
+    debug("pty is %s", ptyname);
 
     if(ptrace(PTRACE_ATTACH, pid, 0, 0) < 0)
@@ -304 +297 @@
             fprintf(stderr, "do_close %s\n", strerror(ret));
         }
-        if((ret = do_open(pid, tty, mode, &fd)))
+        if((ret = do_open(pid, ptyname, mode, &fd)))
         {
             fprintf(stderr, "do_open %s\n", strerror(ret));

neercs/trunk/src/neercs.h

@@ -77 +77 @@
 int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid);
 int create_pty_grab(pid_t pid, unsigned int w, unsigned int h);
-int grab_process(pid_t pid, int ptyfd);
+int grab_process(pid_t pid, char *ptyname, int ptyfd);
 
 long int import_term(struct screen_list *screen_list, struct screen *sc, void const *data, unsigned int size);

neercs/trunk/src/term.c

@@ -15 +15 @@
 #include "config.h"
 
+#define _XOPEN_SOURCE
 #include <stdlib.h>
 #include <stdio.h>
@@ -590 +591 @@
 
     set_tty_size(0, w, h);
-    grab_process(pid, fds);
+    grab_process(pid, ptsname(fdm), fds);
 
     fcntl(fdm, F_SETFL, O_NDELAY);