add MFULoad checking

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@22 3f5042e3-fb1d-0410-be18-d6ca2573e517

configure

@@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='maui'
 PACKAGE_TARNAME='maui'
-PACKAGE_VERSION='3.2p8'
-PACKAGE_STRING='maui 3.2p8'
+PACKAGE_VERSION='3.2.6p14'
+PACKAGE_STRING='maui 3.2.6p14'
 PACKAGE_BUGREPORT='help@supercluster.org'
 
 ac_unique_file="src/mcom/MConst.c"

include/msched-version.h

@@ -1 +1 @@
-
+#define MSCHED_VERSION "maui-3.2.6p14-snap.1125503657"

src/moab/MFile.c

@@ -82,7 +82,7 @@ char *MFULoad(
 
   DBG(5,fCORE) DPrint("%s(%s,%d,%s,BlockCount,SC)\n",
     FName,
-    FileName,
+    (FileName != NULL) ? FileName : "NULL",
     BlockSize,
     (AccessMode == macmRead) ? "READ" : "WRITE");
 
@@ -91,7 +91,9 @@ char *MFULoad(
 
   /* check if file is cached */
 
-  if (__MFUGetCachedFile(FileName,&buf,&BufSize) == SUCCESS)
+  if ((FileName != NULL) &&
+      (FileName[0] != '\0') &&
+      (__MFUGetCachedFile(FileName,&buf,&BufSize) == SUCCESS))
     {
     if (BlockCount != NULL)
       *BlockCount = BufSize / BlockSize;
@@ -286,7 +288,19 @@ int __MFUGetCachedFile(
 
   DBG(5,fSTRUCT) DPrint("%s(%s,Buffer,BufSize)\n",
     FName,
-    FileName);
+    (FileName != NULL) ? FileName : "NULL");
+
+  if (Buffer == NULL)
+    {
+    return(FAILURE);
+    }
+
+  *Buffer = NULL;
+
+  if ((FileName == NULL) || (FileName[0] == '\0'))
+    {
+    return(FAILURE);
+    }
 
   for (index = 0;index < MAX_FILECACHE;index++)
     {

src/moab/Makefile

@@ -1,5 +1,5 @@
 # Makefile for Moab 2.2.3
-# Copyright 1999 - 2004  Supercluster Development Group, All Rights Reserved
+# Copyright 1999 - 2005  Cluster Resources Inc, All Rights Reserved
 
    TOP =../..
    BIN =$(TOP)/bin/
@@ -31,7 +31,7 @@ LOBJECTS =MFile.o MConfig.o MQOS.o MLog.o MCred.o MSched.o MAM.o MSR.o MRes.o \
     CP =cp
     RM =rm -f
 
-SOURCE = -g
+SOURCE =
 CFLAGS = $(OSCCFLAGS)
 
 all:    $(MOAB)

src/server/Makefile

@@ -1,5 +1,5 @@
-# Makefile for Maui v3.2
-# Copyright 1999 - 2004  Cluster Resources, Inc, All Rights Reserved
+# Makefile for Maui v3.2.6
+# Copyright 1999 - 2005  Cluster Resources, Inc, All Rights Reserved
 
    TOP =../..
    BIN =$(TOP)/bin
@@ -41,7 +41,7 @@ POBJECTS =mprof.o
     CP =cp
     LN =ln
 
-SOURCE = -g
+SOURCE = 
 CFLAGS = $(OSCCFLAGS)
 
 all:    $(MBINS)