d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close the tty file descriptor once we're done with it.

Browse Source 
Use O_NONBLOCK when opening the tty device.

Suggested by:   bde
Submitted by:   ru
This commit is contained in:
cognet 2005-09-21 14:30:14 +00:00
parent 1519e686de
commit 4828c58b48
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.sbin/watch/watch.c
View File

@ -75,7 +75,6 @@ const char *opt_snpdev;
char dev_name[DEV_NAME_LEN]; char dev_name[DEV_NAME_LEN];
int snp_io; int snp_io;
int snp_tty = 0;
int std_in = 0, std_out = 1; int std_in = 0, std_out = 1;
@ -187,8 +186,6 @@ cleanup(int signo __unused)
if (opt_timestamp) if (opt_timestamp)
timestamp("Logging Exited."); timestamp("Logging Exited.");
close(snp_io); close(snp_io);
if (snp_tty != 0)
close(snp_tty);
unset_tty(); unset_tty();
exit(EX_OK); exit(EX_OK);
} }
@ -227,8 +224,14 @@ detach_snp(void)
static void static void
attach_snp(void) attach_snp(void)
{ {
int snp_tty;
snp_tty = open(dev_name, O_RDONLY | O_NONBLOCK);
if (snp_tty < 0)
fatal(EX_DATAERR, "can't open device");
if (ioctl(snp_io, SNPSTTY, &snp_tty) != 0) if (ioctl(snp_io, SNPSTTY, &snp_tty) != 0)
fatal(EX_UNAVAILABLE, "cannot attach to tty"); fatal(EX_UNAVAILABLE, "cannot attach to tty");
close(snp_tty);
if (opt_timestamp) if (opt_timestamp)
timestamp("Logging Started."); timestamp("Logging Started.");
} }
@ -255,11 +258,8 @@ set_dev(const char *name)
if ((sb.st_mode & S_IFMT) != S_IFCHR) if ((sb.st_mode & S_IFMT) != S_IFCHR)
fatal(EX_DATAERR, "must be a character device"); fatal(EX_DATAERR, "must be a character device");
if (snp_tty != 0) strncpy(dev_name, buf, DEV_NAME_LEN);
close(snp_tty);
snp_tty = open(buf, O_RDONLY);
if (snp_tty < 0)
fatal(EX_DATAERR, "can't open device");
attach_snp(); attach_snp();
} }