diff --git a/src/bin/ubistry/Makefile b/src/bin/ubistry/Makefile
deleted file mode 100644
index 5240c62..0000000
--- a/src/bin/ubistry/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-# Application Makefile (C) 2002-2004 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.inc
-include ../Makefile.inc
-
-#Linker
-LD = ld
-
-#Binary File Name
-BINARY = ubistry
-
-#Delete Program
-REMOVE = rm -f
-
-#Objects
-OBJS = db.o message.o main.o
-
-LIBRARIES = ../../lib/libc_old/libc_old.so
-
-# Link The Binary
-$(BINARY) : $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)
-	strip $(BINARY)
-
-# Compile the source files
-.cpp.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-.cc.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-.cc.s:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
- 
-.c.s:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $<
- 
-# Clean Up The junk
-clean:
-	$(REMOVE) $(OBJS) $(BINARY)
diff --git a/src/bin/ubistry/db.c b/src/bin/ubistry/db.c
deleted file mode 100644
index db47c4b..0000000
--- a/src/bin/ubistry/db.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project nor the names of its
- contributors may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS 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
- THE COPYRIGHT OWNER OR 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.
-
- $Id$
-
-*****************************************************************************************/
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "./include/ubistry.h"
-
-static struct ubistryKey *keys = 0x0;
-
-  
-struct ubistryKey * ubistryFindKey(char *name) {
-  struct ubistryKey *tmpKey = keys;
-
-  for (;tmpKey;tmpKey=tmpKey->next) {
-    if (!strcmp(name,tmpKey->name)) {
-      return(tmpKey);
-      }
-    }
-  return(0x0);
-  }
-
-int ubistryAddKey(char *name,char *value) {
-  struct ubistryKey *tmpKey = (struct ubistryKey *)malloc(sizeof(struct ubistryKey));
-
-  sprintf(tmpKey->name,name);
-  sprintf(tmpKey->value,value);
-
-  if (keys == 0x0) {
-    keys = tmpKey;
-    keys->prev = 0x0;
-    keys->next = 0x0;
-    } 
-  else {
-    tmpKey->next = keys;
-    tmpKey->prev = 0x0;
-    keys->prev   = tmpKey;
-    keys         = tmpKey;
-    }
-
-  return(0x0);
-  }
-
-/***
- $Log$
- Revision 1.1  2004/05/26 15:41:20  reddawg
- ubistry: added command 666 which will restart the registry server also added
-          command 51 to add a key format key,value
-
- END
- ***/
diff --git a/src/bin/ubistry/include/ubistry.h b/src/bin/ubistry/include/ubistry.h
deleted file mode 100644
index 231acea..0000000
--- a/src/bin/ubistry/include/ubistry.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <sys/types.h>
-
-#define MBOX_NAME "ubistry"
-
-struct ubistryKey {
-  struct ubistryKey *prev;
-  struct ubistryKey *next;
-  char               name[128];
-  char               value[512];
-  };
-
-struct ubistryKey * ubistryFindKey(char *);
-int ubistryAddKey(char *,char *);
-int ubistryInitMbox(char *);
-void ubistryProcessMessages();
diff --git a/src/bin/ubistry/main.c b/src/bin/ubistry/main.c
deleted file mode 100644
index 1987b05..0000000
--- a/src/bin/ubistry/main.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project nor the names of its
- contributors may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS 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
- THE COPYRIGHT OWNER OR 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.
-
- $Id$
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/sys.h>
-#include <sys/sched.h>
-#include "./include/ubistry.h"
-
-int main(int argc,char **argv) {
-  //FILE *pidFile;
-
-  if (fork() != 0x0) {
-    exit(0x0);
-    }
-
-  ubistryInitMbox(MBOX_NAME);
-
-  ubistryAddKey("Ubu","Creator Of UbixOS");
-  ubistryAddKey("TCA","The GUI GUY!!!");
-
-  while (1) {
-    ubistryProcessMessages();
-    sched_yield();
-    }
-
-  exit(0x0);
-  }
-
-/***
- $Log$
- Revision 1.9  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- Revision 1.8  2004/07/17 16:43:10  reddawg
- shell: fixed stress testing
- ubistry: fixed some segfaults
- spinlock: added assert()
-
- Revision 1.7  2004/06/17 15:10:55  reddawg
- Fixed Some Global Variables
-
- Revision 1.6  2004/06/10 13:08:00  reddawg
- Minor Bug Fixes
-
- Revision 1.5  2004/06/01 01:30:43  reddawg
- No more warnings and organized make files
-
- Revision 1.4  2004/05/26 15:41:20  reddawg
- ubistry: added command 666 which will restart the registry server also added
-          command 51 to add a key format key,value
-
- Revision 1.3  2004/05/26 13:10:39  reddawg
- ubistry: added two functions
-          ubistryFindKey(char *name) <- Will find key with specified name
-          ubistryAddKey(char *name,char *value) <-> Will add key with specified
-            name and value
-
- Revision 1.2  2004/05/26 12:16:02  reddawg
- ubistry: now runs as a deamon
-
- Revision 1.1  2004/05/26 12:09:12  reddawg
- ubistry: this is the frame work for the ubix registry system more to come
-          over the next few days
-
- END
- ***/
diff --git a/src/bin/ubistry/message.c b/src/bin/ubistry/message.c
deleted file mode 100644
index e29d9ad..0000000
--- a/src/bin/ubistry/message.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project nor the names of its
- contributors may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS 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
- THE COPYRIGHT OWNER OR 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.
-
- $Id$
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/sys.h>
-#include <sys/mpi.h>
-#include "./include/ubistry.h"
-
-int ubistryInitMbox(char *name) {
-
-  if (mpi_createMbox(name) != 0x0) {
-    printf("Error: Error Creating Mail Box: [%s]\n",name);
-    return(-1);
-    }
-
-  return(0x0);
-  }
-
-void ubistryProcessMessages() {
-  mpi_message_t       msg;
-  struct ubistryKey *tmpKey = 0x0;
-  char *key,*value;
-
-  mfmStart:
-  if (mpi_fetchMessage("ubistry",&msg) == 0x0) {
-    switch (msg.header) {
-      case 50:
-        tmpKey = ubistryFindKey(msg.data);
-        if (tmpKey == 0x0)
-          printf("ubistry: Key (%s) Not Found\n",msg.data);
-        else
-          printf("ubistry: Key (%s) Found Has Value (%s)\n",tmpKey->name,tmpKey->value);
-        break;
-      case 51:
-         key = strtok(msg.data,",");
-         value = strtok(NULL,"\n");
-         printf("ubistry: Adding key (%s) with value (%s)\n",key,value); 
-         ubistryAddKey(key,value);
-         break;
-      case 666:
-        mpi_destroyMbox("ubistry");
-        if (fork() == 0x0) {
-          printf("ubistry: Restarting\n");
-          exec("ubistry@sys",0x0,0x0);
-          }
-        else {
-          exit(0x0);
-          }
-        break;
-      default:
-        printf("ubistry: Command (%i) With Data (%s) Not Valid\n",msg.header,msg.data);
-        break;
-      }
-    goto mfmStart;
-    }
-  return;
-  }
-
-/***
- $Log$
- Revision 1.1  2004/05/26 15:41:20  reddawg
- ubistry: added command 666 which will restart the registry server also added
-          command 51 to add a key format key,value
-
- END
- ***/
diff --git a/src/sbin/ubistry/Makefile b/src/sbin/ubistry/Makefile
new file mode 100644
index 0000000..5240c62
--- /dev/null
+++ b/src/sbin/ubistry/Makefile
@@ -0,0 +1,48 @@
+# $Id$
+# Application Makefile (C) 2002-2004 The UbixOS Project
+
+# Include Global 'Source' Options
+include ../../Makefile.inc
+include ../Makefile.inc
+
+#Linker
+LD = ld
+
+#Binary File Name
+BINARY = ubistry
+
+#Delete Program
+REMOVE = rm -f
+
+#Objects
+OBJS = db.o message.o main.o
+
+LIBRARIES = ../../lib/libc_old/libc_old.so
+
+# Link The Binary
+$(BINARY) : $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)
+	strip $(BINARY)
+
+# Compile the source files
+.cpp.o:
+	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+
+.cc.o:
+	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+
+.cc.s:
+	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+ 
+.c.o:
+	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+ 
+.c.s:
+	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+ 
+.S.o:
+	$(CC)  -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $<
+ 
+# Clean Up The junk
+clean:
+	$(REMOVE) $(OBJS) $(BINARY)
diff --git a/src/sbin/ubistry/db.c b/src/sbin/ubistry/db.c
new file mode 100644
index 0000000..d495e29
--- /dev/null
+++ b/src/sbin/ubistry/db.c
@@ -0,0 +1,80 @@
+/*****************************************************************************************
+ Copyright (c) 2002-2004 The UbixOS Project
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS 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
+ THE COPYRIGHT OWNER OR 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.
+
+ $Id$
+
+*****************************************************************************************/
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "./include/ubistry.h"
+
+static struct ubistryKey *keys = 0x0;
+
+  
+struct ubistryKey * ubistryFindKey(char *name) {
+  struct ubistryKey *tmpKey = keys;
+
+  for (;tmpKey;tmpKey=tmpKey->next) {
+    if (!strcmp(name,tmpKey->name)) {
+      return(tmpKey);
+      }
+    }
+  return(0x0);
+  }
+
+int ubistryAddKey(char *name,char *value) {
+  struct ubistryKey *tmpKey = (struct ubistryKey *)malloc(sizeof(struct ubistryKey));
+
+  sprintf(tmpKey->name,name);
+  sprintf(tmpKey->value,value);
+
+  if (keys == 0x0) {
+    keys = tmpKey;
+    keys->prev = 0x0;
+    keys->next = 0x0;
+    } 
+  else {
+    tmpKey->next = keys;
+    tmpKey->prev = 0x0;
+    keys->prev   = tmpKey;
+    keys         = tmpKey;
+    }
+
+  return(0x0);
+  }
+
+/***
+ $Log$
+ Revision 1.2  2004/06/17 15:10:55  reddawg
+ Fixed Some Global Variables
+
+ Revision 1.1  2004/05/26 15:41:20  reddawg
+ ubistry: added command 666 which will restart the registry server also added
+          command 51 to add a key format key,value
+
+ END
+ ***/
diff --git a/src/sbin/ubistry/include/ubistry.h b/src/sbin/ubistry/include/ubistry.h
new file mode 100644
index 0000000..231acea
--- /dev/null
+++ b/src/sbin/ubistry/include/ubistry.h
@@ -0,0 +1,15 @@
+#include <sys/types.h>
+
+#define MBOX_NAME "ubistry"
+
+struct ubistryKey {
+  struct ubistryKey *prev;
+  struct ubistryKey *next;
+  char               name[128];
+  char               value[512];
+  };
+
+struct ubistryKey * ubistryFindKey(char *);
+int ubistryAddKey(char *,char *);
+int ubistryInitMbox(char *);
+void ubistryProcessMessages();
diff --git a/src/sbin/ubistry/main.c b/src/sbin/ubistry/main.c
new file mode 100644
index 0000000..2c7b143
--- /dev/null
+++ b/src/sbin/ubistry/main.c
@@ -0,0 +1,97 @@
+/*****************************************************************************************
+ Copyright (c) 2002-2004 The UbixOS Project
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS 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
+ THE COPYRIGHT OWNER OR 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.
+
+ $Id$
+
+*****************************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/sys.h>
+#include <sys/sched.h>
+#include "./include/ubistry.h"
+
+int main(int argc,char **argv) {
+  //FILE *pidFile;
+
+  if (fork() != 0x0) {
+    exit(0x0);
+    }
+
+  ubistryInitMbox(MBOX_NAME);
+
+  ubistryAddKey("Ubu","Creator Of UbixOS");
+  ubistryAddKey("TCA","The GUI GUY!!!");
+
+  while (1) {
+    ubistryProcessMessages();
+    sched_yield();
+    }
+
+  exit(0x0);
+  }
+
+/***
+ $Log$
+ Revision 1.10  2004/09/08 23:19:58  reddawg
+ hmm
+
+ Revision 1.9  2004/08/02 18:50:13  reddawg
+ Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
+
+ Revision 1.8  2004/07/17 16:43:10  reddawg
+ shell: fixed stress testing
+ ubistry: fixed some segfaults
+ spinlock: added assert()
+
+ Revision 1.7  2004/06/17 15:10:55  reddawg
+ Fixed Some Global Variables
+
+ Revision 1.6  2004/06/10 13:08:00  reddawg
+ Minor Bug Fixes
+
+ Revision 1.5  2004/06/01 01:30:43  reddawg
+ No more warnings and organized make files
+
+ Revision 1.4  2004/05/26 15:41:20  reddawg
+ ubistry: added command 666 which will restart the registry server also added
+          command 51 to add a key format key,value
+
+ Revision 1.3  2004/05/26 13:10:39  reddawg
+ ubistry: added two functions
+          ubistryFindKey(char *name) <- Will find key with specified name
+          ubistryAddKey(char *name,char *value) <-> Will add key with specified
+            name and value
+
+ Revision 1.2  2004/05/26 12:16:02  reddawg
+ ubistry: now runs as a deamon
+
+ Revision 1.1  2004/05/26 12:09:12  reddawg
+ ubistry: this is the frame work for the ubix registry system more to come
+          over the next few days
+
+ END
+ ***/
diff --git a/src/sbin/ubistry/message.c b/src/sbin/ubistry/message.c
new file mode 100644
index 0000000..b289254
--- /dev/null
+++ b/src/sbin/ubistry/message.c
@@ -0,0 +1,98 @@
+/*****************************************************************************************
+ Copyright (c) 2002-2004 The UbixOS Project
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS 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
+ THE COPYRIGHT OWNER OR 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.
+
+ $Id$
+
+*****************************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/sys.h>
+#include <sys/mpi.h>
+#include "./include/ubistry.h"
+
+int ubistryInitMbox(char *name) {
+
+  if (mpi_createMbox(name) != 0x0) {
+    printf("Error: Error Creating Mail Box: [%s]\n",name);
+    return(-1);
+    }
+
+  return(0x0);
+  }
+
+void ubistryProcessMessages() {
+  mpi_message_t       msg;
+  struct ubistryKey *tmpKey = 0x0;
+  char *key,*value;
+
+  mfmStart:
+  if (mpi_fetchMessage("ubistry",&msg) == 0x0) {
+    switch (msg.header) {
+      case 50:
+        tmpKey = ubistryFindKey(msg.data);
+        if (tmpKey == 0x0)
+          printf("ubistry: Key (%s) Not Found\n",msg.data);
+        else
+          printf("ubistry: Key (%s) Found Has Value (%s)\n",tmpKey->name,tmpKey->value);
+        break;
+      case 51:
+         key = strtok(msg.data,",");
+         value = strtok(NULL,"\n");
+         printf("ubistry: Adding key (%s) with value (%s)\n",key,value); 
+         ubistryAddKey(key,value);
+         break;
+      case 666:
+        mpi_destroyMbox("ubistry");
+        if (fork() == 0x0) {
+          printf("ubistry: Restarting\n");
+          exec("ubistry@sys",0x0,0x0);
+          }
+        else {
+          exit(0x0);
+          }
+        break;
+      default:
+        printf("ubistry: Command (%i) With Data (%s) Not Valid\n",msg.header,msg.data);
+        break;
+      }
+    goto mfmStart;
+    }
+  return;
+  }
+
+/***
+ $Log$
+ Revision 1.2  2004/08/14 11:23:02  reddawg
+ Changes
+
+ Revision 1.1  2004/05/26 15:41:20  reddawg
+ ubistry: added command 666 which will restart the registry server also added
+          command 51 to add a key format key,value
+
+ END
+ ***/