diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-10-12 11:20:08 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-10-12 11:20:08 +0000 |
commit | 1e19afd38adae3c44197254255ed43d88ae9726c (patch) | |
tree | cb9d153be22d4043e1feffe26b3b42462cc88181 /include | |
parent | d5e305944a9db25f57b252cc9f56c18311e68481 (diff) | |
download | busybox-w32-1e19afd38adae3c44197254255ed43d88ae9726c.tar.gz busybox-w32-1e19afd38adae3c44197254255ed43d88ae9726c.tar.bz2 busybox-w32-1e19afd38adae3c44197254255ed43d88ae9726c.zip |
blkid: new applet. We almost had everything needed for it already
function old new delta
display_uuid_cache - 89 +89
blkid_main - 8 +8
applet_names 1871 1877 +6
applet_main 1140 1144 +4
applet_nameofs 570 572 +2
packed_usage 24737 24735 -2
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 3/1 up/down: 109/-2) Total: 107 bytes
Diffstat (limited to 'include')
-rw-r--r-- | include/applets.h | 1 | ||||
-rw-r--r-- | include/usage.h | 5 | ||||
-rw-r--r-- | include/volume_id.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h index 35649d3df..828900e46 100644 --- a/include/applets.h +++ b/include/applets.h | |||
@@ -80,6 +80,7 @@ USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk)) | |||
80 | USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename)) | 80 | USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename)) |
81 | USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER)) | 81 | USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER)) |
82 | //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER)) | 82 | //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER)) |
83 | USE_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_NEVER)) | ||
83 | USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) | 84 | USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) |
84 | USE_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 85 | USE_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
85 | USE_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER, bzcat)) | 86 | USE_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER, bzcat)) |
diff --git a/include/usage.h b/include/usage.h index d2478641c..3c110132e 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -1098,6 +1098,11 @@ | |||
1098 | "\n -z Delete messages on server" \ | 1098 | "\n -z Delete messages on server" \ |
1099 | "\n prog Run 'prog <message_file>' on message delivery" \ | 1099 | "\n prog Run 'prog <message_file>' on message delivery" \ |
1100 | 1100 | ||
1101 | #define blkid_trivial_usage \ | ||
1102 | "" | ||
1103 | #define blkid_full_usage "\n\n" \ | ||
1104 | "Print UUIDs of all filesystems." | ||
1105 | |||
1101 | #define findfs_trivial_usage \ | 1106 | #define findfs_trivial_usage \ |
1102 | "LABEL=label or UUID=uuid" | 1107 | "LABEL=label or UUID=uuid" |
1103 | #define findfs_full_usage "\n\n" \ | 1108 | #define findfs_full_usage "\n\n" \ |
diff --git a/include/volume_id.h b/include/volume_id.h index 99cb11ff6..bba32c0ba 100644 --- a/include/volume_id.h +++ b/include/volume_id.h | |||
@@ -20,3 +20,4 @@ | |||
20 | 20 | ||
21 | char *get_devname_from_label(const char *spec); | 21 | char *get_devname_from_label(const char *spec); |
22 | char *get_devname_from_uuid(const char *spec); | 22 | char *get_devname_from_uuid(const char *spec); |
23 | void display_uuid_cache(void); | ||