Fix an array-bound violation, add some include guards.

diff --git a/include/sys/types.h b/include/sys/types.h
index 388f4371a698dcf6e6b804a3dd0e58713825fdf4..2795fc96b861e403dc49a86032fd1afb64f223a9 100644 (file)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -1,3 +1,6 @@
+#ifndef _INC_SYS_TYPE_H
+#define _INC_SYS_TYPE_H
+
 /*
  * this files resolves conflicts between the file of the host system and
  * the minix specific one. This file is included directly only on Minix
@@ -9,3 +12,5 @@
 #else
 #include <minix/types.h>
 #endif
+
+#endif

diff --git a/servers/ds/inc.h b/servers/ds/inc.h
index c0587c6bf2bb64b3038f6756d3ab36166897b777..b8f3630da3c27eb02f4686957ca0513a5fa51223 100644 (file)
--- a/servers/ds/inc.h
+++ b/servers/ds/inc.h
@@ -1,3 +1,6 @@
+#ifndef _INC_INC_H
+#define _INC_INC_H
+
 /* Header file including all needed system headers. */
 
 #define _SYSTEM            1    /* get OK and negative error codes */
@@ -28,4 +31,4 @@
 #include <signal.h>
 
 #include "proto.h"
-
+#endif

diff --git a/servers/ds/proto.h b/servers/ds/proto.h
index 3bb3310df9fe39d7db745fea4884dbd73c284ac3..211ec6b4768f72e2a7c8c93adf7c753dfd10f51c 100644 (file)
--- a/servers/ds/proto.h
+++ b/servers/ds/proto.h
@@ -1,3 +1,6 @@
+#ifndef _INC_PROTO_H
+#define _INC_PROTO_H
+
 /* Function prototypes. */
 
 /* main.c */
@@ -14,3 +17,4 @@ _PROTOTYPE(int do_snapshot, (message *m_ptr));
 _PROTOTYPE(int do_getsysinfo, (message *m_ptr));
 _PROTOTYPE(int sef_cb_init_fresh, (int type, sef_init_info_t *info));
 
+#endif

diff --git a/servers/ds/store.c b/servers/ds/store.c
index e2d1c4aee97b13d76c16392ebb5becc112434707..d80075171b018f1ba6f9a05d578279d089ab7dfe 100644 (file)
--- a/servers/ds/store.c
+++ b/servers/ds/store.c
@@ -325,7 +325,7 @@ PUBLIC int do_publish(message *m_ptr)
        break;
   case DSF_TYPE_STR:
        strncpy(dsp->u.string, (char *)(&m_ptr->DS_STRING), DS_MAX_STRLEN);
-       dsp->u.string[DS_MAX_KEYLEN - 1] = '\0';
+       dsp->u.string[DS_MAX_STRLEN - 1] = '\0';
        break;
   case DSF_TYPE_MEM:
        length = m_ptr->DS_VAL_LEN;