--- ray/src/rt/vga.c	1992/10/14 10:30:30	2.4
+++ ray/src/rt/vga.c	2003/02/22 02:07:29	2.8
@@ -1,15 +1,69 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: vga.c,v 2.8 2003/02/22 02:07:29 greg Exp $";
 #endif
-
 /*
  *  vga.c - driver for VGA graphics adaptor under MS-DOS
  */
 
-#include  <stdio.h>
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
 
+#include  "standard.h"
+
 #include  <graph.h>
 
 #include  "driver.h"
@@ -50,8 +104,8 @@ char  *name, *id;
 			break;
 	if (*mp == -1) {
 		_setvideomode(_DEFAULTMODE);
-		stderr_v(name);
-		stderr_v(": card not present or insufficient VGA memory\n");
+		eputs(name);
+		eputs(": card not present or insufficient VGA memory\n");
 		return(NULL);
 	}
 	_getvideoconfig(&config);
@@ -76,10 +130,13 @@ char  *name, *id;
 	_remappalette(1, _BRIGHTWHITE);
 	_settextcolor(1);
 	ms_gcinit(&vga_driver);
-	errvec = vga_errout;
-	cmdvec = vga_comout;
-	if (wrnvec != NULL)
-		wrnvec = vga_comout;
+	erract[USER].pf =
+	erract[SYSTEM].pf =
+	erract[INTERNAL].pf =
+	erract[CONSISTENCY].pf = vga_errout;
+	erract[COMMAND].pf = vga_comout;
+	if (erract[WARNING].pf != NULL)
+		erract[WARNING].pf = vga_comout;
 	return(&vga_driver);
 }
 
@@ -87,13 +144,17 @@ char  *name, *id;
 static
 vga_close()					/* close VGA */
 {
+	ms_gcdone(&vga_driver);
 	_setvideomode(_DEFAULTMODE);
-	errvec = stderr_v;			/* reset error vectors */
-	cmdvec = NULL;
-	if (wrnvec != NULL)
-		wrnvec = stderr_v;
+	erract[USER].pf = 			/* reset error vector */
+	erract[SYSTEM].pf =
+	erract[INTERNAL].pf =
+	erract[CONSISTENCY].pf = eputs;
+	erract[COMMAND].pf = NULL;
+	if (erract[WARNING].pf != NULL)
+		erract[WARNING].pf = wputs;
 	if (fatalerr[0])
-		stderr_v(fatalerr);		/* repeat error message */
+		eputs(fatalerr);		/* repeat error message */
 }