Andrew Moore
|
5bb374bc76
|
patch 1of2 to prevent kill -1 syslogd from hanging the console
blindly applied patch provided by Christoph Robitschko:
*** cons.c.orig Sat Jun 12 07:57:53 1993
--- cons.c Thu Aug 19 22:34:53 1993
***************
*** 56,61 ****
--- 56,62 ----
#include "sys/tty.h"
#include "sys/file.h"
#include "sys/conf.h"
+ #include "sys/vnode.h"
#include "cons.h"
***************
*** 105,118 ****
--- 106,130 ----
(*cp->cn_init)(cp);
}
+ static struct vnode *cnopenvp = NULLVP;
+
+
cnopen(dev, flag, mode, p)
dev_t dev;
int flag, mode;
struct proc *p;
{
+ int error;
+
+
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
+ if (cnopenvp == NULLVP)
+ if ((error = getdevvp(dev, &cnopenvp, VCHR))) {
+ printf("cnopen: getdevvp returned %d !\n", error);
+ return(error);
+ }
return ((*cdevsw[major(dev)].d_open)(dev, flag, mode, p));
}
***************
*** 121,130 ****
int flag, mode;
struct proc *p;
{
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
! return ((*cdevsw[major(dev)].d_close)(dev, flag, mode, p));
}
cnread(dev, uio, flag)
--- 133,153 ----
int flag, mode;
struct proc *p;
{
+ int error;
+
+
if (cn_tab == NULL)
return (0);
dev = cn_tab->cn_dev;
! if (vcount(cnopenvp) <= 1)
! error = (*cdevsw[major(dev)].d_close)(dev, flag, mode, p);
! else
! error = 0;
! if (error == 0) {
! vrele(cnopenvp);
! cnopenvp = NULLVP;
! return(error);
! }
}
cnread(dev, uio, flag)
|
1993-08-20 05:46:09 +00:00 |
David Greenman
Rodney W. Grimes