61 Commits

Author	SHA1	Message	Date
Sven-Göran Bergh	3b45801dc6	volume_id: Adopt to new kbuild style. ... Kbuild instructions for util-linux/volume_id are moved into the source files according to the new build feature. No code change. Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-07-31 15:45:20 +02:00
Denys Vlasenko	aa94130f74	volume_id_internal.h: drop unoptimized byteswap routines ... function old new delta volume_id_probe_hfs_hfsplus 802 627 -175 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-05-15 09:36:40 +02:00
Oliver Metz	041baf2720	volume_id: fix ntfs attribute search ... len is declared as uint32_t but le16_to_cpu macro is used Signed-off-by: Oliver Metz <oliver.metz@gmx.de> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-05-09 07:45:51 +02:00
Denys Vlasenko	60cb48ca50	whitespace cleanup. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 15:57:44 +01:00
Denys Vlasenko	90801dadfa	Remove redundant 'config FEATURE_VOLUMEID_SQUASHFS' ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 02:24:27 +01:00
Sven-Göran Bergh	6928d9f049	volume_id: add squashfs detection ... function old new delta volume_id_probe_squashfs - 74 +74 fs1 12 16 +4 Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 02:21:41 +01:00
Denys Vlasenko	6967578728	whitespace fixes. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 01:34:48 +01:00
Sven-Göran Bergh	5218515508	volume_id: uuid_format small code shrink ... function old new delta volume_id_set_uuid 318 300 -18 Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 00:52:03 +01:00
Sven-Göran Bergh	07b419dbcb	volume_id: display hfs[+] 128-bit UUID properly ... Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 00:37:00 +01:00
Sven-Göran Bergh	a58f7b7d2f	blkid: add type display for hfsplus ... Signed-off-by: Sven-Göran Bergh <sgb@systemasis.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 00:35:31 +01:00
S-G Bergh	e4b9451413	volume_id: add exFAT detection ... function old new delta volume_id_probe_exfat - 294 +294 Signed-off-by: S-G Bergh <sgb@systemasis.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-11-13 14:40:37 +01:00
S-G Bergh	d2d5049c1d	blkid: show filesystem when both label and UUID are missing, but type is known ... Signed-off-by: S-G Bergh <sgb@systemasis.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-11-05 13:16:07 +01:00
Sven-Göran Bergh	c5a9fa2d2a	blkid: add support for nilfs2 ... function old new delta volume_id_probe_nilfs - 99 +99 fs2 52 56 +4 Signed-off-by: Sven-Göran Bergh <svengbergh-busybox@yahoo.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-09-02 15:34:39 +02:00
Denys Vlasenko	8019b3a7ae	volume_id: code shrink ... function old new delta volume_id_set_unicode16 200 173 -27 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-09-02 15:33:47 +02:00
Sven-Göran Bergh	11f2c0d4f8	blkid: add type display for btrfs ... Signed-off-by: Sven-Göran Bergh <svengbergh-busybox@yahoo.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-09-02 14:56:25 +02:00
Denys Vlasenko	ac164dd2a7	volume_id/ext: use common bb_e2fs_defs.h for ext2/3/4 constants and structs ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-06-12 15:00:35 +02:00
Denys Vlasenko	0133921726	volume_id/ext: detect ext4 too ... function old new delta volume_id_probe_ext 108 132 +24 Signed-off-by: Dees Troy<dees_troy@teamw.in> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-05-18 02:51:27 +02:00
Denys Vlasenko	e8cfc3f693	blkid: if parameters are given, do not scan /dev ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-03-03 15:09:07 +01:00
Denys Vlasenko	c3375f0389	volume_id/get_devname: trivial code shrink ... function old new delta uuidcache_init 36 41 +5 get_devname_from_uuid 55 51 -4 get_devname_from_label 61 57 -4 display_uuid_cache 109 105 -4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/3 up/down: 5/-12) Total: -7 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-12-06 15:06:59 +01:00
Denys Vlasenko	48a5219f39	reverted LINHIB0001 swap signature addition ... see: https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/683605 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-02-14 03:52:16 +01:00
Denys Vlasenko	90615a0c5c	blkid: optional support for TYPE="fstype" ... Adapted from patch created by T4ndeta <t4ndeta@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-12-30 00:40:11 +01:00
James Hunt	86ffe5c15a	volume_id: recognize compressed hibernate swap signature ... util-linux/volume_id/linux_swap.c: Added the new magic LINHIB0001 signature. See: https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/683605 Signed-off-by: James Hunt <james.hunt@ubuntu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-12-19 17:18:45 +01:00
Denys Vlasenko	0ef64bdb40	*: make GNU licensing statement forms more regular ... This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-08-16 20:14:46 +02:00
Denys Vlasenko	f3ea792bad	*: mass cosmetic removal of extra empty lines. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-07-26 01:06:14 +02:00
Denys Vlasenko	d70e0e995e	*: add INSERTs to *.src files where appropriate ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-06-08 12:15:11 +02:00
Denys Vlasenko	da929a95aa	mass renaming Kbuild -> Kbuild.src, Config.in -> Config.src ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-06-04 20:10:51 +02:00
Vladimir Dronnikov	73ccd0ca87	volume_id/linux_swap: detect suspended image signatures too ... Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-02-08 03:08:05 +01:00
Denys Vlasenko	12ca080a1c	*: eliminate more aliasing warnings ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-02-04 18:41:18 +01:00
Denys Vlasenko	6b9f163353	*: style fixes. no code changes (verified with objdump) ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-01-28 02:24:24 +01:00
Denys Vlasenko	6331cf059c	*: use "can't" instead of "cannot" ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-11-13 09:08:27 +01:00
Denys Vlasenko	d784b65be7	btrfs.c: check first two superblocks, for additional robustness ... function old new delta volume_id_probe_btrfs 94 142 +48 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-11-02 00:12:35 +01:00
Denys Vlasenko	893009644f	volume_id: add FAST_FUNC where appropriate ... function old new delta volume_id_probe_iso9660 324 327 +3 volume_id_probe_vfat 902 903 +1 volume_id_probe_udf 576 577 +1 volume_id_probe_ntfs 314 315 +1 uuidcache_check_device 292 291 -1 volume_id_probe_xfs 87 85 -2 volume_id_probe_sysv 165 163 -2 volume_id_probe_romfs 89 87 -2 volume_id_probe_reiserfs 236 234 -2 volume_id_probe_ocfs2 96 94 -2 volume_id_probe_luks 78 76 -2 volume_id_probe_linux_swap 165 163 -2 volume_id_probe_jfs 96 94 -2 volume_id_probe_hfs_hfsplus 795 793 -2 volume_id_probe_ext 82 80 -2 volume_id_probe_cramfs 59 57 -2 volume_id_probe_btrfs 96 94 -2 free_volume_id 36 31 -5 volume_id_probe_linux_raid 127 119 -8 volume_id_probe_all 152 138 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/16 up/down: 6/-52) Total: -46 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-11-01 23:07:18 +01:00
Vladimir Dronnikov	662e8b79d0	volume_id: add support for btrfs ... function old new delta volume_id_probe_btrfs - 96 +96 fs2 48 52 +4 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/0 up/down: 100/0) Total: 100 bytes Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-11-01 23:05:09 +01:00
Denys Vlasenko	606291beab	*: more portability fixes by Dan Fandrich ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-23 23:15:43 +02:00
Natanael Copa	9aff29997e	swaponoff: add uuid/label support. By Natanael Copa ... function old new delta swap_enable_disable 130 150 +20 resolve_mount_spec 76 96 +20 mount_main 1152 1154 +2 findfs_main 125 80 -45 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/1 up/down: 42/-45) Total: -3 bytes Signed-off-by: Natanael Copa <natanael.copa@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-20 04:28:22 +02:00
Denys Vlasenko	8dc0e1929e	use PACKED macro insted of open-coding GCC-ism ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-16 00:58:11 +02:00
Denys Vlasenko	da49f58524	move libc related stuff out of platform.h ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-07-08 02:58:38 +02:00
Denys Vlasenko	1881ba48b1	Update a comment, no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-27 22:09:28 +02:00
Denys Vlasenko	4fc5ec56f9	device matching against UUIDs: do not try floppies ... function old new delta uuidcache_check_device 255 292 +37 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-27 21:58:25 +02:00
Denys Vlasenko	d5f1b1bbe0	*: add FAST_FUNC to function ptrs where it makes sense ... function old new delta evalcommand 1195 1209 +14 testcmd - 10 +10 printfcmd - 10 +10 echocmd - 10 +10 func_exec 270 276 +6 echo_dg 104 109 +5 store_nlmsg 85 89 +4 pseudo_exec_argv 195 198 +3 dotcmd 287 290 +3 machtime_stream 29 31 +2 discard_stream 24 26 +2 argstr 1299 1301 +2 killcmd 108 109 +1 evalfor 226 227 +1 daytime_stream 43 44 +1 run_list 2544 2543 -1 lookupvar 62 61 -1 ipaddr_modify 1310 1309 -1 ... parse_stream 2254 2245 -9 evalpipe 356 347 -9 collect_if 210 197 -13 read_opt 869 851 -18 handle_dollar 681 658 -23 print_addrinfo 1342 1303 -39 iterate_on_dir 156 59 -97 print_route 1709 1609 -100 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 12/130 up/down: 74/-767) Total: -693 bytes text data bss dec hex filename 841748 467 7872 850087 cf8a7 busybox_old 841061 467 7872 849400 cf5f8 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-06-05 12:06:05 +02:00
Denis Vlasenko	f81e8dbc74	*: make "pragma GCC visibility push(hidden)" less ugly	2009-04-09 12:35:13 +00:00
Denis Vlasenko	9983d806d9	volumeid: fix bug 249 "findfs finds the wrong partition"	2009-03-31 19:47:34 +00:00
Denis Vlasenko	28ea4298e3	volume_id: abort early on read failures. ... should help with probing missing fdd's	2009-02-15 05:51:19 +00:00
Denis Vlasenko	efb545b9bd	optimize 16- and 32-bit moves ... function old new delta udhcpd_main 1239 1257 +18 udhcp_add_simple_option 93 92 -1 buffer_read_le_u32 19 18 -1 unpack_gz_stream_with_info 526 520 -6 dnsd_main 1470 1463 -7 udhcp_run_script 1208 1186 -22 send_ACK 255 229 -26 arping_main 1661 1623 -38 send_offer 470 428 -42 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/8 up/down: 18/-143) Total: -125 bytes	2008-12-08 22:56:18 +00:00
Denis Vlasenko	1e10afcdfb	volume_id/fat: careful with sector#, it may not fit in 32 bits. +91 bytes ... volume_id/*: a bit of code shrink	2008-11-30 17:41:31 +00:00
Denis Vlasenko	802a7be54f	add comment explaining previous change	2008-10-19 19:54:49 +00:00
Denis Vlasenko	582dff0514	volume identification: abolish /proc/partitions and /proc/cdroms ... scanning. It does not catch volume managers and such. Adding even more cruft is bad, so I decided to simply scan /dev/* for any block devices. See how much better it finds devices now: # ./busybox_old blkid /dev/sda1: LABEL="/boot" UUID="7931e231-dcb4-4b6d-9301-f7354ae24061" /dev/dm-0: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" /dev/dm-1: UUID="edc2a920-ef83-437e-ba64-d3b6dc851267" /dev/sdb1: UUID="6F84-ED0F" # ./busybox blkid /dev/sdb1: UUID="6F84-ED0F" /dev/root: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" /dev/dm-1: UUID="edc2a920-ef83-437e-ba64-d3b6dc851267" /dev/dm-0: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" /dev/sda1: LABEL="/boot" UUID="7931e231-dcb4-4b6d-9301-f7354ae24061" /dev/mapper/VolGroup00-LogVol01: UUID="edc2a920-ef83-437e-ba64-d3b6dc851267" /dev/mapper/VolGroup00-LogVol00: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" function old new delta static.drive_name_string 12 - -12 append_mount_options 205 190 -15 volume_id_open_node 37 18 -19 uuidcache_check_device 485 257 -228 uuidcache_init 637 36 -601 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 0/4 up/down: 0/-875) Total: -875 bytes text data bss dec hex filename 792218 592 6648 799458 c32e2 busybox_old 791260 592 6648 798500 c2f24 busybox_unstripped	2008-10-19 19:36:30 +00:00
Denis Vlasenko	1e19afd38a	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	2008-10-12 11:20:08 +00:00
Denis Vlasenko	d5e305944a	findfs: fix LUKS and FAT detection routines; do not exit if corrupted ... FAT fs makes us try to seek past volume function old new delta volume_id_get_buffer 301 327 +26 volume_id_probe_luks 79 82 +3 get_attr_volume_id 73 65 -8 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/1 up/down: 29/-8) Total: 21 bytes	2008-10-12 11:17:49 +00:00
Denis Vlasenko	5415c856ea	libbb: [x]fopen_for_{read,write} introduced and used. ... (by Valdimir) function old new delta config_open2 - 41 +41 config_read 507 542 +35 find_pair 169 187 +18 fopen_for_write - 14 +14 fopen_for_read - 14 +14 find_main 406 418 +12 xfopen_for_write - 10 +10 xfopen_for_read - 10 +10 popstring 134 140 +6 parse_inittab 396 401 +5 next_token 923 928 +5 pack_gzip 1659 1661 +2 bb__parsespent 117 119 +2 fallbackSort 1719 1717 -2 evalvar 1376 1374 -2 qrealloc 36 33 -3 ... ... ... ... singlemount 4579 4569 -10 process_stdin 443 433 -10 patch_main 1111 1101 -10 ifupdown_main 2175 2165 -10 file_action_grep 90 80 -10 uuidcache_init 649 637 -12 hush_main 797 785 -12 read_config 230 217 -13 dpkg_main 3835 3820 -15 read_line_input 3134 3110 -24 sysctl_main 232 203 -29 config_open 40 10 -30 WARN_BAD_LINE 44 - -44 login_main 1714 1575 -139 ------------------------------------------------------------------------------ (add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes	2008-07-21 23:05:26 +00:00