From owner-freebsd-audit  Sun Dec  3 22:48:38 2000
From owner-freebsd-audit@FreeBSD.ORG  Sun Dec  3 22:48:36 2000
Return-Path: <owner-freebsd-audit@FreeBSD.ORG>
Delivered-To: freebsd-audit@freebsd.org
Received: from lennier.cc.vt.edu (lennier.cc.vt.edu [198.82.161.193])
	by hub.freebsd.org (Postfix) with ESMTP id 3046337B401
	for <FreeBSD-audit@freebsd.org>; Sun,  3 Dec 2000 22:48:35 -0800 (PST)
Received: from mail.vt.edu (gkar.cc.vt.edu [198.82.161.190])
	by lennier.cc.vt.edu (8.11.0/8.11.0) with ESMTP id eB46mYB520822
	for <FreeBSD-audit@freebsd.org>; Mon, 4 Dec 2000 01:48:34 -0500 (EST)
Received: from muriel.penguinpowered.com ([198.82.100.195])
 by gkar.cc.vt.edu (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10)
 with ESMTP id <0G51003H66WW8G@gkar.cc.vt.edu> for FreeBSD-audit@freebsd.org;
 Mon,  4 Dec 2000 01:48:32 -0500 (EST)
Date: Mon, 04 Dec 2000 01:48:35 -0500 (EST)
From: Mike Heffner <mheffner@vt.edu>
Subject: cursor patch
Sender: spock@muriel.penguinpowered.com
To: FreeBSD-audit <FreeBSD-audit@freebsd.org>
Message-id: <XFMail.20001204014835.mheffner@vt.edu>
MIME-version: 1.0
X-Mailer: XFMail 1.4.4 on FreeBSD
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 8bit
X-Priority: 3 (Normal)
Sender: owner-freebsd-audit@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

This fixes the overflow on the -d option of cursor(1).

Index: cursor.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pcvt/cursor/cursor.c,v
retrieving revision 1.7
diff -u -r1.7 cursor.c
--- cursor.c    1999/01/01 08:31:55     1.7
+++ cursor.c    2000/12/04 06:44:15
@@ -45,6 +45,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <stdio.h>
+#include <err.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <machine/pcvt_ioctl.h>
@@ -104,29 +105,15 @@
                fd = DEFAULTFD;
        }
        else
-       {
                if((fd = open(device, O_RDWR)) == -1)
-               {
-                       char buffer[80];
-                       strcpy(buffer,"ERROR opening ");
-                       strcat(buffer,device);
-                       perror(buffer);
-                       exit(1);
-               }
-       }
+                       err(1, "ERROR opening %s", device);
 
        if(screen == -1)
        {
                struct stat stat;
 
                if((fstat(fd, &stat)) == -1)
-               {
-                       char buffer[80];
-                       strcpy(buffer,"ERROR opening ");
-                       strcat(buffer,device);
-                       perror(buffer);
-                       exit(1);
-               }
+                       err(1, "ERROR opening %s", device);
 
                screen = minor(stat.st_rdev);
        }
@@ -136,10 +123,7 @@
        cursorshape.screen_no = screen;
 
        if(ioctl(fd, VGACURSOR, &cursorshape) == -1)
-       {
-               perror("cursor - ioctl VGACURSOR failed, error");
-               exit(1);
-       }
+               err(1, "cursor - ioctl VGACURSOR failed, error");
        else
                exit(0);
 }


-- 
  Mike Heffner     <mheffner@vt.edu>
  Blacksburg, VA         ICQ# 882073
  http://my.ispchannel.com/~mheffner


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-audit" in the body of the message