ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libptytty/src/ptytty.C
(Generate patch)

Comparing libptytty/src/ptytty.C (file contents):
Revision 1.27 by ayin, Mon Jun 25 17:22:40 2007 UTC vs.
Revision 1.31 by ayin, Thu Nov 15 10:49:05 2007 UTC

… …
104 static int 104 static int
105 get_pty (int *fd_tty, char **ttydev) 105 get_pty (int *fd_tty, char **ttydev)
106 { 106 {
107 int pfd; 107 int pfd;
108 int res; 108 int res;
109 char tty_name[32];
110 109
111 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 110 res = openpty (&pfd, fd_tty, NULL, NULL, NULL);
112 111
113 if (res != -1) 112 if (res != -1)
114 { 113 {
115 *ttydev = strdup (tty_name); 114 *ttydev = strdup (ttyname (*fd_tty));
116 return pfd; 115 return pfd;
117 } 116 }
118 117
119 return -1; 118 return -1;
120 } 119 }
… …
123 122
124 static int 123 static int
125 get_pty (int *fd_tty, char **ttydev) 124 get_pty (int *fd_tty, char **ttydev)
126 { 125 {
127 int pfd; 126 int pfd;
127 char *slave;
128 128
129 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 129 slave = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
130 130
131 if (*ttydev != NULL) 131 if (slave != NULL) {
132 *ttydev = strdup (slave);
132 return pfd; 133 return pfd;
134 }
133 135
134 return -1; 136 return -1;
135 } 137 }
136 138
137#elif defined(HAVE_DEV_PTC) 139#elif defined(HAVE_DEV_PTC)
… …
221 * Make our tty a controlling tty so that /dev/tty points to us 223 * Make our tty a controlling tty so that /dev/tty points to us
222 */ 224 */
223static int 225static int
224control_tty (int fd_tty) 226control_tty (int fd_tty)
225{ 227{
228 int fd;
229
226 setsid (); 230 setsid ();
227 231
228#if defined(HAVE_DEV_PTMX) && defined(I_PUSH) 232#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
229 /* 233 /*
230 * Push STREAMS modules: 234 * Push STREAMS modules:
… …
254#endif 258#endif
255 259
256#ifdef TIOCSCTTY 260#ifdef TIOCSCTTY
257 ioctl (fd_tty, TIOCSCTTY, NULL); 261 ioctl (fd_tty, TIOCSCTTY, NULL);
258#else 262#else
259 fd = open (name, O_RDWR); 263 fd = open (ttyname (fd_tty), O_RDWR);
260 if (fd >= 0) 264 if (fd >= 0)
261 close (fd); 265 close (fd);
262#endif 266#endif
263 267
264 int fd = open ("/dev/tty", O_WRONLY); 268 fd = open ("/dev/tty", O_WRONLY);
265 if (fd < 0) 269 if (fd < 0)
266 return -1; /* fatal */ 270 return -1; /* fatal */
267 271
268 close (fd); 272 close (fd);
269 273
… …
326 { /* change group ownership of tty to "tty" */ 330 { /* change group ownership of tty to "tty" */
327 mode = S_IRUSR | S_IWUSR | S_IWGRP; 331 mode = S_IRUSR | S_IWUSR | S_IWGRP;
328 gid = gr->gr_gid; 332 gid = gr->gr_gid;
329 } 333 }
330 else 334 else
331#endif /* TTY_GID_SUPPORT */ 335#endif /* TTY_GID_SUPPORT */
332 { 336 {
333 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 337 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
334 gid = 0; 338 gid = 0;
335 } 339 }
336 } 340 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines