summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-09-18 14:28:43 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2017-09-18 14:28:43 (GMT)
commit0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5 (patch)
treecfe1328d742da3f0572ac8b2f06aa95259862ac5
parentb63afead4411c5832d427ed149683c85cc81a4c9 (diff)
downloadbusybox-refs/heads/master.tar.gz
busybox-refs/heads/master.tar.bz2
regularize format of source file headers, no code changesHEADmaster
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/ar.c2
-rw-r--r--archival/bbunzip.c6
-rw-r--r--archival/bzip2.c2
-rw-r--r--archival/cpio.c9
-rw-r--r--archival/dpkg.c2
-rw-r--r--archival/dpkg_deb.c1
-rw-r--r--archival/gzip.c2
-rw-r--r--archival/lzop.c2
-rw-r--r--archival/tar.c2
-rw-r--r--console-tools/dumpkmap.c1
-rw-r--r--console-tools/reset.c4
-rw-r--r--coreutils/printf.c1
-rw-r--r--coreutils/shuf.c4
-rw-r--r--editors/awk.c1
-rw-r--r--editors/cmp.c11
-rw-r--r--editors/diff.c6
-rw-r--r--editors/patch.c1
-rw-r--r--editors/sed.c7
-rw-r--r--editors/vi.c2
-rw-r--r--findutils/find.c3
-rw-r--r--findutils/grep.c1
-rw-r--r--init/bootchartd.c9
-rw-r--r--init/halt.c1
-rw-r--r--init/init.c1
-rw-r--r--libbb/u_signal_names.c1
-rw-r--r--loginutils/addgroup.c1
-rw-r--r--miscutils/beep.c1
-rw-r--r--miscutils/less.c2
-rw-r--r--miscutils/nandwrite.c1
-rw-r--r--miscutils/raidautorun.c1
-rw-r--r--miscutils/rfkill.c13
-rw-r--r--miscutils/setserial.c1
-rw-r--r--miscutils/ubi_tools.c1
-rw-r--r--networking/hostname.c1
-rw-r--r--networking/ifupdown.c1
-rw-r--r--networking/nameif.c1
-rw-r--r--networking/nbd-client.c16
-rw-r--r--networking/ping.c43
-rw-r--r--networking/udhcp/d6_dhcpc.c1
-rw-r--r--networking/vconfig.c5
-rw-r--r--networking/wget.c1
-rw-r--r--networking/whois.c1
-rw-r--r--procps/iostat.c1
-rw-r--r--procps/lsof.c1
-rw-r--r--procps/mpstat.c11
-rw-r--r--procps/nmeter.c1
-rw-r--r--procps/pmap.c2
-rw-r--r--procps/pwdx.c1
-rw-r--r--procps/smemcap.c9
-rw-r--r--procps/watch.c7
-rw-r--r--runit/svlogd.c1
-rw-r--r--shell/cttyhack.c12
-rw-r--r--util-linux/fallocate.c1
-rw-r--r--util-linux/fsfreeze.c1
-rw-r--r--util-linux/fstrim.c1
-rw-r--r--util-linux/mdev.c1
-rw-r--r--util-linux/mesg.c1
-rw-r--r--util-linux/nsenter.c1
-rw-r--r--util-linux/rdev.c1
-rw-r--r--util-linux/taskset.c2
-rw-r--r--util-linux/volume_id/bcache.c5
-rw-r--r--util-linux/volume_id/btrfs.c5
-rw-r--r--util-linux/volume_id/cramfs.c5
-rw-r--r--util-linux/volume_id/exfat.c5
-rw-r--r--util-linux/volume_id/ext.c5
-rw-r--r--util-linux/volume_id/f2fs.c5
-rw-r--r--util-linux/volume_id/fat.c5
-rw-r--r--util-linux/volume_id/hfs.c5
-rw-r--r--util-linux/volume_id/iso9660.c5
-rw-r--r--util-linux/volume_id/jfs.c5
-rw-r--r--util-linux/volume_id/linux_raid.c5
-rw-r--r--util-linux/volume_id/linux_swap.c5
-rw-r--r--util-linux/volume_id/luks.c5
-rw-r--r--util-linux/volume_id/nilfs.c5
-rw-r--r--util-linux/volume_id/ntfs.c5
-rw-r--r--util-linux/volume_id/ocfs2.c5
-rw-r--r--util-linux/volume_id/reiserfs.c5
-rw-r--r--util-linux/volume_id/romfs.c5
-rw-r--r--util-linux/volume_id/squashfs.c5
-rw-r--r--util-linux/volume_id/sysv.c5
-rw-r--r--util-linux/volume_id/ubifs.c5
-rw-r--r--util-linux/volume_id/udf.c5
-rw-r--r--util-linux/volume_id/unused_highpoint.c5
-rw-r--r--util-linux/volume_id/unused_hpfs.c5
-rw-r--r--util-linux/volume_id/unused_isw_raid.c5
-rw-r--r--util-linux/volume_id/unused_lsi_raid.c5
-rw-r--r--util-linux/volume_id/unused_lvm.c5
-rw-r--r--util-linux/volume_id/unused_mac.c5
-rw-r--r--util-linux/volume_id/unused_msdos.c5
-rw-r--r--util-linux/volume_id/unused_nvidia_raid.c5
-rw-r--r--util-linux/volume_id/unused_promise_raid.c5
-rw-r--r--util-linux/volume_id/unused_silicon_raid.c5
-rw-r--r--util-linux/volume_id/unused_ufs.c5
-rw-r--r--util-linux/volume_id/unused_via_raid.c5
-rw-r--r--util-linux/volume_id/xfs.c5
-rw-r--r--util-linux/wall.c1
96 files changed, 158 insertions, 246 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 027cd6b..f4edeb0 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -16,7 +16,6 @@
* between different systems
* http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
*/
-
//config:config AR
//config: bool "ar (9.5 kb)"
//config: default n # needs to be improved to be able to replace binutils ar
@@ -46,6 +45,7 @@
//config: This enables archive creation (-c and -r) with busybox ar.
//applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_AR) += ar.o
//usage:#define ar_trivial_usage
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 20ab893..944b397 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -4,9 +4,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-#include "bb_archive.h"
-
//kbuild:lib-$(CONFIG_ZCAT) += bbunzip.o
//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o
//kbuild:lib-$(CONFIG_BZCAT) += bbunzip.o
@@ -21,6 +18,9 @@
/* gzip_main() too: */
//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
+#include "libbb.h"
+#include "bb_archive.h"
+
/* Note: must be kept in sync with archival/lzop.c */
enum {
OPT_STDOUT = 1 << 0,
diff --git a/archival/bzip2.c b/archival/bzip2.c
index d578eb7..d6fd929 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -6,7 +6,6 @@
* See README and LICENSE files in bz/ directory for more information
* about bzip2 library code.
*/
-
//config:config BZIP2
//config: bool "bzip2 (18 kb)"
//config: default y
@@ -30,6 +29,7 @@
//config: enabled.
//applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
//usage:#define bzip2_trivial_usage
diff --git a/archival/cpio.c b/archival/cpio.c
index f2165be..1d6cbd1 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -10,10 +10,6 @@
* Doesn't check CRC's
* Only supports new ASCII and CRC formats
*/
-#include "libbb.h"
-#include "common_bufsiz.h"
-#include "bb_archive.h"
-
//config:config CPIO
//config: bool "cpio (14 kb)"
//config: default y
@@ -44,6 +40,7 @@
//config: Passthrough mode. Rarely used.
//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_CPIO) += cpio.o
//usage:#define cpio_trivial_usage
@@ -142,6 +139,10 @@
-u, --unconditional Replace all files unconditionally
*/
+#include "libbb.h"
+#include "common_bufsiz.h"
+#include "bb_archive.h"
+
enum {
OPT_EXTRACT = (1 << 0),
OPT_TEST = (1 << 1),
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 852e0ca..58bc4db 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -25,7 +25,6 @@
* bugs that need to be fixed
* - (unknown, please let me know when you find any)
*/
-
//config:config DPKG
//config: bool "dpkg (44 kb)"
//config: default y
@@ -38,6 +37,7 @@
//config: you should use the official dpkg if possible.
//applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_DPKG) += dpkg.o
//usage:#define dpkg_trivial_usage
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index f6bf9eb..dc4738d 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -4,7 +4,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config DPKG_DEB
//config: bool "dpkg_deb"
//config: default y
diff --git a/archival/gzip.c b/archival/gzip.c
index 9c53895..ac66330 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -36,7 +36,6 @@ a: 85.1% -- replaced with a.gz
gzip: bogus: No such file or directory
aa: 85.1% -- replaced with aa.gz
*/
-
//config:config GZIP
//config: bool "gzip (19 kb)"
//config: default y
@@ -81,6 +80,7 @@ aa: 85.1% -- replaced with aa.gz
//config: enabled.
//applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_GZIP) += gzip.o
//usage:#define gzip_trivial_usage
diff --git a/archival/lzop.c b/archival/lzop.c
index 1bf954f..92411c2 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -24,7 +24,6 @@
"Minimalized" for busybox by Alain Knaff
*/
-
//config:config LZOP
//config: bool "lzop (13 kb)"
//config: default y
@@ -56,6 +55,7 @@
// APPLET_ODDNAME:name main location suid_type help
//applet:IF_UNLZOP( APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop))
//applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat))
+
//kbuild:lib-$(CONFIG_LZOP) += lzop.o
//kbuild:lib-$(CONFIG_UNLZOP) += lzop.o
//kbuild:lib-$(CONFIG_LZOPCAT) += lzop.o
diff --git a/archival/tar.c b/archival/tar.c
index 6cf3508..b6d5129 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -22,7 +22,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config TAR
//config: bool "tar (40 kb)"
//config: default y
@@ -113,6 +112,7 @@
//config: when extracting files from tar archives.
//applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_TAR) += tar.o
#include <fnmatch.h>
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index b803e57..f1c9287 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -5,7 +5,6 @@
* Copyright (C) Arne Bernin <arne@matrix.loopback.org>
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
*/
//config:config DUMPKMAP
//config: bool "dumpkmap (1.3 kb)"
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 471ef91..614806b 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -7,8 +7,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-/* "Standard" version of this tool is in ncurses package */
-
//config:config RESET
//config: bool "reset (275 bytes)"
//config: default y
@@ -25,6 +23,8 @@
//usage:#define reset_full_usage "\n\n"
//usage: "Reset the screen"
+/* "Standard" version of this tool is in ncurses package */
+
#include "libbb.h"
#define ESC "\033"
diff --git a/coreutils/printf.c b/coreutils/printf.c
index d1ff183..353cfc6 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -48,7 +48,6 @@
//applet:IF_PRINTF(APPLET_NOFORK(printf, printf, BB_DIR_USR_BIN, BB_SUID_DROP, printf))
//kbuild:lib-$(CONFIG_PRINTF) += printf.o
-
//kbuild:lib-$(CONFIG_ASH_PRINTF) += printf.o
//kbuild:lib-$(CONFIG_HUSH_PRINTF) += printf.o
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index d0caaa2..fdbd3e9 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -6,16 +6,16 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config SHUF
//config: bool "shuf (5.4 kb)"
//config: default y
//config: help
//config: Generate random permutations
-//kbuild:lib-$(CONFIG_SHUF) += shuf.o
//applet:IF_SHUF(APPLET_NOEXEC(shuf, shuf, BB_DIR_USR_BIN, BB_SUID_DROP, shuf))
+//kbuild:lib-$(CONFIG_SHUF) += shuf.o
+
//usage:#define shuf_trivial_usage
//usage: "[-e|-i L-H] [-n NUM] [-o FILE] [-z] [FILE|ARG...]"
//usage:#define shuf_full_usage "\n\n"
diff --git a/editors/awk.c b/editors/awk.c
index 2005329..d40c781 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config AWK
//config: bool "awk (22 kb)"
//config: default y
diff --git a/editors/cmp.c b/editors/cmp.c
index ec86c0c..2a410fd 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -6,10 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
-/* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
-
//config:config CMP
//config: bool "cmp (5.4 kb)"
//config: default y
@@ -17,10 +13,10 @@
//config: cmp is used to compare two files and returns the result
//config: to standard output.
-//kbuild:lib-$(CONFIG_CMP) += cmp.o
-
//applet:IF_CMP(APPLET(cmp, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_CMP) += cmp.o
+
//usage:#define cmp_trivial_usage
//usage: "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
//usage:#define cmp_full_usage "\n\n"
@@ -29,6 +25,9 @@
//usage: "\n for all differing bytes"
//usage: "\n -s Quiet"
+/* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
+
#include "libbb.h"
static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
diff --git a/editors/diff.c b/editors/diff.c
index 2f25457..1462a9b 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -12,7 +12,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
/*
* The following code uses an algorithm due to Harold Stone,
* which finds a pair of longest identical subsequences in
@@ -75,7 +74,6 @@
* 3*(number of k-candidates installed), typically about
* 6n words for files of length n.
*/
-
//config:config DIFF
//config: bool "diff (13 kb)"
//config: default y
@@ -97,10 +95,10 @@
//config: This option enables support for directory and subdirectory
//config: comparison.
-//kbuild:lib-$(CONFIG_DIFF) += diff.o
-
//applet:IF_DIFF(APPLET(diff, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_DIFF) += diff.o
+
//usage:#define diff_trivial_usage
//usage: "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
//usage:#define diff_full_usage "\n\n"
diff --git a/editors/patch.c b/editors/patch.c
index 81316fa..a51b7a5 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -21,7 +21,6 @@
* -F fuzz (number, default 2)
* [file] which file to patch
*/
-
//config:config PATCH
//config: bool "patch (9.1 kb)"
//config: default y
diff --git a/editors/sed.c b/editors/sed.c
index 7ed9937..9d800c2 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -12,7 +12,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
/* Code overview.
*
* Files are laid out to avoid unnecessary function declarations. So for
@@ -29,7 +28,6 @@
*
* sed_main() is where external code calls into this, with a command line.
*/
-
/* Supported features and commands in this version of sed:
*
* - comments ('#')
@@ -55,7 +53,6 @@
* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html
* http://sed.sourceforge.net/sedfaq3.html
*/
-
//config:config SED
//config: bool "sed (12 kb)"
//config: default y
@@ -63,10 +60,10 @@
//config: sed is used to perform text transformations on a file
//config: or input from a pipeline.
-//kbuild:lib-$(CONFIG_SED) += sed.o
-
//applet:IF_SED(APPLET(sed, BB_DIR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_SED) += sed.o
+
//usage:#define sed_trivial_usage
//usage: "[-i[SFX]] [-nrE] [-f FILE]... [-e CMD]... [FILE]...\n"
//usage: "or: sed [-i[SFX]] [-nrE] CMD [FILE]..."
diff --git a/editors/vi.c b/editors/vi.c
index c010f79..60c73c0 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -5,7 +5,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
/*
* Things To Do:
* EXINIT
@@ -19,7 +18,6 @@
* ":r !cmd" and "!cmd" to filter text through an external command
* An "ex" line oriented mode- maybe using "cmdedit"
*/
-
//config:config VI
//config: bool "vi (22 kb)"
//config: default y
diff --git a/findutils/find.c b/findutils/find.c
index 5857a3f..d9a42b3 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -9,7 +9,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
/* findutils-4.1.20:
*
* # find file.txt -exec 'echo {}' '{} {}' ';'
@@ -44,7 +43,6 @@
* # find t z t z '(' -name '*t*' -o -name '*z*' ')' -o -print
* (no output)
*/
-
/* Testing script
* ./busybox find "$@" | tee /tmp/bb_find
* echo ==================
@@ -52,7 +50,6 @@
* echo ==================
* diff -u /tmp/std_find /tmp/bb_find && echo Identical
*/
-
//config:config FIND
//config: bool "find (14 kb)"
//config: default y
diff --git a/findutils/grep.c b/findutils/grep.c
index 7c5f73d..f72175a 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -17,7 +17,6 @@
*
* (C) 2006 Jac Goudsmit added -o option
*/
-
//config:config GREP
//config: bool "grep (8.5 kb)"
//config: default y
diff --git a/init/bootchartd.c b/init/bootchartd.c
index b5dd174..373cde2 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -2,11 +2,6 @@
/*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
-//applet:IF_BOOTCHARTD(APPLET(bootchartd, BB_DIR_SBIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_BOOTCHARTD) += bootchartd.o
-
//config:config BOOTCHARTD
//config: bool "bootchartd (10 kb)"
//config: default y
@@ -46,6 +41,10 @@
//config: Enable reading and parsing of $PWD/bootchartd.conf
//config: and /etc/bootchartd.conf files.
+//applet:IF_BOOTCHARTD(APPLET(bootchartd, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_BOOTCHARTD) += bootchartd.o
+
#include "libbb.h"
#include "common_bufsiz.h"
/* After libbb.h, since it needs sys/types.h on some systems */
diff --git a/init/halt.c b/init/halt.c
index 632c6cc..c6c857f 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config HALT
//config: bool "halt (3.7 kb)"
//config: default y
diff --git a/init/init.c b/init/init.c
index ab137a9..64e5c3e 100644
--- a/init/init.c
+++ b/init/init.c
@@ -8,7 +8,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config INIT
//config: bool "init (9.3 kb)"
//config: default y
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index b82a706..b3038e3 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config FEATURE_RTMINMAX
//config: bool "Support RTMIN[+n] and RTMAX[-n] signal names"
//config: default y
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index adef232..ec11b30 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -7,7 +7,6 @@
* Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
*/
//config:config ADDGROUP
//config: bool "addgroup (8.2 kb)"
diff --git a/miscutils/beep.c b/miscutils/beep.c
index b9b62f7..0c8a822 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -5,7 +5,6 @@
* Copyright (C) 2009 Bernhard Reutner-Fischer
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
*/
//config:config BEEP
//config: bool "beep (3 kb)"
diff --git a/miscutils/less.c b/miscutils/less.c
index c6c158a..82092f6 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
/*
* TODO:
* - Add more regular expression support - search modifiers, certain matches, etc.
@@ -20,7 +19,6 @@
* - the inp file pointer is used so that keyboard input works after
* redirected input has been read from stdin
*/
-
//config:config LESS
//config: bool "less (15 kb)"
//config: default y
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 80a0058..72f028e 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -7,7 +7,6 @@
*
* TODO: add support for large (>4GB) MTD devices
*/
-
//config:config NANDWRITE
//config: bool "nandwrite (5.9 kb)"
//config: default y
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index caf6e08..d315c27 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -5,7 +5,6 @@
* Copyright (C) 2006 Bernhard Reutner-Fischer
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
*/
//config:config RAIDAUTORUN
//config: bool "raidautorun (1.4 kb)"
diff --git a/miscutils/rfkill.c b/miscutils/rfkill.c
index 5469284..ae38c18 100644
--- a/miscutils/rfkill.c
+++ b/miscutils/rfkill.c
@@ -1,12 +1,11 @@
/* vi: set sw=4 ts=4: */
/*
-* rfkill implementation for busybox
-*
-* Copyright (C) 2010 Malek Degachi <malek-degachi@laposte.net>
-*
-* Licensed under GPLv2 or later, see file LICENSE in this source tree.
-*/
-
+ * rfkill implementation for busybox
+ *
+ * Copyright (C) 2010 Malek Degachi <malek-degachi@laposte.net>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
//config:config RFKILL
//config: bool "rfkill (5.3 kb)"
//config: default n # doesn't build on Ubuntu 9.04
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index f217c3b..fd88ed1 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -7,7 +7,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config SETSERIAL
//config: bool "setserial (6.6 kb)"
//config: default y
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index d142d11..1ef8fd9 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -2,7 +2,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config UBIATTACH
//config: bool "ubiattach (4.7 kb)"
//config: default y
diff --git a/networking/hostname.c b/networking/hostname.c
index d87f656..8e3238d 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -9,7 +9,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config HOSTNAME
//config: bool "hostname (5.6 kb)"
//config: default y
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index c2cfe82..5521e8a 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -16,7 +16,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config IFUP
//config: bool "ifup (17 kb)"
//config: default y
diff --git a/networking/nameif.c b/networking/nameif.c
index 1f26954..91d5053 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -9,7 +9,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config NAMEIF
//config: bool "nameif (6.6 kb)"
//config: default y
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index cf18572..bedb01a 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -3,20 +3,20 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-#include <netinet/tcp.h>
-#include <linux/fs.h>
-
-//applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
-
-//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
-
//config:config NBDCLIENT
//config: bool "nbd-client (4.6 kb)"
//config: default y
//config: help
//config: Network block device client
+//applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
+
+//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
+
+#include "libbb.h"
+#include <netinet/tcp.h>
+#include <linux/fs.h>
+
#define NBD_SET_SOCK _IO(0xab, 0)
#define NBD_SET_BLKSIZE _IO(0xab, 1)
#define NBD_SET_SIZE _IO(0xab, 2)
diff --git a/networking/ping.c b/networking/ping.c
index 7460e44..774f8f3 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -24,28 +24,6 @@
* This version is an adaptation of ping.c from busybox.
* The code was modified by Bart Visscher <magick@linux-fan.com>
*/
-
-#include <net/if.h>
-#include <netinet/ip_icmp.h>
-#include "libbb.h"
-#include "common_bufsiz.h"
-
-#ifdef __BIONIC__
-/* should be in netinet/ip_icmp.h */
-# define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
-# define ICMP_SOURCE_QUENCH 4 /* Source Quench */
-# define ICMP_REDIRECT 5 /* Redirect (change route) */
-# define ICMP_ECHO 8 /* Echo Request */
-# define ICMP_TIME_EXCEEDED 11 /* Time Exceeded */
-# define ICMP_PARAMETERPROB 12 /* Parameter Problem */
-# define ICMP_TIMESTAMP 13 /* Timestamp Request */
-# define ICMP_TIMESTAMPREPLY 14 /* Timestamp Reply */
-# define ICMP_INFO_REQUEST 15 /* Information Request */
-# define ICMP_INFO_REPLY 16 /* Information Reply */
-# define ICMP_ADDRESS 17 /* Address Mask Request */
-# define ICMP_ADDRESSREPLY 18 /* Address Mask Reply */
-#endif
-
//config:config PING
//config: bool "ping (9.5 kb)"
//config: default y
@@ -136,6 +114,27 @@
//usage: "1 packets transmitted, 1 packets received, 0% packet loss\n"
//usage: "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
+#include <net/if.h>
+#include <netinet/ip_icmp.h>
+#include "libbb.h"
+#include "common_bufsiz.h"
+
+#ifdef __BIONIC__
+/* should be in netinet/ip_icmp.h */
+# define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
+# define ICMP_SOURCE_QUENCH 4 /* Source Quench */
+# define ICMP_REDIRECT 5 /* Redirect (change route) */
+# define ICMP_ECHO 8 /* Echo Request */
+# define ICMP_TIME_EXCEEDED 11 /* Time Exceeded */
+# define ICMP_PARAMETERPROB 12 /* Parameter Problem */
+# define ICMP_TIMESTAMP 13 /* Timestamp Request */
+# define ICMP_TIMESTAMPREPLY 14 /* Timestamp Reply */
+# define ICMP_INFO_REQUEST 15 /* Information Request */
+# define ICMP_INFO_REPLY 16 /* Information Reply */
+# define ICMP_ADDRESS 17 /* Address Mask Request */
+# define ICMP_ADDRESSREPLY 18 /* Address Mask Reply */
+#endif
+
#if ENABLE_PING6
# include <netinet/icmp6.h>
/* I see RENUMBERED constants in bits/in.h - !!?
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 849ca13..714555f 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -8,7 +8,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config UDHCPC6
//config: bool "udhcpc6"
//config: default n # not yet ready
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 62a4838..8548c8c 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -6,9 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
-/* BB_AUDIT SUSv3 N/A */
-
//config:config VCONFIG
//config: bool "vconfig (2.5 kb)"
//config: default y
@@ -34,6 +31,8 @@
#include "libbb.h"
#include <net/if.h>
+/* BB_AUDIT SUSv3 N/A */
+
/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
enum vlan_ioctl_cmds {
ADD_VLAN_CMD,
diff --git a/networking/wget.c b/networking/wget.c
index e1b40d3..d1d8523 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -8,7 +8,6 @@
* Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
* Kuhn's copyrights are licensed GPLv2-or-later. File as a whole remains GPLv2.
*/
-
//config:config WGET
//config: bool "wget (35 kb)"
//config: default y
diff --git a/networking/whois.c b/networking/whois.c
index fd1cdf4..f0ec863 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -9,7 +9,6 @@
* Add ipv6 support
* Add proxy support
*/
-
//config:config WHOIS
//config: bool "whois (6.6 kb)"
//config: default y
diff --git a/procps/iostat.c b/procps/iostat.c
index fbf6855..8fb4594 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config IOSTAT
//config: bool "iostat (7.4 kb)"
//config: default y
diff --git a/procps/lsof.c b/procps/lsof.c
index 8d3a23c..4917cf8 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config LSOF
//config: bool "lsof (3.6 kb)"
//config: default y
diff --git a/procps/mpstat.c b/procps/mpstat.c
index acaff4d..7ead1fa 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -6,18 +6,17 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
-//applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP))
-/* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */
-
-//kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o
-
//config:config MPSTAT
//config: bool "mpstat (10 kb)"
//config: default y
//config: help
//config: Per-processor statistics
+//applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP))
+/* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */
+
+//kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o
+
#include "libbb.h"
#include <sys/utsname.h> /* struct utsname */
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 9463f94..166c8ab 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -5,7 +5,6 @@
*
* Contact me: vda.linux@googlemail.com
*/
-
//config:config NMETER
//config: bool "nmeter (10 kb)"
//config: default y
diff --git a/procps/pmap.c b/procps/pmap.c
index 5c2d1ad..c8fa0d2 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -7,7 +7,6 @@
* Licensed under GPLv2 or later, see the LICENSE file in this source tree
* for details.
*/
-
//config:config PMAP
//config: bool "pmap (6 kb)"
//config: default y
@@ -15,6 +14,7 @@
//config: Display processes' memory mappings.
//applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
+
//kbuild:lib-$(CONFIG_PMAP) += pmap.o
//usage:#define pmap_trivial_usage
diff --git a/procps/pwdx.c b/procps/pwdx.c
index c72cf80..6009e2a 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -7,7 +7,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config PWDX
//config: bool "pwdx (3.5 kb)"
//config: default y
diff --git a/procps/smemcap.c b/procps/smemcap.c
index c15fef1..81f4caf 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -7,11 +7,6 @@
the GNU General Public License version 2 or later, incorporated
herein by reference.
*/
-
-//applet:IF_SMEMCAP(APPLET(smemcap, BB_DIR_USR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
-
//config:config SMEMCAP
//config: bool "smemcap (2.5 kb)"
//config: default y
@@ -19,6 +14,10 @@
//config: smemcap is a tool for capturing process data for smem,
//config: a memory usage statistic tool.
+//applet:IF_SMEMCAP(APPLET(smemcap, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
+
#include "libbb.h"
#include "bb_archive.h"
diff --git a/procps/watch.c b/procps/watch.c
index e58fd1f..420e6d3 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -7,10 +7,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
-/* BB_AUDIT SUSv3 N/A */
-/* BB_AUDIT GNU defects -- only option -n is supported. */
-
//config:config WATCH
//config: bool "watch (4.1 kb)"
//config: default y
@@ -35,6 +31,9 @@
//usage: "Mon Dec 17 10:31:42 GMT 2000\n"
//usage: "Mon Dec 17 10:31:44 GMT 2000"
+/* BB_AUDIT SUSv3 N/A */
+/* BB_AUDIT GNU defects -- only option -n is supported. */
+
#include "libbb.h"
#define ESC "\033"
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 7394833..dfd7e38 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -123,7 +123,6 @@ log message, you can use a pattern like this instead
-*: *: pid *
*/
-
//config:config SVLOGD
//config: bool "svlogd (15 kb)"
//config: default y
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 849fe9e..ec1b6c4 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -4,12 +4,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-
-//applet:IF_CTTYHACK(APPLET_NOEXEC(cttyhack, cttyhack, BB_DIR_BIN, BB_SUID_DROP, cttyhack))
-
-//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
-
//config:config CTTYHACK
//config: bool "cttyhack (2.5 kb)"
//config: default y
@@ -54,6 +48,10 @@
//config:
//config: # getty 115200 $(cttyhack)
+//applet:IF_CTTYHACK(APPLET_NOEXEC(cttyhack, cttyhack, BB_DIR_BIN, BB_SUID_DROP, cttyhack))
+
+//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
+
//usage:#define cttyhack_trivial_usage
//usage: "[PROG ARGS]"
//usage:#define cttyhack_full_usage "\n\n"
@@ -65,6 +63,8 @@
//usage: "\nStarting interactive shell from boot shell script:"
//usage: "\n setsid cttyhack sh"
+#include "libbb.h"
+
#if !defined(__linux__) && !defined(TIOCGSERIAL) && !ENABLE_WERROR
# warning cttyhack will not be able to detect a controlling tty on this system
#endif
diff --git a/util-linux/fallocate.c b/util-linux/fallocate.c
index 1a02a32..8542586 100644
--- a/util-linux/fallocate.c
+++ b/util-linux/fallocate.c
@@ -4,7 +4,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config FALLOCATE
//config: bool "fallocate (5 kb)"
//config: default y
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
index 2e22573..c485810 100644
--- a/util-linux/fsfreeze.c
+++ b/util-linux/fsfreeze.c
@@ -4,7 +4,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config FSFREEZE
//config: bool "fsfreeze (3.6 kb)"
//config: default y
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 4acfa56..205d1e4 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -7,7 +7,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config FSTRIM
//config: bool "fstrim (5.5 kb)"
//config: default y
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 8acc4d2..4b4eeaf 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -7,7 +7,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
//config:config MDEV
//config: bool "mdev (16 kb)"
//config: default y
diff --git a/util-linux/mesg.c b/util-linux/mesg.c
index 91c0531..35c4ec1 100644
--- a/util-linux/mesg.c
+++ b/util-linux/mesg.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config MESG
//config: bool "mesg (1.2 kb)"
//config: default y
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index d91b0b5..c6933c8 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -6,7 +6,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config NSENTER
//config: bool "nsenter (8.6 kb)"
//config: default y
diff --git a/util-linux/rdev.c b/util-linux/rdev.c
index 7eb7413..97279ce 100644
--- a/util-linux/rdev.c
+++ b/util-linux/rdev.c
@@ -6,7 +6,6 @@
* Grant Erickson <gerickson@nuovations.com>
*
* Licensed under GPLv2, see file LICENSE in this source tree.
- *
*/
//config:config RDEV
//config: bool "rdev (1.4 kb)"
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index 401a1bc..67df1cb 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -5,7 +5,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config TASKSET
//config: bool "taskset (4.1 kb)"
//config: default y
@@ -23,6 +22,7 @@
//config: in this case. Otherwise, it is limited to sizeof(long).
//applet:IF_TASKSET(APPLET_NOEXEC(taskset, taskset, BB_DIR_USR_BIN, BB_SUID_DROP, taskset))
+
//kbuild:lib-$(CONFIG_TASKSET) += taskset.o
//usage:#define taskset_trivial_usage
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index 334a341..085c158 100644
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@@ -7,14 +7,13 @@
* Based on code fragments from bcache-tools by Kent Overstreet:
* http://evilpiepirate.org/git/bcache-tools.git
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o
-
//config:config FEATURE_VOLUMEID_BCACHE
//config: bool "bcache filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o
+
#include "volume_id_internal.h"
#define SB_LABEL_SIZE 32
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index 338a487..a3ddf97 100644
--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@@ -18,14 +18,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
-
//config:config FEATURE_VOLUMEID_BTRFS
//config: bool "btrfs filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
+
#include "volume_id_internal.h"
#define BTRFS_UUID_SIZE 16
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index c63223e..3468a50 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
-
//config:config FEATURE_VOLUMEID_CRAMFS
//config: bool "cramfs filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
+
#include "volume_id_internal.h"
struct cramfs_super {
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index 14bf9d6..952b027 100644
--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@@ -17,9 +17,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
-
//config:config FEATURE_VOLUMEID_EXFAT
//config: bool "exFAT filesystem"
//config: default y
@@ -29,6 +26,8 @@
//config: for flash drives. It has many features from NTFS, but with less
//config: overhead. exFAT is used on most SDXC cards for consumer electronics.
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
+
#include "volume_id_internal.h"
#define EXFAT_SB_OFFSET 0
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index 473b322..f17fadd 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
-
//config:config FEATURE_VOLUMEID_EXT
//config: bool "Ext filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
+
#include "volume_id_internal.h"
#include "bb_e2fs_defs.h"
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
index 3027f17..e6100ae 100644
--- a/util-linux/volume_id/f2fs.c
+++ b/util-linux/volume_id/f2fs.c
@@ -5,9 +5,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o
-
//config:config FEATURE_VOLUMEID_F2FS
//config: bool "f2fs filesystem"
//config: default y
@@ -18,6 +15,8 @@
//config: known issues of the older log structured file systems, such as high
//config: cleaning overhead.
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o
+
#include "volume_id_internal.h"
#define F2FS_MAGIC 0xF2F52010 // F2FS Magic Number
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index bc3433d..b24ed09 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
-
//config:config FEATURE_VOLUMEID_FAT
//config: bool "fat filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
+
#include "volume_id_internal.h"
/* linux/msdos_fs.h says: */
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 78dae07..05d16db 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
-
//config:config FEATURE_VOLUMEID_HFS
//config: bool "hfs filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
+
#include "volume_id_internal.h"
struct hfs_finder_info{
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 23072f8..c771b01 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
-
//config:config FEATURE_VOLUMEID_ISO9660
//config: bool "iso9660 filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
+
#include "volume_id_internal.h"
#define ISO_SUPERBLOCK_OFFSET 0x8000
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index 543d90f..5e523e2 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
-
//config:config FEATURE_VOLUMEID_JFS
//config: bool "jfs filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
+
#include "volume_id_internal.h"
struct jfs_super_block {
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index 0db6e86..db6209a 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
-
//config:config FEATURE_VOLUMEID_LINUXRAID
//config: bool "linuxraid"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
+
#include "volume_id_internal.h"
struct mdp_super_block {
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index a35769d..78b339c 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
-
//config:config FEATURE_VOLUMEID_LINUXSWAP
//config: bool "linux swap filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
+
#include "volume_id_internal.h"
struct swap_header_v1_2 {
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 4b80b7a..8e634d4 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
-
//config:config FEATURE_VOLUMEID_LUKS
//config: bool "luks filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
+
#include "volume_id_internal.h"
#define LUKS_MAGIC_L 6
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index 9d6c57f..7a8b798 100644
--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@@ -18,9 +18,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
-
//config:config FEATURE_VOLUMEID_NILFS
//config: bool "nilfs filesystem"
//config: default y
@@ -37,6 +34,8 @@
//config: filesystem for Linux desktop environment, or as a basis of advanced
//config: storage appliances.
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
+
#include "volume_id_internal.h"
#define NILFS_UUID_SIZE 16
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index bf85f7e..22dd77f 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
-
//config:config FEATURE_VOLUMEID_NTFS
//config: bool "ntfs filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
+
#include "volume_id_internal.h"
struct ntfs_super_block {
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index 2dedac9..235968b 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
-
//config:config FEATURE_VOLUMEID_OCFS2
//config: bool "ocfs2 filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
+
#include "volume_id_internal.h"
/* All these values are taken from ocfs2-tools's ocfs2_fs.h */
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 369d4d9..d9fd894 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -18,14 +18,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
-
//config:config FEATURE_VOLUMEID_REISERFS
//config: bool "Reiser filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
+
#include "volume_id_internal.h"
struct reiserfs_super_block {
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 95a65f9..bd74fda 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
-
//config:config FEATURE_VOLUMEID_ROMFS
//config: bool "romfs filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
+
#include "volume_id_internal.h"
struct romfs_super {
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index e3ffce3..4b65afd 100644
--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@@ -5,9 +5,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
-
//config:config FEATURE_VOLUMEID_SQUASHFS
//config: bool "SquashFS filesystem"
//config: default y
@@ -18,6 +15,8 @@
//config: device/memory systems (e.g. embedded systems) where low overhead is
//config: needed.
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
+
#include "volume_id_internal.h"
struct squashfs_superblock {
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index cd4cd90..be41f80 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
-
//config:config FEATURE_VOLUMEID_SYSV
//config: bool "sysv filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
+
#include "volume_id_internal.h"
#define SYSV_NICINOD 100
diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c
index 7512b84..aee53f9 100644
--- a/util-linux/volume_id/ubifs.c
+++ b/util-linux/volume_id/ubifs.c
@@ -5,9 +5,6 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o
-
//config:config FEATURE_VOLUMEID_UBIFS
//config: bool "UBIFS filesystem"
//config: default y
@@ -16,6 +13,8 @@
//config: UBIFS (Unsorted Block Image File System) is a file
//config: system for use with raw flash memory media.
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o
+
#include "volume_id_internal.h"
#define UBIFS_NODE_MAGIC 0x06101831
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index fa5dcce..0df4a86 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
-
//config:config FEATURE_VOLUMEID_UDF
//config: bool "udf filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
+
#include "volume_id_internal.h"
struct volume_descriptor {
diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c
index 4afa6d9..1d5ceb7 100644
--- a/util-linux/volume_id/unused_highpoint.c
+++ b/util-linux/volume_id/unused_highpoint.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
-
//config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
//config:### bool "highpoint raid"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
+
#include "volume_id_internal.h"
struct hpt37x_meta {
diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c
index 3e16ded..26fefd4 100644
--- a/util-linux/volume_id/unused_hpfs.c
+++ b/util-linux/volume_id/unused_hpfs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
-
//config:### config FEATURE_VOLUMEID_HPFS
//config:### bool "hpfs filesystem"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
+
#include "volume_id_internal.h"
struct hpfs_super {
diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c
index fba99be..f7b3eec 100644
--- a/util-linux/volume_id/unused_isw_raid.c
+++ b/util-linux/volume_id/unused_isw_raid.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
-
//config:### config FEATURE_VOLUMEID_ISWRAID
//config:### bool "intel raid"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
+
#include "volume_id_internal.h"
struct isw_meta {
diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c
index 9dd2b40..12dabea 100644
--- a/util-linux/volume_id/unused_lsi_raid.c
+++ b/util-linux/volume_id/unused_lsi_raid.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
-
//config:### config FEATURE_VOLUMEID_LSIRAID
//config:### bool "lsi raid"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
+
#include "volume_id_internal.h"
struct lsi_meta {
diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c
index 5ad6d58..649306c 100644
--- a/util-linux/volume_id/unused_lvm.c
+++ b/util-linux/volume_id/unused_lvm.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
-
//config:### config FEATURE_VOLUMEID_LVM
//config:### bool "lvm"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
+
#include "volume_id_internal.h"
struct lvm1_super_block {
diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c
index 997d330..a0d253e 100644
--- a/util-linux/volume_id/unused_mac.c
+++ b/util-linux/volume_id/unused_mac.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
-
//config:### config FEATURE_VOLUMEID_MAC
//config:### bool "mac filesystem"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
+
#include "volume_id_internal.h"
struct mac_driver_desc {
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
index f84c0f0..baa14c5 100644
--- a/util-linux/volume_id/unused_msdos.c
+++ b/util-linux/volume_id/unused_msdos.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
-
//config:### config FEATURE_VOLUMEID_MSDOS
//config:### bool "msdos filesystem"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
+
#include "volume_id_internal.h"
struct msdos_partition_entry {
diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c
index dfb54fa..e8217b4 100644
--- a/util-linux/volume_id/unused_nvidia_raid.c
+++ b/util-linux/volume_id/unused_nvidia_raid.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
-
//config:### config FEATURE_VOLUMEID_NVIDIARAID
//config:### bool "nvidia raid"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
+
#include "volume_id_internal.h"
struct nvidia_meta {
diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c
index d594de3..c4a6f50 100644
--- a/util-linux/volume_id/unused_promise_raid.c
+++ b/util-linux/volume_id/unused_promise_raid.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
-
//config:### config FEATURE_VOLUMEID_PROMISERAID
//config:### bool "promise raid"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
+
#include "volume_id_internal.h"
struct promise_meta {
diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c
index 886721b..ea96dc9 100644
--- a/util-linux/volume_id/unused_silicon_raid.c
+++ b/util-linux/volume_id/unused_silicon_raid.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
-
//config:### config FEATURE_VOLUMEID_SILICONRAID
//config:### bool "silicon raid"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
+
#include "volume_id_internal.h"
struct silicon_meta {
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c
index 78ef26a..c36793a 100644
--- a/util-linux/volume_id/unused_ufs.c
+++ b/util-linux/volume_id/unused_ufs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
-
//config:### config FEATURE_VOLUMEID_UFS
//config:### bool "ufs filesystem"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
+
#include "volume_id_internal.h"
struct ufs_super_block {
diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c
index f826266..c77c839 100644
--- a/util-linux/volume_id/unused_via_raid.c
+++ b/util-linux/volume_id/unused_via_raid.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
-
//config:### config FEATURE_VOLUMEID_VIARAID
//config:### bool "via raid"
//config:### default y
//config:### depends on VOLUMEID
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
+
#include "volume_id_internal.h"
struct via_meta {
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 656d5bf..f98b66a 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -17,14 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
-
//config:config FEATURE_VOLUMEID_XFS
//config: bool "xfs filesystem"
//config: default y
//config: depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
+
#include "volume_id_internal.h"
struct xfs_super_block {
diff --git a/util-linux/wall.c b/util-linux/wall.c
index e214d8c..9397365 100644
--- a/util-linux/wall.c
+++ b/util-linux/wall.c
@@ -5,7 +5,6 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
//config:config WALL
//config: bool "wall (2.5 kb)"
//config: default y