svn commit: trunk/busybox: libbb shell util-linux
vda at busybox.net
vda at busybox.net
Fri Nov 24 15:38:03 UTC 2006
Author: vda
Date: 2006-11-24 07:38:03 -0800 (Fri, 24 Nov 2006)
New Revision: 16658
Log:
hunt down improper include <>, make mkswap output 4Gb+ friendly
Modified:
trunk/busybox/libbb/fclose_nonstdin.c
trunk/busybox/libbb/perror_nomsg.c
trunk/busybox/libbb/warn_ignoring_args.c
trunk/busybox/shell/bbsh.c
trunk/busybox/util-linux/mkswap.c
Changeset:
Modified: trunk/busybox/libbb/fclose_nonstdin.c
===================================================================
--- trunk/busybox/libbb/fclose_nonstdin.c 2006-11-24 15:33:04 UTC (rev 16657)
+++ trunk/busybox/libbb/fclose_nonstdin.c 2006-11-24 15:38:03 UTC (rev 16658)
@@ -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)
{
Modified: trunk/busybox/libbb/perror_nomsg.c
===================================================================
--- trunk/busybox/libbb/perror_nomsg.c 2006-11-24 15:33:04 UTC (rev 16657)
+++ trunk/busybox/libbb/perror_nomsg.c 2006-11-24 15:38:03 UTC (rev 16658)
@@ -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)
{
Modified: trunk/busybox/libbb/warn_ignoring_args.c
===================================================================
--- trunk/busybox/libbb/warn_ignoring_args.c 2006-11-24 15:33:04 UTC (rev 16657)
+++ trunk/busybox/libbb/warn_ignoring_args.c 2006-11-24 15:38:03 UTC (rev 16658)
@@ -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)
{
Modified: trunk/busybox/shell/bbsh.c
===================================================================
--- trunk/busybox/shell/bbsh.c 2006-11-24 15:33:04 UTC (rev 16657)
+++ trunk/busybox/shell/bbsh.c 2006-11-24 15:38:03 UTC (rev 16658)
@@ -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
Modified: trunk/busybox/util-linux/mkswap.c
===================================================================
--- trunk/busybox/util-linux/mkswap.c 2006-11-24 15:33:04 UTC (rev 16657)
+++ trunk/busybox/util-linux/mkswap.c 2006-11-24 15:38:03 UTC (rev 16658)
@@ -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 @@
// 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 @@
// 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);
More information about the busybox-cvs
mailing list