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.5 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.16 by root, Sun Aug 15 03:30:04 2004 UTC

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

Diff Legend

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