xfsprogs: simplify internal includes

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

diff --git a/io/madvise.c b/io/madvise.c
index f5226781022ef3aa7e9ca6acd23cbfcabd1b28d5..b30d28babd3ad187a8445444e1cad27eaef4036a 100644 (file)
--- a/io/madvise.c
+++ b/io/madvise.c
@@ -1,38 +1,24 @@
 /*
- * Copyright (c) 2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * 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 version 2 of the GNU General Public License as
+ * 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.
+ * 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.
  *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ * 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/libxfs.h>
-#include <xfs/command.h>
-#include <xfs/input.h>
+#include "xfs.h"
+#include "command.h"
+#include "input.h"
 #include <sys/mman.h>
 #include "init.h"
 #include "io.h"
@@ -66,11 +52,11 @@ madvise_f(
        int             argc,
        char            **argv)
 {
-       off64_t         offset;
+       off64_t         offset, llength;
        size_t          length;
        void            *start;
        int             advise = MADV_NORMAL, c;
-       unsigned int    blocksize, sectsize;
+       size_t          blocksize, sectsize;
 
        while ((c = getopt(argc, argv, "drsw")) != EOF) {
                switch (c) {
@@ -103,12 +89,17 @@ madvise_f(
                        return 0;
                }
                optind++;
-               length = cvtnum(blocksize, sectsize, argv[optind]);
-               if (length < 0) {
+               llength = cvtnum(blocksize, sectsize, argv[optind]);
+               if (llength < 0) {
                        printf(_("non-numeric length argument -- %s\n"),
                                argv[optind]);
                        return 0;
-               }
+               } else if (llength > (size_t)llength) {
+                       printf(_("length argument too large -- %lld\n"),
+                               (long long)llength);
+                       return 0;
+               } else
+                       length = (size_t)llength;
        } else {
                return command_usage(&madvise_cmd);
        }
@@ -127,8 +118,8 @@ madvise_f(
 void
 madvise_init(void)
 {
-       madvise_cmd.name = _("madvise");
-       madvise_cmd.altname = _("ma");
+       madvise_cmd.name = "madvise";
+       madvise_cmd.altname = "ma";
        madvise_cmd.cfunc = madvise_f;
        madvise_cmd.argmin = 0;
        madvise_cmd.argmax = -1;