From fa31cb73b52dbe213f9a07a52a7e5ed3bd7d56aa Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 11 Aug 2003 17:11:44 +0000 Subject: [PATCH] don't seg if files can't be opened --- tools/qfbsp/source/map.c | 3 +++ tools/qfbsp/source/qfbsp.c | 5 +++++ tools/qfbsp/source/writebsp.c | 3 +++ 3 files changed, 11 insertions(+) diff --git a/tools/qfbsp/source/map.c b/tools/qfbsp/source/map.c index c2c28df51..645791a3e 100644 --- a/tools/qfbsp/source/map.c +++ b/tools/qfbsp/source/map.c @@ -31,6 +31,7 @@ static __attribute__ ((unused)) const char rcsid[] = # include #endif #include +#include #include "QF/dstring.h" #include "QF/quakefs.h" @@ -523,6 +524,8 @@ LoadMapFile (const char *filename) QFile *file; file = Qopen (filename, "rt"); + if (!file) + Sys_Error ("couldn't open %s. %s", filename, strerror(errno)); buf = malloc (Qfilesize (file) + 1); buf[Qfilesize (file)] = 0; Qread (file, buf, Qfilesize (file)); diff --git a/tools/qfbsp/source/qfbsp.c b/tools/qfbsp/source/qfbsp.c index bfdd42b3e..2b4474ec9 100644 --- a/tools/qfbsp/source/qfbsp.c +++ b/tools/qfbsp/source/qfbsp.c @@ -38,6 +38,7 @@ static __attribute__ ((unused)) const char rcsid[] = # include #endif #include +#include #include "QF/quakefs.h" #include "QF/sys.h" @@ -579,10 +580,14 @@ UpdateEntLump (void) printf ("Updating entities lump...\n"); f = Qopen (options.bspfile, "rb"); + if (!f) + Sys_Error ("couldn't open %s. %s", options.bspfile, strerror(errno)); bsp = LoadBSPFile (f, Qfilesize (f)); Qclose (f); WriteEntitiesToString (); f = Qopen (options.bspfile, "wb"); + if (!f) + Sys_Error ("couldn't open %s. %s", options.bspfile, strerror(errno)); WriteBSPFile (bsp, f); Qclose (f); } diff --git a/tools/qfbsp/source/writebsp.c b/tools/qfbsp/source/writebsp.c index 8cf4f7919..f0c4af516 100644 --- a/tools/qfbsp/source/writebsp.c +++ b/tools/qfbsp/source/writebsp.c @@ -32,6 +32,7 @@ static __attribute__ ((unused)) const char rcsid[] = #endif #include #include +#include #include "QF/dstring.h" #include "QF/qendian.h" @@ -517,6 +518,8 @@ FinishBSPFile (void) // XXX PrintBSPFileSizes (); f = Qopen (options.bspfile, "wb"); + if (!f) + Sys_Error ("couldn't open %s. %s", options.bspfile, strerror(errno)); WriteBSPFile (bsp, f); Qclose (f); }