New upstream version 0.6.5.10

[mirror_spl-debian.git] / cmd / splat.c

diff --git a/cmd/splat.c b/cmd/splat.c
index abeea15e998bfc875fabce52fd5de51917fad8a9..92962393dd0bd9f1c5a177b3f3cd48031789b8d4 100644 (file)
--- a/cmd/splat.c
+++ b/cmd/splat.c
@@ -1,30 +1,28 @@
-/*
- *  This file is part of the SPL: Solaris Porting Layer.
- *
- *  Copyright (c) 2008 Lawrence Livermore National Security, LLC.
- *  Produced at Lawrence Livermore National Laboratory
- *  Written by:
- *          Brian Behlendorf <behlendorf1@llnl.gov>,
- *          Herb Wartens <wartens2@llnl.gov>,
- *          Jim Garlick <garlick@llnl.gov>
+/*****************************************************************************\
+ *  Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
+ *  Copyright (C) 2007 The Regents of the University of California.
+ *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ *  Written by Brian Behlendorf <behlendorf1@llnl.gov>.
  *  UCRL-CODE-235197
  *
- *  This is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This file is part of the SPL, Solaris Porting Layer.
+ *  For details, see <http://zfsonlinux.org/>.
+ *
+ *  The SPL is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at your
+ *  option) any later version.
  *
- *  This is distributed in the hope that it will be useful, but WITHOUT
+ *  The SPL is distributed in the hope that it will be useful, but WITHOUT
  *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  *  for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-
-/* Solaris Porting LAyer Tests (SPLAT) userspace interface */
+ *  with the SPL.  If not, see <http://www.gnu.org/licenses/>.
+ *****************************************************************************
+ *  Solaris Porting LAyer Tests (SPLAT) User Space Interface.
+\*****************************************************************************/
 
 #include <stdlib.h>
 #include <stddef.h>
@@ -318,14 +316,15 @@ static test_t *test_find(char *sub_str, char *test_str)
        ListIterator si, ti;
        subsystem_t *sub;
        test_t *test;
-       int sub_num, test_num;
+       __u32 sub_num, test_num;
 
-       /* No error checking here because it may not be a number, it's
+       /*
+        * No error checking here because it may not be a number, it's
         * perfectly OK for it to be a string.  Since we're just using
         * it for comparison purposes this is all very safe.
         */
-       sub_num = strtol(sub_str, NULL, 0);
-       test_num = strtol(test_str, NULL, 0);
+       sub_num = strtoul(sub_str, NULL, 0);
+       test_num = strtoul(test_str, NULL, 0);
 
         si = list_iterator_create(subsystems);
 
@@ -432,7 +431,8 @@ static int test_run(cmd_args_t *args, test_t *test)
        fflush(stdout);
        free(cmd);
 
-       if (args->args_verbose) {
+       if ((args->args_verbose == 1 && rc) ||
+           (args->args_verbose >= 2)) {
                if ((rc = read(splatctl_fd, splat_buffer,
                               splat_buffer_size - 1)) < 0) {
                        fprintf(stdout, "Error reading results: %d\n", rc);
@@ -834,4 +834,3 @@ out:
        fini();
        return rc;
 }
-