find:: get rid of nested function (it's a gcc-ism)

[oweals/busybox.git] / miscutils / readahead.c

diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index 7b375cffff7c31f7df5b7b8f52f7f674420b77c5..e22aaa46887bb0beb67d0a805111ec69ba7dfb59 100644 (file)
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -7,24 +7,38 @@
  *
  * Copyright (C) 2006  Michael Opdenacker <michael@free-electrons.com>
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//usage:#define readahead_trivial_usage
+//usage:       "[FILE]..."
+//usage:#define readahead_full_usage "\n\n"
+//usage:       "Preload FILEs to RAM"
+
 #include "libbb.h"
 
 int readahead_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int readahead_main(int argc, char **argv)
+int readahead_main(int argc UNUSED_PARAM, char **argv)
 {
        int retval = EXIT_SUCCESS;
 
-       if (argc == 1) bb_show_usage();
+       if (!argv[1]) {
+               bb_show_usage();
+       }
 
        while (*++argv) {
                int fd = open_or_warn(*argv, O_RDONLY);
                if (fd >= 0) {
-                       int r = readahead(fd, 0, fdlength(fd));
+                       off_t len;
+                       int r;
+
+                       /* fdlength was reported to be unreliable - use seek */
+                       len = xlseek(fd, 0, SEEK_END);
+                       xlseek(fd, 0, SEEK_SET);
+                       r = readahead(fd, 0, len);
                        close(fd);
-                       if (r >= 0) continue;
+                       if (r >= 0)
+                               continue;
                }
                retval = EXIT_FAILURE;
        }