Notes on portability, and on when #include <linux/blah> is appropriate.

[oweals/busybox.git] / archival / rpm2cpio.c

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index d0041a83ca67cabda1ca8d93b484c6a8ae6717fe..45a660113ce43832b4e2106d69fa82bb2bd5d249 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -48,7 +48,7 @@ struct rpm_header {
        uint32_t size; /* Size of store (4 bytes) */
 };
 
-void skip_header(int rpm_fd)
+static void skip_header(int rpm_fd)
 {
        struct rpm_header header;
 
@@ -66,14 +66,14 @@ void skip_header(int rpm_fd)
 }
 
 /* No getopt required */
-extern int rpm2cpio_main(int argc, char **argv)
+int rpm2cpio_main(int argc, char **argv)
 {
        struct rpm_lead lead;
        int rpm_fd;
        unsigned char magic[2];
 
        if (argc == 1) {
-               rpm_fd = fileno(stdin);
+               rpm_fd = STDIN_FILENO;
        } else {
                rpm_fd = bb_xopen(argv[1], O_RDONLY);
        }
@@ -89,14 +89,14 @@ extern int rpm2cpio_main(int argc, char **argv)
 
        /* Skip the main header */
        skip_header(rpm_fd);
-       
+
        bb_xread_all(rpm_fd, &magic, 2);
        if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
                bb_error_msg_and_die("Invalid gzip magic");
        }
 
        check_header_gzip(rpm_fd);
-       if (inflate_gunzip(rpm_fd, fileno(stdout)) != 0) {
+       if (inflate_gunzip(rpm_fd, STDOUT_FILENO) != 0) {
                bb_error_msg("Error inflating");
        }