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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.18 by root, Sun Dec 12 05:54:05 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: ptytty.c 2 * File: ptytty.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: ptytty.C,v 1.2 2003/11/24 17:31:27 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
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#include "rxvt.h"
25 26
26/*
27 * Try to be self-contained except for the above autoconfig'd defines
28 */
29
30#include <stdio.h>
31#ifdef HAVE_STDLIB_H 27#ifdef HAVE_STDLIB_H
32# include <stdlib.h> 28# include <cstdlib>
33#endif 29#endif
34#ifdef HAVE_SYS_TYPES_H 30#ifdef HAVE_SYS_TYPES_H
35# include <sys/types.h> 31# include <sys/types.h>
36#endif 32#endif
37#ifdef HAVE_UNISTD_H 33#ifdef HAVE_UNISTD_H
38# include <unistd.h> 34# include <unistd.h>
39#endif 35#endif
40#if defined(HAVE_STRING_H) 36#if defined(HAVE_STRING_H)
41# include <string.h> 37# include <cstring>
42#endif 38#endif
43#ifdef HAVE_FCNTL_H 39#ifdef HAVE_FCNTL_H
44# include <fcntl.h> 40# include <fcntl.h>
45#endif 41#endif
46#ifdef HAVE_SYS_IOCTL_H 42#ifdef HAVE_SYS_IOCTL_H
47# include <sys/ioctl.h> 43# include <sys/ioctl.h>
48#endif 44#endif
49#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) 45#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
50# include <sys/stropts.h> /* for I_PUSH */ 46# include <sys/stropts.h> /* for I_PUSH */
51#endif 47#endif
52 48#ifdef HAVE_ISASTREAM
53 49# include <stropts.h>
54#ifdef DEBUG_TTY
55# define D_TTY(x) fprintf x ; fputc('\n', stderr) ; fflush(stderr)
56#else
57# define D_TTY(x)
58#endif 50#endif
51
52// better do this via configure, but....
53#if defined(__FreeBSD__)
54# include <libutil.h>
55#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__))
56# include <util.h>
57#endif
58
59#include <cstdio>
60#include <grp.h>
59 61
60/* ------------------------------------------------------------------------- * 62/* ------------------------------------------------------------------------- *
61 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 63 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
62 * ------------------------------------------------------------------------- */ 64 * ------------------------------------------------------------------------- */
63/* 65/*
64 * Returns pty file descriptor, or -1 on failure 66 * Returns pty file descriptor, or -1 on failure
65 * If successful, ttydev is set to the name of the slave device. 67 * If successful, ttydev is set to the name of the slave device.
66 * fd_tty _may_ also be set to an open fd to the slave device 68 * fd_tty _may_ also be set to an open fd to the slave device
67 */ 69 */
68/* EXTPROTO */ 70static int
69int
70rxvt_get_pty(int *fd_tty, const char **ttydev) 71get_pty (int *fd_tty, char **ttydev)
71{ 72{
72 int pfd; 73 int pfd;
73 74
74#ifdef PTYS_ARE_OPENPTY 75#ifdef PTYS_ARE_OPENPTY
75 char tty_name[sizeof "/dev/pts/????\0"]; 76 char tty_name[sizeof "/dev/pts/????\0"];
76 77
77 if (openpty(&pfd, fd_tty, tty_name, NULL, NULL) != -1) { 78 if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1)
79 {
78 *ttydev = strdup(tty_name); 80 *ttydev = strdup (tty_name);
79 return pfd; 81 return pfd;
80 } 82 }
81#endif 83#endif
82 84
83#ifdef PTYS_ARE__GETPTY 85#ifdef PTYS_ARE__GETPTY
84 *ttydev = _getpty(&pfd, O_RDWR | O_NDELAY | O_NOCTTY, 0622, 0); 86 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
85 if (*ttydev != NULL) 87 if (*ttydev != NULL)
86 return pfd; 88 return pfd;
87#endif 89#endif
88 90
89#ifdef PTYS_ARE_GETPTY 91#ifdef PTYS_ARE_GETPTY
92
90 char *ptydev; 93 char *ptydev;
91 94
92 while ((ptydev = getpty()) != NULL) 95 while ((ptydev = getpty ()) != NULL)
93 if ((pfd = open(ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) { 96 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
97 {
94 *ttydev = ptydev; 98 *ttydev = ptydev;
95 return pfd; 99 return pfd;
96 } 100 }
97#endif 101#endif
98 102
99#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 103#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
100# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 104# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
105
101 { 106 {
102# ifdef PTYS_ARE_GETPT 107# ifdef PTYS_ARE_GETPT
103 pfd = getpt(); 108 pfd = getpt ();
104# else 109# else
105 pfd = open("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 110 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
106# endif 111# endif
112
107 if (pfd >= 0) { 113 if (pfd >= 0)
114 {
108 if (grantpt(pfd) == 0 /* change slave permissions */ 115 if (grantpt (pfd) == 0 /* change slave permissions */
109 && unlockpt(pfd) == 0) { /* slave now unlocked */ 116 && unlockpt (pfd) == 0)
117 { /* slave now unlocked */
110 *ttydev = ptsname(pfd); /* get slave's name */ 118 *ttydev = strdup (ptsname (pfd)); /* get slave's name */
111 return pfd; 119 return pfd;
112 } 120 }
113 close(pfd); 121 close (pfd);
114 }
115 } 122 }
123 }
116# endif 124# endif
117#endif 125#endif
118 126
119#ifdef PTYS_ARE_PTC 127#ifdef PTYS_ARE_PTC
120 if ((pfd = open("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) { 128 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
121 *ttydev = ttyname(pfd); 129 {
130 *ttydev = strdup (ttyname (pfd));
122 return pfd; 131 return pfd;
123 } 132 }
124#endif 133#endif
125 134
126#ifdef PTYS_ARE_CLONE 135#ifdef PTYS_ARE_CLONE
127 if ((pfd = open("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) { 136 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
128 *ttydev = ptsname(pfd); 137 {
138 *ttydev = strdup (ptsname (pfd));
129 return pfd; 139 return pfd;
130 } 140 }
131#endif 141#endif
132 142
133#ifdef PTYS_ARE_NUMERIC 143#ifdef PTYS_ARE_NUMERIC
134 { 144 {
135 int idx; 145 int idx;
136 char *c1, *c2; 146 char *c1, *c2;
137 char pty_name[] = "/dev/ptyp???"; 147 char pty_name[] = "/dev/ptyp???";
138 char tty_name[] = "/dev/ttyp???"; 148 char tty_name[] = "/dev/ttyp???";
139 149
140 c1 = &(pty_name[sizeof(pty_name) - 4]); 150 c1 = &(pty_name[sizeof (pty_name) - 4]);
141 c2 = &(tty_name[sizeof(tty_name) - 4]); 151 c2 = &(tty_name[sizeof (tty_name) - 4]);
142 for (idx = 0; idx < 256; idx++) { 152 for (idx = 0; idx < 256; idx++)
153 {
143 sprintf(c1, "%d", idx); 154 sprintf (c1, "%d", idx);
144 sprintf(c2, "%d", idx); 155 sprintf (c2, "%d", idx);
145 if (access(tty_name, F_OK) < 0) { 156 if (access (tty_name, F_OK) < 0)
146 idx = 256; 157 {
147 break; 158 idx = 256;
148 } 159 break;
160 }
161
149 if ((pfd = open(pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) { 162 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
163 {
150 if (access(tty_name, R_OK | W_OK) == 0) { 164 if (access (tty_name, R_OK | W_OK) == 0)
165 {
151 *ttydev = strdup(tty_name); 166 *ttydev = strdup (tty_name);
152 return pfd; 167 return pfd;
153 } 168 }
154 close(pfd); 169
155 } 170 close (pfd);
156 } 171 }
157 } 172 }
173 }
158#endif 174#endif
175
159#ifdef PTYS_ARE_SEARCHED 176#ifdef PTYS_ARE_SEARCHED
160 { 177 {
161 const char *c1, *c2; 178 const char *c1, *c2;
162 char pty_name[] = "/dev/pty??"; 179 char pty_name[] = "/dev/pty??";
163 char tty_name[] = "/dev/tty??"; 180 char tty_name[] = "/dev/tty??";
164 181
165# ifndef PTYCHAR1 182# ifndef PTYCHAR1
166# define PTYCHAR1 "pqrstuvwxyz" 183# define PTYCHAR1 "pqrstuvwxyz"
167# endif 184# endif
168# ifndef PTYCHAR2 185# ifndef PTYCHAR2
169# define PTYCHAR2 "0123456789abcdef" 186# define PTYCHAR2 "0123456789abcdef"
170# endif 187# endif
188
171 for (c1 = PTYCHAR1; *c1; c1++) { 189 for (c1 = PTYCHAR1; *c1; c1++)
190 {
172 pty_name[(sizeof(pty_name) - 3)] = 191 pty_name[ (sizeof (pty_name) - 3)] =
173 tty_name[(sizeof(pty_name) - 3)] = *c1; 192 tty_name[ (sizeof (pty_name) - 3)] = *c1;
174 for (c2 = PTYCHAR2; *c2; c2++) { 193 for (c2 = PTYCHAR2; *c2; c2++)
194 {
175 pty_name[(sizeof(pty_name) - 2)] = 195 pty_name[ (sizeof (pty_name) - 2)] =
176 tty_name[(sizeof(pty_name) - 2)] = *c2; 196 tty_name[ (sizeof (pty_name) - 2)] = *c2;
177 if ((pfd = open(pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) { 197 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
198 {
178 if (access(tty_name, R_OK | W_OK) == 0) { 199 if (access (tty_name, R_OK | W_OK) == 0)
179 *ttydev = strdup(tty_name); 200 {
180 return pfd; 201 *ttydev = strdup (tty_name);
181 } 202 return pfd;
182 close(pfd); 203 }
183 } 204
184 } 205 close (pfd);
185 } 206 }
207 }
186 } 208 }
209 }
187#endif 210#endif
211
188 return -1; 212 return -1;
189} 213}
190 214
191/*----------------------------------------------------------------------*/ 215/*----------------------------------------------------------------------*/
192/* 216/*
193 * Returns tty file descriptor, or -1 on failure 217 * Returns tty file descriptor, or -1 on failure
194 */ 218 */
195/* EXTPROTO */ 219static int
196int
197rxvt_get_tty(const char *ttydev) 220get_tty (char *ttydev)
198{ 221{
199 return open(ttydev, O_RDWR | O_NOCTTY, 0); 222 return open (ttydev, O_RDWR | O_NOCTTY, 0);
200} 223}
201 224
202/*----------------------------------------------------------------------*/ 225/*----------------------------------------------------------------------*/
203/* 226/*
204 * Make our tty a controlling tty so that /dev/tty points to us 227 * Make our tty a controlling tty so that /dev/tty points to us
205 */ 228 */
206/* EXTPROTO */ 229static int
207int
208rxvt_control_tty(int fd_tty, const char *ttydev) 230control_tty (int fd_tty, const char *ttydev)
209{ 231{
210#ifndef __QNX__ 232#ifndef __QNX__
211 int fd; 233 int fd;
212 234
213 D_TTY((stderr, "rxvt_control_tty(): pid: %d, tty fd: %d, dev: %s", getpid(), fd_tty, ttydev));
214/* ---------------------------------------- */ 235 /* ---------------------------------------- */
215# ifdef HAVE_SETSID 236# ifdef HAVE_SETSID
216 setsid(); 237 setsid ();
217# endif 238# endif
218# if defined(HAVE_SETPGID) 239# if defined(HAVE_SETPGID)
219 setpgid(0, 0); 240 setpgid (0, 0);
220# elif defined(HAVE_SETPGRP) 241# elif defined(HAVE_SETPGRP)
221 setpgrp(0, 0); 242 setpgrp (0, 0);
222# endif 243# endif
244
223/* ---------------------------------------- */ 245 /* ---------------------------------------- */
224# ifdef TIOCNOTTY 246# ifdef TIOCNOTTY
225 fd = open("/dev/tty", O_RDWR | O_NOCTTY); 247 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
226 D_TTY((stderr, "rxvt_control_tty(): Voiding tty associations: previous=%s", fd < 0 ? "no" : "yes"));
227 if (fd >= 0) { 248 if (fd >= 0)
249 {
228 ioctl(fd, TIOCNOTTY, NULL); /* void tty associations */ 250 ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
229 close(fd); 251 close (fd);
230 } 252 }
231# endif 253# endif
254
232/* ---------------------------------------- */ 255 /* ---------------------------------------- */
233 fd = open("/dev/tty", O_RDWR | O_NOCTTY); 256 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
234 D_TTY((stderr, "rxvt_control_tty(): /dev/tty has controlling tty? %s", fd < 0 ? "no (good)" : "yes (bad)"));
235 if (fd >= 0) 257 if (fd >= 0)
236 close(fd); /* ouch: still have controlling tty */ 258 close (fd); /* ouch: still have controlling tty */
259
237/* ---------------------------------------- */ 260 /* ---------------------------------------- */
238#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 261#if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
239/* 262 /*
240 * Push STREAMS modules: 263 * Push STREAMS modules:
241 * ptem: pseudo-terminal hardware emulation module. 264 * ptem: pseudo-terminal hardware emulation module.
242 * ldterm: standard terminal line discipline. 265 * ldterm: standard terminal line discipline.
243 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 266 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
244 * 267 *
245 * After we push the STREAMS modules, the first open() on the slave side 268 * After we push the STREAMS modules, the first open () on the slave side
246 * (i.e. the next section between the dashes giving us "tty opened OK") 269 * (i.e. the next section between the dashes giving us "tty opened OK")
247 * should make the "ptem" (or "ldterm" depending upon either which OS 270 * should make the "ptem" (or "ldterm" depending upon either which OS
248 * version or which set of manual pages you have) module give us a 271 * version or which set of manual pages you have) module give us a
249 * controlling terminal. We must already have close()d the master side 272 * controlling terminal. We must already have close ()d the master side
250 * fd in this child process before we push STREAMS modules on because the 273 * fd in this child process before we push STREAMS modules on because the
251 * documentation is really unclear about whether it is any close() on 274 * documentation is really unclear about whether it is any close () on
252 * the master side or the last close() - i.e. a proper STREAMS dismantling 275 * the master side or the last close () - i.e. a proper STREAMS dismantling
253 * close() - on the master side which causes a hang up to be sent 276 * close () - on the master side which causes a hang up to be sent
254 * through - Geoff Wing 277 * through - Geoff Wing
255 */ 278 */
256# ifdef HAVE_ISASTREAM 279# ifdef HAVE_ISASTREAM
257 if (isastream(fd_tty) == 1) 280 if (isastream (fd_tty) == 1)
258# endif
259 {
260 D_TTY((stderr, "rxvt_control_tty(): Pushing STREAMS modules"));
261 ioctl(fd_tty, I_PUSH, "ptem");
262 ioctl(fd_tty, I_PUSH, "ldterm");
263 ioctl(fd_tty, I_PUSH, "ttcompat");
264 }
265#endif 281# endif
282 {
283 ioctl (fd_tty, I_PUSH, "ptem");
284 ioctl (fd_tty, I_PUSH, "ldterm");
285 ioctl (fd_tty, I_PUSH, "ttcompat");
286 }
287#endif
266/* ---------------------------------------- */ 288 /* ---------------------------------------- */
267# if defined(TIOCSCTTY) 289# if defined(TIOCSCTTY)
268 fd = ioctl(fd_tty, TIOCSCTTY, NULL); 290 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
269 D_TTY((stderr, "rxvt_control_tty(): ioctl(..,TIOCSCTTY): %d", fd));
270# elif defined(TIOCSETCTTY) 291# elif defined(TIOCSETCTTY)
271 fd = ioctl(fd_tty, TIOCSETCTTY, NULL); 292 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
272 D_TTY((stderr, "rxvt_control_tty(): ioctl(..,TIOCSETCTTY): %d", fd));
273# else 293# else
274 fd = open(ttydev, O_RDWR); 294 fd = open (ttydev, O_RDWR);
275 D_TTY((stderr, "rxvt_control_tty(): tty open%s", fd < 0 ? " failure" : "ed OK"));
276 if (fd >= 0) 295 if (fd >= 0)
277 close(fd); 296 close (fd);
278# endif 297# endif
279/* ---------------------------------------- */ 298 /* ---------------------------------------- */
280 fd = open("/dev/tty", O_WRONLY); 299 fd = open ("/dev/tty", O_WRONLY);
281 D_TTY((stderr, "rxvt_control_tty(): do we have controlling tty now: %s", fd < 0 ? "no (fatal)" : "yes (good)"));
282 if (fd < 0) 300 if (fd < 0)
283 return -1; /* fatal */ 301 return -1; /* fatal */
284 close(fd); 302 close (fd);
285/* ---------------------------------------- */ 303 /* ---------------------------------------- */
286 D_TTY((stderr, "rxvt_control_tty(): tcgetpgrp(): %d getpgrp(): %d", tcgetpgrp(fd_tty), getpgrp()));
287/* ---------------------------------------- */
288#endif /* ! __QNX__ */ 304#endif /* ! __QNX__ */
305
289 return 0; 306 return 0;
290} 307}
308
309#ifndef NO_SETOWNER_TTYDEV
310static struct ttyconf {
311 gid_t gid;
312 mode_t mode;
313
314 ttyconf ()
315 {
316#ifdef TTY_GID_SUPPORT
317 struct group *gr = getgrnam ("tty");
318
319 if (gr)
320 { /* change group ownership of tty to "tty" */
321 mode = S_IRUSR | S_IWUSR | S_IWGRP;
322 gid = gr->gr_gid;
323 }
324 else
325#endif /* TTY_GID_SUPPORT */
326 {
327 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
328 gid = getgid ();
329 }
330 }
331} ttyconf;
332
333void
334rxvt_ptytty::privileges (rxvt_privaction action)
335{
336 rxvt_privileges (RESTORE);
337
338 if (action == SAVE)
339 {
340 //next_tty_action = RESTORE;
341# ifndef RESET_TTY_TO_COMMON_DEFAULTS
342 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
343 if (lstat (name, &savestat) < 0) /* you lose out */
344 ;//next_tty_action = IGNORE;
345 else
346# endif
347
348 {
349 chown (name, getuid (), ttyconf.gid); /* fail silently */
350 chmod (name, ttyconf.mode);
351# ifdef HAVE_REVOKE
352 revoke (name);
353# endif
354
355 }
356 }
357 else
358 { /* action == RESTORE */
359 //next_tty_action = IGNORE;
360# ifndef RESET_TTY_TO_COMMON_DEFAULTS
361 chmod (name, savestat.st_mode);
362 chown (name, savestat.st_uid, savestat.st_gid);
363# else
364 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
365 chown (name, 0, 0);
366# endif
367
368 }
369
370 rxvt_privileges (IGNORE);
371}
372#endif
373
374rxvt_ptytty::rxvt_ptytty ()
375{
376 pty = tty = -1;
377 name = 0;
378}
379
380rxvt_ptytty::~rxvt_ptytty ()
381{
382 put ();
383}
384
385void
386
387rxvt_ptytty::close_tty ()
388{
389 if (tty >= 0) close (tty);
390 tty = -1;
391}
392
393void
394rxvt_ptytty::put ()
395{
396#ifndef NO_SETOWNER_TTYDEV
397 if (tty >= 0)
398 privileges (RESTORE);
399#endif
400
401 if (pty >= 0) close (pty);
402 close_tty ();
403 free (name);
404
405 pty = tty = -1;
406 name = 0;
407}
408
409bool
410rxvt_ptytty::make_controlling_tty ()
411{
412 return control_tty (tty, name) >= 0;
413}
414
415bool
416rxvt_ptytty::get ()
417{
418 /* get master (pty) */
419 if ((pty = get_pty (&tty, &name)) < 0)
420 return false;
421
422 fcntl (pty, F_SETFL, O_NONBLOCK);
423
424 /* get slave (tty) */
425 if (tty < 0)
426 {
427#ifndef NO_SETOWNER_TTYDEV
428 privileges (SAVE);
429#endif
430
431 if ((tty = get_tty (name)) < 0)
432 {
433 put ();
434 return false;
435 }
436 }
437
438 return true;
439}
440
291/*----------------------- end-of-file (C source) -----------------------*/ 441/*----------------------- end-of-file (C source) -----------------------*/
442

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines