Merge branch 'busybox' into merge

8 files changed, 15 insertions, 8 deletions

diff --git a/util-linux/blkdiscard.c b/util-linux/blkdiscard.c
index 5863f0aab..e4902e5b5 100644
--- a/util-linux/blkdiscard.c
+++ b/util-linux/blkdiscard.c
@@ -8,6 +8,7 @@
 //config:config BLKDISCARD
 //config:       bool "blkdiscard (5.3 kb)"
 //config:       default y
+//config:       select PLATFORM_LINUX
 //config:       help
 //config:       blkdiscard discards sectors on a given device.
 
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 855269c30..c72da8b89 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger
+/*
+ * fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger
  * 5 July 2003 -- modified for Busybox by Erik Andersen
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index c4318b6c4..7275535e6 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* fdisk.c -- Partition table manipulator for Linux.
+/*
+ * fdisk.c -- Partition table manipulator for Linux.
  *
  * Copyright (C) 1992  A. V. Le Blanc (LeBlanc@mcc.ac.uk)
  * Copyright (C) 2001,2002 Vladimir Oleynik <dzo@simtreas.ru> (initial bb port)
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index 1141b7801..1328c1fcd 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -709,6 +709,9 @@ sync_disks(void)
 static void
 xbsd_write_bootstrap(void)
 {
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
         char path[MAXPATHLEN];
         const char *bootdir = BSD_LINUX_BOOTDIR;
         const char *dkbasename;
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index a151b7e56..4431a7e74 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -1,11 +1,10 @@
 /* vi: set sw=4 ts=4: */
 /*
  * getopt.c - Enhanced implementation of BSD getopt(1)
- *   Copyright (c) 1997, 1998, 1999, 2000  Frodo Looijaard <frodol@dds.nl>
+ * Copyright (c) 1997, 1998, 1999, 2000  Frodo Looijaard <frodol@dds.nl>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * Version 1.0-b4: Tue Sep 23 1997. First public release.
  * Version 1.0: Wed Nov 19 1997.
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 71449882d..2eb16bd84 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* mkswap.c - format swap device (Linux v1 only)
+/*
+ * mkswap.c - format swap device (Linux v1 only)
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
  *
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 394ece1dd..8fc33be3c 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -1,8 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  readprofile.c - used to read /proc/profile
+ * readprofile.c - used to read /proc/profile
  *
- *  Copyright (C) 1994,1996 Alessandro Rubini (rubini@ipvvis.unipv.it)
+ * Copyright (C) 1994,1996 Alessandro Rubini (rubini@ipvvis.unipv.it)
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 080b05e45..2d1802b79 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* Copyright 2005 Rob Landley <rob@landley.net>
+/*
+ * Copyright 2005 Rob Landley <rob@landley.net>
  *
  * Switch from rootfs to another filesystem as the root of the mount tree.
  *