From ccb1c753e7dff9af0090e0ebd3bc55d4429bfdb4 Mon Sep 17 00:00:00 2001
From: dev <dev@3f5042e3-fb1d-0410-be18-d6ca2573e517>
Date: Wed, 31 Aug 2005 17:10:23 +0000
Subject: [PATCH] add MFULoad checking

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@22 3f5042e3-fb1d-0410-be18-d6ca2573e517
---
 configure                |  4 ++--
 include/msched-version.h |  2 +-
 src/moab/MFile.c         | 20 +++++++++++++++++---
 src/moab/Makefile        |  4 ++--
 src/server/Makefile      |  6 +++---
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 5eb33a0..2d55fdf 100755
--- a/configure
+++ b/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"
diff --git a/include/msched-version.h b/include/msched-version.h
index 8b13789..efa9077 100644
--- a/include/msched-version.h
+++ b/include/msched-version.h
@@ -1 +1 @@
-
+#define MSCHED_VERSION "maui-3.2.6p14-snap.1125503657"
diff --git a/src/moab/MFile.c b/src/moab/MFile.c
index c2c3dbc..37c8fca 100644
--- a/src/moab/MFile.c
+++ b/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++)
     {
diff --git a/src/moab/Makefile b/src/moab/Makefile
index fc61c19..fd5c031 100644
--- a/src/moab/Makefile
+++ b/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)
diff --git a/src/server/Makefile b/src/server/Makefile
index e038286..b339f26 100644
--- a/src/server/Makefile
+++ b/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)