merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / tests / openfile.c

diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c
index 7d8cc6b..7b97309 100644 (file)
--- a/lustre/tests/openfile.c
+++ b/lustre/tests/openfile.c
@@ -18,8 +18,8 @@
 #include <unistd.h>
 
 typedef struct flag_mapping {
-       char string[20];
-       int  flag;
+       const char *string;
+       const int  flag;
 } FLAG_MAPPING;
 
 FLAG_MAPPING flag_table[] = {
@@ -67,13 +67,13 @@ int main(int argc, char** argv)
                 case 'f': {
                         char *tmp;
 
-                        cloned_flags = (char *)malloc(strlen(optarg));
+                        cloned_flags = (char *)malloc(strlen(optarg)+1);
                         if (cloned_flags == NULL) {
                                 fprintf(stderr, "Insufficient memory.\n");
                                 exit(-1);
                         }
 
-                        strncpy(cloned_flags, optarg, strlen(optarg));
+                        strncpy(cloned_flags, optarg, strlen(optarg)+1);
                         for (tmp = strtok(optarg, ":|"); tmp;
                              tmp = strtok(NULL, ":|")) {
                                 int i = 0;