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

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.39 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.54 by root, Sun Jan 22 00:48:13 2006 UTC

… …
20 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 22 *---------------------------------------------------------------------*/
23 23
24#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
25
26#include "fdpass.h"
25#include "rxvt.h" 27#include "ptytty.h"
26 28
27# include <cstdlib> 29#include <cstdlib>
28# include <cstring> 30#include <cstring>
29 31
30#ifdef HAVE_SYS_TYPES_H
31# include <sys/types.h> 32#include <sys/types.h>
32#endif 33#include <sys/socket.h>
33#ifdef HAVE_UNISTD_H
34# include <unistd.h> 34#include <unistd.h>
35#endif
36#ifdef HAVE_FCNTL_H
37# include <fcntl.h> 35#include <fcntl.h>
38#endif 36
39#ifdef HAVE_SYS_IOCTL_H 37#ifdef HAVE_SYS_IOCTL_H
40# include <sys/ioctl.h> 38# include <sys/ioctl.h>
41#endif 39#endif
42#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 40#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
43# include <sys/stropts.h> /* for I_PUSH */ 41# include <sys/stropts.h> /* for I_PUSH */
44#endif 42#endif
45#ifdef HAVE_ISASTREAM 43#ifdef HAVE_ISASTREAM
46# include <stropts.h> 44# include <stropts.h>
47#endif 45#endif
… …
50#elif defined(HAVE_LIBUTIL_H) 48#elif defined(HAVE_LIBUTIL_H)
51# include <libutil.h> 49# include <libutil.h>
52#elif defined(HAVE_UTIL_H) 50#elif defined(HAVE_UTIL_H)
53# include <util.h> 51# include <util.h>
54#endif 52#endif
53#ifdef TTY_GID_SUPPORT
54#include <grp.h>
55#endif
55 56
56#include <cstdio> 57#include <cstdio>
57#include <grp.h>
58
59#include "ptytty.h"
60 58
61///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
62 60
63/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
64 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 62 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
… …
66/* 64/*
67 * Returns pty file descriptor, or -1 on failure 65 * Returns pty file descriptor, or -1 on failure
68 * If successful, ttydev is set to the name of the slave device. 66 * If successful, ttydev is set to the name of the slave device.
69 * fd_tty _may_ also be set to an open fd to the slave device 67 * fd_tty _may_ also be set to an open fd to the slave device
70 */ 68 */
69#if defined(UNIX98_PTY)
71static int 70static int
72get_pty (int *fd_tty, char **ttydev) 71get_pty (int *fd_tty, char **ttydev)
73{ 72{
74 int pfd; 73 int pfd;
75 74
76#ifdef PTYS_ARE_OPENPTY 75# if defined(HAVE_GETPT)
77 char tty_name[sizeof "/dev/pts/????\0"]; 76 pfd = getpt();
77# elif defined(HAVE_POSIX_OPENPT)
78 pfd = posix_openpt (O_RDWR);
79# else
80 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
81# endif
82 if (pfd >= 0)
83 {
84 if (grantpt (pfd) == 0 /* change slave permissions */
85 && unlockpt (pfd) == 0)
86 { /* slave now unlocked */
87 *ttydev = strdup (ptsname (pfd)); /* get slave's name */
88 return pfd;
89 }
78 90
79 rxvt_privileges(RESTORE); 91 close (pfd);
92 }
93
94 return -1;
95}
96#elif defined(HAVE_OPENPTY)
97static int
98get_pty (int *fd_tty, char **ttydev)
99{
100 int pfd;
101 int res;
102 char tty_name[32];
103
80 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 104 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
81 rxvt_privileges(IGNORE);
82
83 if (res != -1) 105 if (res != -1)
84 { 106 {
85 *ttydev = strdup (tty_name); 107 *ttydev = strdup (tty_name);
86 return pfd; 108 return pfd;
87 } 109 }
88#endif
89 110
90#ifdef PTYS_ARE__GETPTY 111 return -1;
112}
113#elif defined(HAVE__GETPTY)
114static int
115get_pty (int *fd_tty, char **ttydev)
116{
117 int pfd;
118
91 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 119 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
92 if (*ttydev != NULL) 120 if (*ttydev != NULL)
93 return pfd; 121 return pfd;
94#endif
95 122
96#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 123 return -1;
97# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX) 124}
125#elif defined(HAVE_DEV_PTC)
126static int
127get_pty (int *fd_tty, char **ttydev)
128{
129 int pfd;
98 130
99 {
100# ifdef PTYS_ARE_GETPT
101 pfd = getpt();
102# else
103# ifdef PTYS_ARE_POSIX
104 pfd = posix_openpt (O_RDWR);
105# else
106 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
107# endif
108# endif
109
110 if (pfd >= 0)
111 {
112 if (grantpt (pfd) == 0 /* change slave permissions */
113 && unlockpt (pfd) == 0)
114 { /* slave now unlocked */
115 *ttydev = strdup (ptsname (pfd)); /* get slave's name */
116 return pfd;
117 }
118 close (pfd);
119 }
120 }
121# endif
122#endif
123
124#ifdef PTYS_ARE_PTC
125 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 131 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
126 { 132 {
127 *ttydev = strdup (ttyname (pfd)); 133 *ttydev = strdup (ttyname (pfd));
128 return pfd; 134 return pfd;
129 } 135 }
130#endif
131 136
132#ifdef PTYS_ARE_CLONE 137 return -1;
138}
139#elif defined(HAVE_DEV_CLONE)
140static int
141get_pty (int *fd_tty, char **ttydev)
142{
143 int pfd;
144
133 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) 145 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
134 { 146 {
135 *ttydev = strdup (ptsname (pfd)); 147 *ttydev = strdup (ptsname (pfd));
136 return pfd; 148 return pfd;
137 } 149 }
138#endif
139
140#ifdef PTYS_ARE_NUMERIC
141 {
142 int idx;
143 char *c1, *c2;
144 char pty_name[] = "/dev/ptyp???";
145 char tty_name[] = "/dev/ttyp???";
146
147 c1 = &(pty_name[sizeof (pty_name) - 4]);
148 c2 = &(tty_name[sizeof (tty_name) - 4]);
149 for (idx = 0; idx < 256; idx++)
150 {
151 sprintf (c1, "%d", idx);
152 sprintf (c2, "%d", idx);
153 if (access (tty_name, F_OK) < 0)
154 {
155 idx = 256;
156 break;
157 }
158
159 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
160 {
161 if (access (tty_name, R_OK | W_OK) == 0)
162 {
163 *ttydev = strdup (tty_name);
164 return pfd;
165 }
166
167 close (pfd);
168 }
169 }
170 }
171#endif
172
173#ifdef PTYS_ARE_SEARCHED
174 {
175 const char *c1, *c2;
176 char pty_name[] = "/dev/pty??";
177 char tty_name[] = "/dev/tty??";
178
179# ifndef PTYCHAR1
180# define PTYCHAR1 "pqrstuvwxyz"
181# endif
182# ifndef PTYCHAR2
183# define PTYCHAR2 "0123456789abcdef"
184# endif
185
186 for (c1 = PTYCHAR1; *c1; c1++)
187 {
188 pty_name[ (sizeof (pty_name) - 3)] =
189 tty_name[ (sizeof (pty_name) - 3)] = *c1;
190 for (c2 = PTYCHAR2; *c2; c2++)
191 {
192 pty_name[ (sizeof (pty_name) - 2)] =
193 tty_name[ (sizeof (pty_name) - 2)] = *c2;
194 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
195 {
196 if (access (tty_name, R_OK | W_OK) == 0)
197 {
198 *ttydev = strdup (tty_name);
199 return pfd;
200 }
201
202 close (pfd);
203 }
204 }
205 }
206 }
207#endif
208 150
209 return -1; 151 return -1;
210} 152}
153#else
154/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
155static int
156get_pty (int *fd_tty, char **ttydev)
157{
158 int pfd;
159 int i;
160 char pty_name[32];
161 char tty_name[32];
162 const char *majors = "pqrstuvwxyzabcde";
163 const char *minors = "0123456789abcdef";
164 for (i = 0; i < 256; i++)
165 {
166 snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
167 snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
168 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
169 {
170 snprintf(pty_name, 32, "/dev/ptyp%d", i);
171 snprintf(tty_name, 32, "/dev/ttyp%d", i);
172 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
173 continue;
174 }
175 if (access (tty_name, R_OK | W_OK) == 0)
176 {
177 *ttydev = strdup (tty_name);
178 return pfd;
179 }
180
181 close (pfd);
182 }
183}
184#endif
211 185
212/*----------------------------------------------------------------------*/ 186/*----------------------------------------------------------------------*/
213/* 187/*
214 * Returns tty file descriptor, or -1 on failure 188 * Returns tty file descriptor, or -1 on failure
215 */ 189 */
… …
224 * Make our tty a controlling tty so that /dev/tty points to us 198 * Make our tty a controlling tty so that /dev/tty points to us
225 */ 199 */
226static int 200static int
227control_tty (int fd_tty) 201control_tty (int fd_tty)
228{ 202{
229 int fd;
230
231 /* ---------------------------------------- */
232 setsid (); 203 setsid ();
233 204
234 /* ---------------------------------------- */
235# if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 205#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
236 /* 206 /*
237 * Push STREAMS modules: 207 * Push STREAMS modules:
238 * ptem: pseudo-terminal hardware emulation module. 208 * ptem: pseudo-terminal hardware emulation module.
239 * ldterm: standard terminal line discipline. 209 * ldterm: standard terminal line discipline.
240 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 210 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
248 * documentation is really unclear about whether it is any close () on 218 * documentation is really unclear about whether it is any close () on
249 * the master side or the last close () - i.e. a proper STREAMS dismantling 219 * the master side or the last close () - i.e. a proper STREAMS dismantling
250 * close () - on the master side which causes a hang up to be sent 220 * close () - on the master side which causes a hang up to be sent
251 * through - Geoff Wing 221 * through - Geoff Wing
252 */ 222 */
253# ifdef HAVE_ISASTREAM 223# ifdef HAVE_ISASTREAM
254 if (isastream (fd_tty) == 1) 224 if (isastream (fd_tty) == 1)
255# endif 225# endif
256 { 226 {
257 ioctl (fd_tty, I_PUSH, "ptem"); 227 ioctl (fd_tty, I_PUSH, "ptem");
258 ioctl (fd_tty, I_PUSH, "ldterm"); 228 ioctl (fd_tty, I_PUSH, "ldterm");
259 ioctl (fd_tty, I_PUSH, "ttcompat"); 229 ioctl (fd_tty, I_PUSH, "ttcompat");
260 } 230 }
261# endif 231#endif
262 /* ---------------------------------------- */ 232
263 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 233 ioctl (fd_tty, TIOCSCTTY, NULL);
264 /* ---------------------------------------- */ 234
265 fd = open ("/dev/tty", O_WRONLY); 235 int fd = open ("/dev/tty", O_WRONLY);
266 if (fd < 0) 236 if (fd < 0)
267 return -1; /* fatal */ 237 return -1; /* fatal */
238
268 close (fd); 239 close (fd);
269 /* ---------------------------------------- */
270 240
271 return 0; 241 return 0;
272} 242}
273 243
274void 244void
275rxvt_ptytty::close_tty () 245ptytty::close_tty ()
276{ 246{
277 if (tty < 0) 247 if (tty < 0)
278 return; 248 return;
279 249
280 close (tty); 250 close (tty);
281 tty = -1; 251 tty = -1;
282} 252}
283 253
284bool 254bool
285rxvt_ptytty::make_controlling_tty () 255ptytty::make_controlling_tty ()
286{ 256{
287 return control_tty (tty) >= 0; 257 return control_tty (tty) >= 0;
288} 258}
289 259
290void 260void
291rxvt_ptytty::set_utf8_mode (bool on) 261ptytty::set_utf8_mode (bool on)
292{ 262{
293#ifdef IUTF8 263#ifdef IUTF8
294 if (pty < 0) 264 if (pty < 0)
295 return; 265 return;
296 266
… …
312 } 282 }
313 } 283 }
314#endif 284#endif
315} 285}
316 286
317/////////////////////////////////////////////////////////////////////////////
318
319#ifndef NO_SETOWNER_TTYDEV
320static struct ttyconf { 287static struct ttyconf {
321 gid_t gid; 288 gid_t gid;
322 mode_t mode; 289 mode_t mode;
323 290
324 ttyconf () 291 ttyconf ()
… …
333 } 300 }
334 else 301 else
335#endif /* TTY_GID_SUPPORT */ 302#endif /* TTY_GID_SUPPORT */
336 { 303 {
337 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 304 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
338 gid = getgid (); 305 gid = 0;
339 } 306 }
340 } 307 }
341} ttyconf; 308} ttyconf;
342 309
343///////////////////////////////////////////////////////////////////////////// 310ptytty_unix::ptytty_unix ()
311{
312 name = 0;
313#if UTMP_SUPPORT
314 cmd_pid = 0;
315#endif
316}
317
318ptytty_unix::~ptytty_unix ()
319{
320#if UTMP_SUPPORT
321 logout ();
322#endif
323 put ();
324}
344 325
345void 326void
346rxvt_ptytty_unix::privileges (rxvt_privaction action) 327ptytty_unix::put ()
347{ 328{
348 if (!name || !*name) 329 chmod (name, RESTORE_TTY_MODE);
349 return; 330 chown (name, 0, ttyconf.gid);
350 331
351 rxvt_privileges (RESTORE); 332 close_tty ();
352 333
353 if (action == SAVE) 334 if (pty >= 0)
354 { 335 close (pty);
355# ifndef RESET_TTY_TO_COMMON_DEFAULTS
356 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
357 if (lstat (name, &savestat) < 0) /* you lose out */
358 ;
359 else
360# endif
361 {
362 saved = true;
363 chown (name, getuid (), ttyconf.gid); /* fail silently */
364 chmod (name, ttyconf.mode);
365# ifdef HAVE_REVOKE
366 revoke (name);
367# endif
368 }
369 }
370 else
371 { /* action == RESTORE */
372# ifndef RESET_TTY_TO_COMMON_DEFAULTS
373 if (saved)
374 {
375 chmod (name, savestat.st_mode);
376 chown (name, savestat.st_uid, savestat.st_gid);
377 }
378# else
379 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
380 chown (name, 0, 0);
381# endif
382 336
383 } 337 free (name);
384 338
385 rxvt_privileges (IGNORE);
386}
387#endif
388
389rxvt_ptytty_unix::rxvt_ptytty_unix ()
390{
391 pty = tty = -1; 339 pty = tty = -1;
392 name = 0; 340 name = 0;
393#ifndef NO_SETOWNER_TTYDEV
394 saved = false;
395#endif
396#if UTMP_SUPPORT
397 cmd_pid = 0;
398#endif
399}
400
401rxvt_ptytty_unix::~rxvt_ptytty_unix ()
402{
403 logout ();
404 put ();
405}
406
407void
408rxvt_ptytty_unix::put ()
409{
410#ifndef NO_SETOWNER_TTYDEV
411 privileges (RESTORE);
412#endif
413
414 if (pty >= 0) close (pty);
415 close_tty ();
416 free (name);
417
418 pty = tty = -1;
419 name = 0;
420} 341}
421 342
422bool 343bool
423rxvt_ptytty_unix::get () 344ptytty_unix::get ()
424{ 345{
425 /* get master (pty) */ 346 /* get master (pty) */
426 if ((pty = get_pty (&tty, &name)) < 0) 347 if ((pty = get_pty (&tty, &name)) < 0)
427 return false; 348 return false;
428 349
… …
430 351
431 /* get slave (tty) */ 352 /* get slave (tty) */
432 if (tty < 0) 353 if (tty < 0)
433 { 354 {
434#ifndef NO_SETOWNER_TTYDEV 355#ifndef NO_SETOWNER_TTYDEV
435 privileges (SAVE); 356 chown (name, getuid (), ttyconf.gid); /* fail silently */
357 chmod (name, ttyconf.mode);
358# ifdef HAVE_REVOKE
359 revoke (name);
360# endif
436#endif 361#endif
437 362
438 if ((tty = get_tty (name)) < 0) 363 if ((tty = get_tty (name)) < 0)
439 { 364 {
440 put (); 365 put ();
… …
443 } 368 }
444 369
445 return true; 370 return true;
446} 371}
447 372
373#if PTYTTY_HELPER
374
375static int sock_fd;
376static int pid;
377
378struct command
379{
380 enum { get, login, destroy } type;
381
382 ptytty *id;
383
384 bool login_shell;
385 int cmd_pid;
386 char hostname[512]; // arbitrary, but should be plenty
387};
388
389struct ptytty_proxy : ptytty
390{
391 ptytty *id;
392
393 ptytty_proxy ()
394 : id(0)
395 {
396 }
397
398 ~ptytty_proxy ();
399
400 bool get ();
401 void login (int cmd_pid, bool login_shell, const char *hostname);
402};
403
404bool
405ptytty_proxy::get ()
406{
407 command cmd;
408
409 cmd.type = command::get;
410
411 write (sock_fd, &cmd, sizeof (cmd));
412
413 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
414 fatal ("protocol error while creating pty using helper process, aborting.\n");
415
416 if (!id)
417 return false;
418
419 if ((pty = ptytty_recv_fd (sock_fd)) < 0
420 || (tty = ptytty_recv_fd (sock_fd)) < 0)
421 fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
422
423 return true;
424}
425
426void
427ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
428{
429 command cmd;
430
431 cmd.type = command::login;
432 cmd.id = id;
433 cmd.cmd_pid = cmd_pid;
434 cmd.login_shell = login_shell;
435 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
436
437 write (sock_fd, &cmd, sizeof (cmd));
438}
439
440ptytty_proxy::~ptytty_proxy ()
441{
442 if (id)
443 {
444 command cmd;
445
446 cmd.type = command::destroy;
447 cmd.id = id;
448
449 write (sock_fd, &cmd, sizeof (cmd));
450 }
451}
452
453static
454void serve ()
455{
456 command cmd;
457 vector<ptytty *> ptys;
458
459 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
460 {
461 if (cmd.type == command::get)
462 {
463 // -> id ptyfd ttyfd
464 cmd.id = new ptytty_unix;
465
466 if (cmd.id->get ())
467 {
468 write (sock_fd, &cmd.id, sizeof (cmd.id));
469 ptys.push_back (cmd.id);
470
471 ptytty_send_fd (sock_fd, cmd.id->pty);
472 ptytty_send_fd (sock_fd, cmd.id->tty);
473 }
474 else
475 {
476 delete cmd.id;
477 cmd.id = 0;
478 write (sock_fd, &cmd.id, sizeof (cmd.id));
479 }
480 }
481 else if (cmd.type == command::login)
482 {
483#if UTMP_SUPPORT
484 if (find (ptys.begin (), ptys.end (), cmd.id))
485 {
486 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
487 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
488 }
489#endif
490 }
491 else if (cmd.type == command::destroy)
492 {
493 ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
494
495 if (pty)
496 {
497 delete *pty;
498 ptys.erase (pty);
499 }
500 }
501 else
502 break;
503 }
504
505 // destroy all ptys
506 for (ptytty **i = ptys.end (); i-- > ptys.begin (); )
507 delete *i;
508}
509
510void ptytty_server ()
511{
512 int sv[2];
513
514 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
515 fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
516
517 pid = fork ();
518
519 if (pid < 0)
520 fatal ("could not create pty/sessiondb helper process, aborting.\n");
521
522 if (pid)
523 {
524 // client, process
525 sock_fd = sv[0];
526 close (sv[1]);
527 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
528 }
529 else
530 {
531 // server, pty-helper
532 sock_fd = sv[1];
533
534 for (int fd = 0; fd < 1023; fd++)
535 if (fd != sock_fd)
536 close (fd);
537
538 serve ();
539 _exit (EXIT_SUCCESS);
540 }
541}
542
543#endif
544
448// a "factory" *g* 545// a "factory" *g*
449rxvt_ptytty *rxvt_new_ptytty () 546ptytty *
547new_ptytty ()
450{ 548{
549#if PTYTTY_HELPER
550 if (pid > 0)
551 // use helper process
552 return new ptytty_proxy;
553 else
554#endif
451 return new rxvt_ptytty_unix; 555 return new ptytty_unix;
452} 556}
453 557
454/*----------------------- end-of-file (C source) -----------------------*/ 558/*----------------------- end-of-file (C source) -----------------------*/
455 559

Diff Legend

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