fbset: fix buglet where we were using wrong pointer

readahead: stop using stdio.h
*: style fixes

1 files changed, 4 insertions, 6 deletions

diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index 647eb3121..7b375cfff 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -15,17 +15,15 @@
 int readahead_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int readahead_main(int argc, char **argv)
 {
-        FILE *f;
         int retval = EXIT_SUCCESS;
 
         if (argc == 1) bb_show_usage();
 
         while (*++argv) {
-                if ((f = fopen_or_warn(*argv, "r")) != NULL) {
-                        int r, fd=fileno(f);
-
-                        r = readahead(fd, 0, fdlength(fd));
-                        fclose(f);
+                int fd = open_or_warn(*argv, O_RDONLY);
+                if (fd >= 0) {
+                        int r = readahead(fd, 0, fdlength(fd));
+                        close(fd);
                         if (r >= 0) continue;
                 }
                 retval = EXIT_FAILURE;