X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fopenfile.c;h=da10c49c126284477d482360c81cf29fcc36652d;hb=1d18f992d4cd1e8c9300987587974524b113847a;hp=5a7e4d6000fa4c1e5ceafdf4669026dadc5551ce;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c index 5a7e4d6..da10c49 100644 --- a/lustre/tests/openfile.c +++ b/lustre/tests/openfile.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +24,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -93,13 +91,13 @@ int main(int argc, char** argv) int fd; int flags = 0; mode_t mode = 0644; - char* fname = NULL; + char *fname = NULL; int mode_set = 0; int flag_set = 0; int c; int save_errno = 0; int print_usage = 0; - char* cloned_flags = NULL; + char *cloned_flags = NULL; if (argc == 1) Usage_and_abort(); @@ -126,7 +124,7 @@ int main(int argc, char** argv) break; } else flags = 0; - + for (tmp = strtok(cloned_flags, ":|"); tmp; tmp = strtok(NULL, ":|")) { int i = 0; @@ -203,12 +201,11 @@ int main(int argc, char** argv) } else { 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)); } - if (mode_set) - fprintf(stderr, ", mode=%o", mode); - fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno)); - out: if (cloned_flags) free(cloned_flags);