Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / mkswap.c

diff --git a/mkswap.c b/mkswap.c
index 130d24162cc003b4b753c99df07792433b03066f..fc37368f43d7ae872c5f955b41668353a7339519 100644 (file)
--- a/mkswap.c
+++ b/mkswap.c
@@ -49,13 +49,16 @@
 
 
 static const char mkswap_usage[] =
-       "mkswap [-c] [-v0|-v1] device [block-count]\n\n"
-       "Prepare a disk partition to be used as a swap partition.\n\n"
+       "mkswap [-c] [-v0|-v1] device [block-count]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrepare a disk partition to be used as a swap partition.\n\n"
        "Options:\n" "\t-c\t\tCheck for read-ability.\n"
        "\t-v0\t\tMake version 0 swap [max 128 Megs].\n"
        "\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n"
 
-       "\tblock-count\tNumber of block to use (default is entire partition).\n";
+       "\tblock-count\tNumber of block to use (default is entire partition).\n"
+#endif
+       ;
 
 
 #ifndef _IO
@@ -116,7 +119,7 @@ static void init_signature_page()
        if (pagesize != PAGE_SIZE)
                fprintf(stderr, "Assuming pages of size %d\n", pagesize);
 #endif
-       signature_page = (int *) malloc(pagesize);
+       signature_page = (int *) xmalloc(pagesize);
        memset(signature_page, 0, pagesize);
        p = (struct swap_header_v1 *) signature_page;
 }
@@ -230,9 +233,7 @@ void check_blocks(void)
        int do_seek = 1;
        char *buffer;
 
-       buffer = malloc(pagesize);
-       if (!buffer)
-               die("Out of memory");
+       buffer = xmalloc(pagesize);
        current_page = 0;
        while (current_page < PAGES) {
                if (!check) {
@@ -468,5 +469,5 @@ the -f option to force it.\n", program_name, device_name);
         */
        if (fsync(DEV))
                die("fsync failed");
-       exit(TRUE);
+       return(TRUE);
 }