39c39
< "$FreeBSD: head/contrib/telnet/telnetd/sys_term.c 69825 2000-12-10 20:50:20Z assar $";
---
> "$FreeBSD: head/contrib/telnet/telnetd/sys_term.c 81965 2001-08-20 12:28:40Z markm $";
484,489d483
< #ifndef __GNUC__
< char *line = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
< #else
< static char Xline[] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
< char *line = Xline;
< #endif
491c485,487
< char *myline = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
---
> char myline[16];
> #else
> char line[16];
520c516,517
< (void) strcpy(line, "/dev/ptyXX");
---
> (void) strcpy(line, _PATH_DEV);
> (void) strcat(line, "ptyXX");
571c568
< (void) sprintf(myline, "/dev/pty/%03d", *ptynum);
---
> (void) sprintf(myline, "%spty/%03d", _PATH_DEV, *ptynum);
575c572
< (void) sprintf(line, "/dev/ttyp%03d", *ptynum);
---
> (void) sprintf(line, "%sp%03d", _PATH_TTY, *ptynum);
1302a1300
> setpgrp();
1362c1360
< if ((t = open("/dev/tty", O_RDWR)) < 0)
---
> if ((t = open(_PATH_TTY, O_RDWR)) < 0)
1455c1453
< SCPYN(wtmp.ut_line, line + sizeof("/dev/") - 1);
---
> SCPYN(wtmp.ut_line, line + sizeof(_PATH_DEV) - 1);
1587c1585
< SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1);
---
> SCPYN(utmpx.ut_line, line + sizeof(_PATH_DEV) - 1);
1901c1899
< p = line + sizeof("/dev/") - 1;
---
> p = line + sizeof(_PATH_DEV) - 1;
2212c2210
< execl(CLEANTMPCMD, CLEANTMPCMD, user, tpath, 0);
---
> execl(CLEANTMPCMD, CLEANTMPCMD, user, tpath, (char *)0);
2250c2248
< SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1);
---
> SCPYN(utmpx.ut_line, line + sizeof(_PATH_DEV) - 1);
2311c2309
< line[strlen("/dev/")] = 'p';
---
> line[strlen(_PATH_DEV)] = 'p';