xfsprogs: Release v6.8.0

[thirdparty/xfsprogs-dev.git] / io / mincore.c

diff --git a/io/mincore.c b/io/mincore.c
index 234e0a106e8bc3c28bdeb57053ca76dcb24880d3..24147ac212ae5c5f167a0bd87642b95e831a68ce 100644 (file)
--- a/io/mincore.c
+++ b/io/mincore.c
@@ -1,36 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2004-2005 Silicon Graphics, Inc.
  * All Rights Reserved.
- *
- * This program 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.
- *
- * This program is distributed in the hope that it would 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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs/xfs.h"
-#include "xfs/command.h"
-#include "xfs/input.h"
+#include "command.h"
+#include "input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"
 
 static cmdinfo_t mincore_cmd;
 
-int
+static int
 mincore_f(
        int             argc,
        char            **argv)
 {
-       off64_t         offset, llength;
+       off_t           offset, llength;
        size_t          length;
        size_t          blocksize, sectsize;
        void            *start;
@@ -47,36 +34,44 @@ mincore_f(
                if (offset < 0) {
                        printf(_("non-numeric offset argument -- %s\n"),
                                argv[1]);
+                       exitcode = 1;
                        return 0;
                }
                llength = cvtnum(blocksize, sectsize, argv[2]);
                if (llength < 0) {
                        printf(_("non-numeric length argument -- %s\n"),
                                argv[2]);
+                       exitcode = 1;
                        return 0;
                } else if (llength > (size_t)llength) {
                        printf(_("length argument too large -- %lld\n"),
                                (long long)llength);
+                       exitcode = 1;
                        return 0;
                } else
                        length = (size_t)llength;
        } else {
+               exitcode = 1;
                return command_usage(&mincore_cmd);
        }
 
        start = check_mapping_range(mapping, offset, length, 1);
-       if (!start)
+       if (!start) {
+               exitcode = 1;
                return 0;
+       }
 
        vec = calloc(length/pagesize, sizeof(unsigned char));
        if (!vec) {
                perror("calloc");
+               exitcode = 1;
                return 0;
        }
 
        if (mincore(start, length, vec) < 0) {
                perror("mincore");
                free(vec);
+               exitcode = 1;
                return 0;
        }