emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hunt down improper include <>, make mkswap output 4Gb+ friendly

Browse Source
This commit is contained in:
Denis Vlasenko 2006-11-24 15:38:03 +00:00
parent 8023d7df78
commit d398ecab9d
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libbb/fclose_nonstdin.c
View File

@ -12,8 +12,7 @@
* here to save a little space. * here to save a little space.
*/ */
#include <stdio.h> #include "libbb.h"
#include <libbb.h>
int fclose_if_not_stdin(FILE *f) int fclose_if_not_stdin(FILE *f)
{ {

3
libbb/perror_nomsg.c
View File

@ -7,8 +7,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * 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) void bb_perror_nomsg(void)
{ {

2
libbb/warn_ignoring_args.c
View File

@ -7,7 +7,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * 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) void bb_warn_ignoring_args(int n)
{ {

2
shell/bbsh.c
View File

@ -36,7 +36,7 @@
echo `echo hello#comment " woot` and more 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. // A single executable, its arguments, and other information we know about it.
#define BBSH_FLAG_EXIT 1 #define BBSH_FLAG_EXIT 1

13
util-linux/mkswap.c
View File

@ -6,7 +6,7 @@
* Licensed under GPL version 2, see file LICENSE in this tarball for details. * 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[]) int mkswap_main(int argc, char *argv[])
{ {
@ -16,18 +16,19 @@ int mkswap_main(int argc, char *argv[])
// No options supported. // 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. // 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); len = fdlength(fd);
pagesize = getpagesize(); 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. // Make a header.
memset(hdr, 0, 129 * sizeof(unsigned int)); memset(hdr, 0, sizeof(hdr));
hdr[0] = 1; hdr[0] = 1;
hdr[1] = (len / pagesize) - 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. // signature on disk (not in cache) during swapon.
xlseek(fd, 1024, SEEK_SET); xlseek(fd, 1024, SEEK_SET);
xwrite(fd, hdr, 129 * sizeof(unsigned int)); xwrite(fd, hdr, sizeof(hdr));
xlseek(fd, pagesize-10, SEEK_SET); xlseek(fd, pagesize-10, SEEK_SET);
xwrite(fd, "SWAPSPACE2", 10); xwrite(fd, "SWAPSPACE2", 10);
fsync(fd); fsync(fd);