From 823b4e6f260137bcd72a8b96587ef85a9bd7eac7 Mon Sep 17 00:00:00 2001
From: Vladimir Dronnikov <dronnikov@gmail.com>
Date: Sat, 17 Oct 2009 21:38:19 +0200
Subject: mkfs_ext2: new applet by Vladimir
function old new delta
mkfs_ext2_main - 2011 +2011
static.supers - 184 +184
allocate - 118 +118
packed_usage 26692 26791 +99
PUT - 52 +52
has_super - 28 +28
applet_names 2143 2160 +17
applet_main 1264 1272 +8
applet_nameofs 632 636 +4
applet_install_loc 158 159 +1
------------------------------------------------------------------------------
(add/remove: 5/0 grow/shrink: 5/0 up/down: 2522/0) Total: 2522 bytes
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
include/applets.h | 4 ++--
include/usage.h | 67 ++++++++++++++++++++++++++++++-------------------------
2 files changed, 38 insertions(+), 33 deletions(-)
(limited to 'include')
diff --git a/include/applets.h b/include/applets.h
index 9b6b54e63..9ca84623b 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -258,9 +258,9 @@ IF_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_MICROCOM(APPLET(microcom, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_DROP, mkdir))
IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat))
-//IF_MKE2FS(APPLET(mke2fs, _BB_DIR_SBIN, _BB_SUID_DROP))
+IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext2))
IF_MKFIFO(APPLET(mkfifo, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-//IF_MKE2FS(APPLET_ODDNAME(mkfs.ext2, mke2fs, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext2))
+IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext2))
//IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext3))
IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_minix))
IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat))
diff --git a/include/usage.h b/include/usage.h
index 3cb05e090..0215fa5bf 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -2702,37 +2702,6 @@
"/tmp/foo/bar/baz: No such file or directory\n" \
"$ mkdir -p /tmp/foo/bar/baz\n"
-#define mke2fs_trivial_usage \
- "[-c|-l filename] [-b block-size] [-f fragment-size] [-g blocks-per-group] " \
- "[-i bytes-per-inode] [-j] [-J journal-options] [-N number-of-inodes] [-n] " \
- "[-m reserved-blocks-percentage] [-o creator-os] [-O feature[,...]] [-q] " \
- "[r fs-revision-level] [-E extended-options] [-v] [-F] [-L volume-label] " \
- "[-M last-mounted-directory] [-S] [-T filesystem-type] " \
- "device [blocks-count]"
-#define mke2fs_full_usage "\n\n" \
- " -b size Block size in bytes" \
- "\n -c Check for bad blocks before creating" \
- "\n -E opts Set extended options" \
- "\n -f size Fragment size in bytes" \
- "\n -F Force (ignore sanity checks)" \
- "\n -g num Number of blocks in a block group" \
- "\n -i ratio The bytes/inode ratio" \
- "\n -j Create a journal (ext3)" \
- "\n -J opts Set journal options (size/device)" \
- "\n -l file Read bad blocks list from file" \
- "\n -L lbl Set the volume label" \
- "\n -m percent Percent of fs blocks to reserve for admin" \
- "\n -M dir Set last mounted directory" \
- "\n -n Don't actually create anything" \
- "\n -N num Number of inodes to create" \
- "\n -o os Set the 'creator os' field" \
- "\n -O features Dir_index/filetype/has_journal/journal_dev/sparse_super" \
- "\n -q Quiet" \
- "\n -r rev Set filesystem revision" \
- "\n -S Write superblock and group descriptors only" \
- "\n -T fs-type Set usage type (news/largefile/largefile4)" \
- "\n -v Verbose" \
-
#define mkfifo_trivial_usage \
"[OPTIONS] name"
#define mkfifo_full_usage "\n\n" \
@@ -2743,6 +2712,42 @@
"\n -Z Set security context" \
)
+#define mkfs_ext2_trivial_usage \
+ /* "[-c|-l filename] " */ \
+ "[-b BLK_SIZE] " \
+ /* "[-f fragment-size] [-g blocks-per-group] " */ \
+ "[-i BYTES_PER_INODE] " \
+ /* "[-j] [-J journal-options] [-N number-of-inodes] [-n] " */ \
+ "[-m RESERVED_PERCENT] " \
+ /* "[-o creator-os] [-O feature[,...]] [-q] " */ \
+ /* "[r fs-revision-level] [-E extended-options] [-v] [-F] " */ \
+ "[-L LABEL] " \
+ /* "[-M last-mounted-directory] [-S] [-T filesystem-type] " */ \
+ "DEVICE [BLK_COUNT]"
+#define mkfs_ext2_full_usage "\n" \
+ "\n -b BLK_SIZE Block size in bytes" \
+/* "\n -c Check for bad blocks before creating" */ \
+/* "\n -E opts Set extended options" */ \
+/* "\n -f size Fragment size in bytes" */ \
+/* "\n -F Force (ignore sanity checks)" */ \
+/* "\n -g num Number of blocks in a block group" */ \
+ "\n -i BYTES The bytes/inode ratio" \
+/* "\n -j Create a journal (ext3)" */ \
+/* "\n -J opts Set journal options (size/device)" */ \
+/* "\n -l file Read bad blocks list from file" */ \
+ "\n -L LABEL Set the volume label" \
+ "\n -m PERCENT Percent of blocks to reserve for admin" \
+/* "\n -M dir Set last mounted directory" */ \
+/* "\n -n Don't actually create anything" */ \
+/* "\n -N num Number of inodes to create" */ \
+/* "\n -o os Set the 'creator os' field" */ \
+/* "\n -O features Dir_index/filetype/has_journal/journal_dev/sparse_super" */ \
+/* "\n -q Quiet" */ \
+/* "\n -r rev Set filesystem revision" */ \
+/* "\n -S Write superblock and group descriptors only" */ \
+/* "\n -T fs-type Set usage type (news/largefile/largefile4)" */ \
+/* "\n -v Verbose" */ \
+
#define mkfs_minix_trivial_usage \
"[-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
#define mkfs_minix_full_usage "\n\n" \
--
cgit v1.2.3