-/* -*- 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.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
static int isatty_flag;
static int perms = S_IRWXU | S_IRGRP | S_IROTH;
-static struct option const longopts[] =
-{
- { "chunksize", required_argument, 0, 'c' },
- { "help", no_argument, 0, 'h' },
- { "offset", required_argument, 0, 'o' },
- { "long", no_argument, 0, 'l' },
- { "full", no_argument, 0, 'l' },
- { "partial", required_argument, 0, 'p' },
- { "quiet", required_argument, 0, 'q' },
- { "read", no_argument, 0, 'r' },
- { "filesize", no_argument, 0, 's' },
- { "timestamp", required_argument, 0, 't' },
- { "verbose", no_argument, 0, 'v' },
- { "write", no_argument, 0, 'w' },
- { 0, 0, 0, 0}
-};
+static struct option const long_opts[] = {
+ { .val = 'c', .name = "chunksize", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'l', .name = "long", .has_arg = no_argument },
+ { .val = 'l', .name = "full", .has_arg = no_argument },
+ { .val = 'o', .name = "offset", .has_arg = required_argument },
+ { .val = 'p', .name = "partial", .has_arg = required_argument },
+ { .val = 'q', .name = "quiet", .has_arg = required_argument },
+ { .val = 'r', .name = "read", .has_arg = no_argument },
+ { .val = 's', .name = "filesize", .has_arg = no_argument },
+ { .val = 't', .name = "timestamp", .has_arg = required_argument },
+ { .val = 'v', .name = "verbose", .has_arg = no_argument },
+ { .val = 'w', .name = "write", .has_arg = no_argument },
+ { .name = NULL } };
/*
* Usages: displays help information, whenever user supply --help option in
struct timeval start_time;
unsigned long long total_bytes;
unsigned long long curr_bytes = 0;
+ int rc = 0;
#ifdef HAVE_EXT2FS_EXT2FS_H
if (!full && fsetflags(testdir, EXT2_TOPDIR_FL))
fflush(countfile) != 0) {
fprintf(stderr, "\n%s: writing %s failed :%s\n",
progname, filecount, strerror(errno));
- return 6;
+ rc = 6;
+ goto out;
}
/* calculate total bytes that need to be written */
if (total_bytes <= 0) {
fprintf(stderr, "\n%s: unable to calculate total bytes\n",
progname);
- return 7;
+ rc = 7;
+ goto out;
}
if (!full && (dir_num != 0))
fprintf(stderr, "\n%s: mkdir %s : %s\n",
progname, tempdir,
strerror(errno));
- return 1;
+ rc = 1;
+ goto out;
}
}
dir_num++;
time_st, inode_st, tempfile);
close(fd);
if (ret < 0) {
- if (ret != -ENOSPC)
- return 1;
+ if (ret != -ENOSPC) {
+ rc = 1;
+ goto out;
+ }
curr_bytes = total_bytes;
break;
}
progname, filecount, strerror(errno));
}
}
- fclose(countfile);
if (verbose) {
verbose++;
verbose--;
}
- return 0;
+out:
+ fclose(countfile);
+
+ return rc;
}
/*
progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/') + 1 : argv[0];
while ((c = getopt_long(argc, argv, "c:hlo:pqrs:t:vw",
- longopts, NULL)) != -1) {
+ long_opts, NULL)) != -1) {
switch (c) {
case 'c':
chunksize = strtoul(optarg, NULL, 0) * ONE_MB;
fprintf(stderr, "Memory allocation failed for chunk_buf\n");
return 4;
}
- sprintf(filecount, "%s/%s.filecount", testdir, progname);
+ snprintf(filecount, sizeof(filecount), "%s/%s.filecount",
+ testdir, progname);
if (writeoption) {
(void)mkdir(testdir, dirmode);