mirror of
https://github.com/sheumann/hush.git
synced 2024-12-21 23:29:34 +00:00
hunt down improper include <>, make mkswap output 4Gb+ friendly
This commit is contained in:
parent
8023d7df78
commit
d398ecab9d
@ -12,8 +12,7 @@
|
||||
* here to save a little space.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <libbb.h>
|
||||
#include "libbb.h"
|
||||
|
||||
int fclose_if_not_stdin(FILE *f)
|
||||
{
|
||||
|
@ -7,8 +7,7 @@
|
||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
#include <libbb.h>
|
||||
#include "libbb.h"
|
||||
|
||||
void bb_perror_nomsg(void)
|
||||
{
|
||||
|
@ -7,7 +7,7 @@
|
||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
||||
*/
|
||||
|
||||
#include <libbb.h>
|
||||
#include "libbb.h"
|
||||
|
||||
void bb_warn_ignoring_args(int n)
|
||||
{
|
||||
|
@ -36,7 +36,7 @@
|
||||
echo `echo hello#comment " woot` and more
|
||||
*/
|
||||
|
||||
#include <busybox.h>
|
||||
#include "busybox.h"
|
||||
|
||||
// A single executable, its arguments, and other information we know about it.
|
||||
#define BBSH_FLAG_EXIT 1
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user