Index: VERSION =================================================================== RCS file: /home/cvsroot/scsidev/VERSION,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- VERSION 2000/01/16 22:35:17 1.2 +++ VERSION 2000/01/23 23:35:53 1.2.2.1 @@ -1 +1 @@ -2.0 +2.0a Index: scsidev.c =================================================================== RCS file: /home/cvsroot/scsidev/scsidev.c,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- scsidev.c 2000/01/16 23:28:49 1.8 +++ scsidev.c 2000/01/23 23:35:53 1.8.2.1 @@ -55,7 +55,7 @@ #include -//static char rcsid[] ="$Id: scsidev.c,v 1.8 2000/01/16 23:28:49 garloff Exp $"; +//static char rcsid[] ="$Id: scsidev.c,v 1.8.2.1 2000/01/23 23:35:53 garloff Exp $"; static char *versid = "scsidev " VERSION " 2000/01/16"; #include "config.h" @@ -849,12 +849,19 @@ int line; int devtype_i; char *manufacturer, *model, *serial_number, *name, *devtype, *rev, *host; + char *scsialias; #ifdef DEBUG - configfile = fopen ("scsi.alias", "r"); + scsialias = "scsi.alias"; #else - configfile = fopen ("/etc/scsi.alias", "r"); + scsialias = "/etc/scsi.alias"; #endif + + configfile = fopen (scsialias, "r"); + if (!configfile) { + if (verbose) perror (scsialias); + return; + } line = 0; while (1==1) {