X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fwritemany.c;h=72d1ac6a71a7f37da696087ffef52989d46d7ed9;hb=c2d27a0f12688c0d029880919f8b002e557b540c;hp=709f1f2bc55797a637887e6a2daef9700f281108;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/tests/writemany.c b/lustre/tests/writemany.c
index 709f1f2..72d1ac6 100644
--- a/lustre/tests/writemany.c
+++ b/lustre/tests/writemany.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.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -178,6 +176,7 @@ int run_one_child(char *file, int thread, int seconds)
                 maxrand *= 10;
 
         gettimeofday(&start, NULL);
+        cur = start;
 
         while(!rc) {
                 if (usr1_received)
@@ -189,7 +188,8 @@ int run_one_child(char *file, int thread, int seconds)
                                 break;
                 }
                 
-                sprintf(filename, "%s-%d-%ld", file, thread, nfiles);
+		snprintf(filename, sizeof(filename), "%s-%d-%ld",
+			 file, thread, nfiles);
 
                 fd = open(filename, O_RDWR | O_CREAT, 0666);
                 if (fd < 0) {
@@ -233,7 +233,8 @@ int run_one_child(char *file, int thread, int seconds)
                 printf("%s: %7ld files, %4ld MB in %.2fs (%7.2f files/s, "
                        "%5.2f MB/s): rc = %d\n",
                        cmdname, nfiles, nbytes >> 20, diff,
-                       (double)nfiles / diff, (double)nbytes/1024/1024 / diff,
+                       diff == 0 ? (double)0 : (double)nfiles / diff,
+                       diff == 0 ? (double)0 : (double)nbytes/1024/1024 / diff,
                        rc);
 
         return rc;
@@ -247,7 +248,7 @@ int main(int argc, char *argv[])
         char *directory;
         int i = 1, rc = 0;
 
-        sprintf(cmdname, "%s", argv[0]);
+	snprintf(cmdname, sizeof(cmdname), "%s", argv[0]);
 
         while((i < argc) && (argv[i][0] == '-')) {
                 switch (argv[i][1]) {
@@ -291,7 +292,7 @@ int main(int argc, char *argv[])
                 }
                 if (rc == 0) {
                         /* children */
-                        sprintf(cmdname, "%s-%d", argv[0], i);
+			snprintf(cmdname, sizeof(cmdname), "%s-%d", argv[0], i);
                         return (run_one_child(directory, i, duration));
                 } else {
                         /* parent */