diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-24 15:38:03 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-24 15:38:03 +0000 |
| commit | d398ecab9d6e42b1091d214df50bf938030d11a2 (patch) | |
| tree | 222947a9a358931ea4f4f33679fd336cb5f36a8f /util-linux | |
| parent | 8023d7df788fbc45217473e6a290d4409881d2cd (diff) | |
| download | busybox-d398ecab9d6e42b1091d214df50bf938030d11a2.tar.gz | |
hunt down improper include <>, make mkswap output 4Gb+ friendly
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/mkswap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index 2dee5ac18..7baa3ecfb 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c @@ -6,7 +6,7 @@ * Licensed under GPL version 2, see file LICENSE in this tarball for details. */ -#include <busybox.h> +#include "busybox.h" int mkswap_main(int argc, char *argv[]) { @@ -16,18 +16,19 @@ int mkswap_main(int argc, char *argv[]) // No options supported. - if (argc!=2) bb_show_usage(); + if (argc != 2) bb_show_usage(); // Figure out how big the device is and announce our intentions. - fd = xopen(argv[1],O_RDWR); + fd = xopen(argv[1], O_RDWR); len = fdlength(fd); pagesize = getpagesize(); - printf("Setting up swapspace version 1, size = %ld bytes\n", (long)(len-pagesize)); + printf("Setting up swapspace version 1, size = %"OFF_FMT"d bytes\n", + len - pagesize); // Make a header. - memset(hdr, 0, 129 * sizeof(unsigned int)); + memset(hdr, 0, sizeof(hdr)); hdr[0] = 1; hdr[1] = (len / pagesize) - 1; @@ -35,7 +36,7 @@ int mkswap_main(int argc, char *argv[]) // signature on disk (not in cache) during swapon. xlseek(fd, 1024, SEEK_SET); - xwrite(fd, hdr, 129 * sizeof(unsigned int)); + xwrite(fd, hdr, sizeof(hdr)); xlseek(fd, pagesize-10, SEEK_SET); xwrite(fd, "SWAPSPACE2", 10); fsync(fd); |