wok-stable annotate busybox/stuff/busybox-1.18.2-stat.u @ rev 8236

busybox-pam needs pam-dev for security/pam_appl.h security/pam_misc.h
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 27 11:52:18 2011 +0100 (2011-01-27)
parents
children
rev   line source
slaxemulator@8159 1 Add non standard stat -m support to display file block list
slaxemulator@8159 2 Useful to patch read-only filesystems such as ISO9660, for defragmentation
slaxemulator@8159 3 tools or boot loaders
slaxemulator@8159 4 --- busybox-1.18.0/include/usage.src.h
slaxemulator@8159 5 +++ busybox-1.18.0/include/usage.src.h
slaxemulator@8159 6 @@ -3654,6 +3654,7 @@
slaxemulator@8159 7 "\n -f Display filesystem status" \
slaxemulator@8159 8 "\n -L Follow links" \
slaxemulator@8159 9 "\n -t Display info in terse form" \
slaxemulator@8159 10 + "\n -m Display block list" \
slaxemulator@8159 11 IF_SELINUX( \
slaxemulator@8159 12 "\n -Z Print security context" \
slaxemulator@8159 13 ) \
slaxemulator@8159 14
slaxemulator@8159 15 --- busybox-1.17.1/coreutils/stat.c
slaxemulator@8159 16 +++ busybox-1.17.1/coreutils/stat.c
slaxemulator@8159 17 @@ -13,11 +13,13 @@
slaxemulator@8159 18 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
slaxemulator@8159 19 */
slaxemulator@8159 20 #include "libbb.h"
slaxemulator@8159 21 +#include <linux/fs.h>
slaxemulator@8159 22
slaxemulator@8159 23 #define OPT_FILESYS (1 << 0)
slaxemulator@8159 24 #define OPT_TERSE (1 << 1)
slaxemulator@8159 25 #define OPT_DEREFERENCE (1 << 2)
slaxemulator@8159 26 -#define OPT_SELINUX (1 << 3)
slaxemulator@8159 27 +#define OPT_MAP (1 << 3)
slaxemulator@8159 28 +#define OPT_SELINUX (1 << 4)
slaxemulator@8159 29
slaxemulator@8159 30 #if ENABLE_FEATURE_STAT_FORMAT
slaxemulator@8159 31 typedef bool (*statfunc_ptr)(const char *, const char *);
slaxemulator@8159 32 @@ -359,6 +361,26 @@
slaxemulator@8159 33
slaxemulator@8159 34 /* Stat the file system and print what we find. */
slaxemulator@8159 35 #if !ENABLE_FEATURE_STAT_FORMAT
slaxemulator@8159 36 +#define do_mapfile(filename, format) do_mapfile(filename)
slaxemulator@8159 37 +#endif
slaxemulator@8159 38 +static bool do_mapfile(const char *filename, const char *format)
slaxemulator@8159 39 +{
slaxemulator@8159 40 + int i = 0;
slaxemulator@8159 41 + int fd = xopen(filename, O_RDONLY);
slaxemulator@8159 42 +
slaxemulator@8159 43 +#if ENABLE_FEATURE_STAT_FORMAT
slaxemulator@8159 44 + (void) format;
slaxemulator@8159 45 +#endif
slaxemulator@8159 46 + while (1) {
slaxemulator@8159 47 + int blk = i++;
slaxemulator@8159 48 + if (ioctl(fd,FIBMAP,&blk) < 0 || blk == 0) break;
slaxemulator@8159 49 + printf("%u\n",blk);
slaxemulator@8159 50 + }
slaxemulator@8159 51 + return 1;
slaxemulator@8159 52 +}
slaxemulator@8159 53 +
slaxemulator@8159 54 +/* Stat the file system and print what we find. */
slaxemulator@8159 55 +#if !ENABLE_FEATURE_STAT_FORMAT
slaxemulator@8159 56 #define do_statfs(filename, format) do_statfs(filename)
slaxemulator@8159 57 #endif
slaxemulator@8159 58 static bool do_statfs(const char *filename, const char *format)
slaxemulator@8159 59 @@ -648,7 +670,7 @@
slaxemulator@8159 60 statfunc_ptr statfunc = do_stat;
slaxemulator@8159 61
slaxemulator@8159 62 opt_complementary = "-1"; /* min one arg */
slaxemulator@8159 63 - opts = getopt32(argv, "ftL"
slaxemulator@8159 64 + opts = getopt32(argv, "ftLm"
slaxemulator@8159 65 IF_SELINUX("Z")
slaxemulator@8159 66 IF_FEATURE_STAT_FORMAT("c:", &format)
slaxemulator@8159 67 );
slaxemulator@8159 68 @@ -659,6 +681,9 @@
slaxemulator@8159 69 selinux_or_die();
slaxemulator@8159 70 }
slaxemulator@8159 71 #endif
slaxemulator@8159 72 + if (opts & OPT_MAP) { /* -m */
slaxemulator@8159 73 + statfunc = do_mapfile;
slaxemulator@8159 74 + }
slaxemulator@8159 75 ok = 1;
slaxemulator@8159 76 argv += optind;
slaxemulator@8159 77 for (i = 0; argv[i]; ++i)