Branch HEAD

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

diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c
index ab5cbdb..6cba76b 100644 (file)
--- a/lustre/tests/openfile.c
+++ b/lustre/tests/openfile.c
@@ -6,7 +6,10 @@
 #define DEBUG
 #endif
 
+/* for O_DIRECTORY and O_DIRECT */
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -16,10 +19,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <lustre/lustre_user.h>
 
 typedef struct flag_mapping {
-       char string[20];
-       int  flag;
+       const char *string;
+       const int  flag;
 } FLAG_MAPPING;
 
 FLAG_MAPPING flag_table[] = {
@@ -34,9 +38,13 @@ FLAG_MAPPING flag_table[] = {
        {"O_NONBLOCK", O_NONBLOCK},
        {"O_NDELAY", O_NDELAY},
        {"O_SYNC", O_SYNC},
-       {"O_NOFOLLOW", O_NOFOLLOW},
-       {"O_DIRECTORY", O_DIRECTORY},
+#ifdef O_DIRECT
+       {"O_DIRECT", O_DIRECT},
+#endif
        {"O_LARGEFILE", O_LARGEFILE},
+       {"O_DIRECTORY", O_DIRECTORY},
+       {"O_NOFOLLOW", O_NOFOLLOW},
+       {"O_LOV_DELAY_CREATE", O_LOV_DELAY_CREATE},
        {"", -1}
 };
 
@@ -49,60 +57,53 @@ void Usage_and_abort(void)
 
 int main(int argc, char** argv)
 {
-        int i;
+        int    fd;
         int    flags=0;
-        mode_t mode=0;
+        mode_t mode=0644;
         char*  fname=NULL;
         int    mode_set=0;
         int    flag_set=0;
         int    file_set=0;
-        char   c;
-        char*  cloned_flags;
+        int    c;
+        int    save_errno;
+        char*  cloned_flags = NULL;
 
-        if(argc == 1) {
+        if (argc == 1)
                 Usage_and_abort();
-        }
 
         while ((c = getopt (argc, argv, "f:m:")) != -1) {
                 switch (c) {
                 case 'f': {
                         char *tmp;
 
-                        cloned_flags = (char*)malloc(strlen(optarg));
-                        if (cloned_flags==NULL) {
+                        cloned_flags = (char *)malloc(strlen(optarg)+1);
+                        if (cloned_flags == NULL) {
                                 fprintf(stderr, "Insufficient memory.\n");
                                 exit(-1);
                         }
 
-                        strncpy(cloned_flags, optarg, strlen(optarg));
-                        tmp = strtok(optarg, ":");
-                        while (tmp) {
+                        strncpy(cloned_flags, optarg, strlen(optarg)+1);
+                        for (tmp = strtok(cloned_flags, ":|"); tmp;
+                             tmp = strtok(NULL, ":|")) {
                                 int i = 0;
 #ifdef DEBUG
                                 printf("flags = %s\n",tmp);
 #endif
                                 flag_set = 1;
-                                while (flag_table[i].flag != -1) {
-                                        int r;
-                                        r = strncasecmp(tmp, (flag_table[i].string),
-                                                        strlen((flag_table[i].string)) );
-
-                                        if (r == 0)
+                                for (i = 0; flag_table[i].flag != -1; i++) {
+                                        if (!strcmp(tmp, flag_table[i].string)){
+                                                flags |= flag_table[i].flag;
                                                 break;
-                                        i++;
+                                        }
                                 }
 
-                                if (flag_table[i].flag != -1) {
-                                        flags |= flag_table[i].flag;
-                                } else {
+                                if (flag_table[i].flag == -1) {
                                         fprintf(stderr, "No such flag: %s\n",
                                                 tmp);
                                         exit(-1);
                                 }
-
-                                tmp = strtok(NULL, ":");
-
                         }
+                        free(cloned_flags);
 #ifdef DEBUG
                         printf("flags = %x\n", flags);
 #endif
@@ -112,7 +113,7 @@ int main(int argc, char** argv)
 #ifdef DEBUG
                         printf("mode = %s\n", optarg);
 #endif
-                        mode = strtol (optarg, NULL, 8);
+                        mode = strtol(optarg, NULL, 8);
                         mode_set = 1;
 #ifdef DEBUG
                         printf("mode = %o\n", mode);
@@ -138,25 +139,29 @@ int main(int argc, char** argv)
         }
 
 
-        if (mode_set)
-                i = open(fname, flags, mode);
+        if (flags & O_CREAT)
+                fd = open(fname, flags, mode);
         else
-                i = open(fname, flags);
+                fd = open(fname, flags);
 
-        if (i != -1) {
-                fprintf(stderr, "Succeed in opening file \"%s\"(flags=%s",
-                        fname, cloned_flags);
+        save_errno = errno;
+
+        if (fd != -1) {
+                printf("Succeed in opening file \"%s\"(flags=%s",
+                       fname, cloned_flags);
 
                 if (mode_set)
-                        fprintf(stderr, ", mode=%o", mode);
-                fprintf(stderr, ")\n");
-                close (i);
-        } else {
-                fprintf(stderr, "Error in opening file \"%s\"(flags=%s",
-                        fname, cloned_flags);
-                if (mode_set)
-                        fprintf(stderr, ", mode=%o", mode);
-                fprintf(stderr, ") %s\n", strerror(errno));
+                        printf(", mode=%o", mode);
+                printf(")\n");
+                close(fd);
+                return 0;
         }
-        return(i);
+
+        fprintf(stderr, "Error in opening file \"%s\"(flags=%s",
+                fname, cloned_flags);
+        if (mode_set)
+                fprintf(stderr, ", mode=%o", mode);
+        fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno));
+
+        return save_errno;
 }