X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=misc%2Fblkid.c;h=96fffae491c49418af7feb634a6b3489afe2e1f8;hb=cba3fd5ca1e90fafe20386af41bb5aeeae3e3fd2;hp=c02de71417441438fb6f2951ceeca45ba8dc8fb5;hpb=a63830271b5143416981f1171503e10bd6b6056f;p=tools%2Fe2fsprogs.git diff --git a/misc/blkid.c b/misc/blkid.c index c02de71..96fffae 100644 --- a/misc/blkid.c +++ b/misc/blkid.c @@ -9,9 +9,20 @@ * %End-Header% */ +#include "config.h" #include #include +#include #include +#ifdef HAVE_TERMIOS_H +#include +#endif +#ifdef HAVE_TERMIO_H +#include +#endif +#ifdef HAVE_SYS_IOCTL_H +#include +#endif #ifdef HAVE_GETOPT_H #include #else @@ -22,10 +33,12 @@ extern int optind; #define OUTPUT_VALUE_ONLY 0x0001 #define OUTPUT_DEVICE_ONLY 0x0002 +#define OUTPUT_PRETTY_LIST 0x0004 +#include "ext2fs/ext2fs.h" #include "blkid/blkid.h" -const char *progname = "blkid"; +static const char *progname = "blkid"; static void print_version(FILE *out) { @@ -38,10 +51,11 @@ static void usage(int error) print_version(out); fprintf(out, - "usage:\t%s [-c ] [-hl] [-o format] " - "[-s ] [-t ]\n [-v] [-w ] [dev ...]\n" + "usage:\t%s [-c ] [-ghlLv] [-o format] " + "[-s ] [-t ]\n [-w ] [dev ...]\n" "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n" "\t-h\tprint this usage message and exit\n" + "\t-g\tgarbage collect the blkid cache\n" "\t-s\tshow specified tag(s) (default show all tags)\n" "\t-t\tfind device with a specific token (NAME=value pair)\n" "\t-l\tlookup the the first device with arguments specified by -t\n" @@ -52,6 +66,166 @@ static void usage(int error) exit(error); } +/* + * This function does "safe" printing. It will convert non-printable + * ASCII characters using '^' and M- notation. + */ +static void safe_print(const char *cp, int len) +{ + unsigned char ch; + + if (len < 0) + len = strlen(cp); + + while (len--) { + ch = *cp++; + if (ch > 128) { + fputs("M-", stdout); + ch -= 128; + } + if ((ch < 32) || (ch == 0x7f)) { + fputc('^', stdout); + ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */ + } + fputc(ch, stdout); + } +} + +static int get_terminal_width(void) +{ +#ifdef TIOCGSIZE + struct ttysize t_win; +#endif +#ifdef TIOCGWINSZ + struct winsize w_win; +#endif + const char *cp; + int width = 80; + +#ifdef TIOCGSIZE + if (ioctl (0, TIOCGSIZE, &t_win) == 0) { + width = t_win.ts_cols; + goto got_it; + } +#endif +#ifdef TIOCGWINSZ + if (ioctl (0, TIOCGWINSZ, &w_win) == 0) { + width = w_win.ws_col; + goto got_it; + } +#endif + cp = getenv("COLUMNS"); + if (cp) + width = atoi(cp); +got_it: + if (width > 4096) + return 4096; /* sanity check */ + return width; +} + +static int pretty_print_word(const char *str, int max_len, + int left_len, int overflow_nl) +{ + int len = strlen(str) + left_len; + int ret = 0; + + fputs(str, stdout); + if (overflow_nl && len > max_len) { + fputc('\n', stdout); + len = 0; + } else if (len > max_len) + ret = len - max_len; + do { + fputc(' ', stdout); + } while (len++ < max_len); + return ret; +} + +static void pretty_print_line(const char *device, const char *fs_type, + const char *label, const char *mtpt, + const char *uuid) +{ + static int device_len = 10, fs_type_len = 7; + static int label_len = 8, mtpt_len = 14; + static int term_width = -1; + int len, w; + + if (term_width < 0) { + term_width = get_terminal_width(); + + if (term_width > 80) { + term_width -= 80; + w = term_width / 10; + if (w > 8) + w = 8; + term_width -= 2*w; + label_len += w; + fs_type_len += w; + w = term_width/2; + device_len += w; + mtpt_len +=w; + } + } + + len = pretty_print_word(device, device_len, 0, 1); + len = pretty_print_word(fs_type, fs_type_len, len, 0); + len = pretty_print_word(label, label_len, len, 0); + len = pretty_print_word(mtpt, mtpt_len, len, 0); + fputs(uuid, stdout); + fputc('\n', stdout); +} + +static void pretty_print_dev(blkid_dev dev) +{ + blkid_tag_iterate iter; + const char *type, *value, *devname; + const char *uuid = "", *fs_type = "", *label = ""; + int len, mount_flags; + char mtpt[80]; + errcode_t retval; + + if (dev == NULL) { + pretty_print_line("device", "fs_type", "label", + "mount point", "UUID"); + for (len=get_terminal_width()-1; len > 0; len--) + fputc('-', stdout); + fputc('\n', stdout); + return; + } + + devname = blkid_dev_devname(dev); + if (access(devname, F_OK)) + return; + + /* Get the uuid, label, type */ + iter = blkid_tag_iterate_begin(dev); + while (blkid_tag_next(iter, &type, &value) == 0) { + if (!strcmp(type, "UUID")) + uuid = value; + if (!strcmp(type, "TYPE")) + fs_type = value; + if (!strcmp(type, "LABEL")) + label = value; + } + blkid_tag_iterate_end(iter); + + /* Get the mount point */ + mtpt[0] = 0; + retval = ext2fs_check_mount_point(devname, &mount_flags, + mtpt, sizeof(mtpt)); + if (retval == 0) { + if (mount_flags & EXT2_MF_MOUNTED) { + if (!mtpt[0]) + strcpy(mtpt, "(mounted, mtpt unknown)"); + } else if (mount_flags & EXT2_MF_BUSY) + strcpy(mtpt, "(in use)"); + else + strcpy(mtpt, "(not mounted)"); + } + + pretty_print_line(devname, fs_type, label, mtpt, uuid); +} + static void print_tags(blkid_dev dev, char *show[], int numtag, int output) { blkid_tag_iterate iter; @@ -61,6 +235,11 @@ static void print_tags(blkid_dev dev, char *show[], int numtag, int output) if (!dev) return; + if (output & OUTPUT_PRETTY_LIST) { + pretty_print_dev(dev); + return; + } + if (output & OUTPUT_DEVICE_ONLY) { printf("%s\n", blkid_dev_devname(dev)); return; @@ -75,14 +254,19 @@ static void print_tags(blkid_dev dev, char *show[], int numtag, int output) if (i >= numtag) continue; } - if (first && !(output & OUTPUT_VALUE_ONLY)) { - printf("%s: ", blkid_dev_devname(dev)); - first = 0; + if (output & OUTPUT_VALUE_ONLY) { + fputs(value, stdout); + fputc('\n', stdout); + } else { + if (first) { + printf("%s: ", blkid_dev_devname(dev)); + first = 0; + } + fputs(type, stdout); + fputs("=\"", stdout); + safe_print(value, -1); + fputs("\" ", stdout); } - if ((output & OUTPUT_VALUE_ONLY)) - printf("%s\n", value); - else - printf("%s=\"%s\" ", type, value); } blkid_tag_iterate_end(iter); @@ -103,31 +287,38 @@ int main(int argc, char **argv) int err = 4; unsigned int i; int output_format = 0; - int lookup = 0; + int lookup = 0, gc = 0; int c; - while ((c = getopt (argc, argv, "c:f:hlo:s:t:w:v")) != EOF) + while ((c = getopt (argc, argv, "c:f:ghlLo:s:t:w:v")) != EOF) switch (c) { case 'c': - if (optarg && !*optarg) - read = NULL; - else - read = optarg; + read = optarg; if (!write) write = read; break; case 'l': lookup++; break; + case 'L': + output_format = OUTPUT_PRETTY_LIST; + break; + case 'g': + gc = 1; + break; case 'o': if (!strcmp(optarg, "value")) output_format = OUTPUT_VALUE_ONLY; else if (!strcmp(optarg, "device")) output_format = OUTPUT_DEVICE_ONLY; + else if (!strcmp(optarg, "list")) + output_format = OUTPUT_PRETTY_LIST; else if (!strcmp(optarg, "full")) output_format = 0; else { - fprintf(stderr, "Invalid output format %s. Chose from value, device, or full\n", optarg); + fprintf(stderr, "Invalid output format %s. " + "Choose from value,\n\t" + "device, list, or full\n", optarg); exit(1); } break; @@ -155,13 +346,11 @@ int main(int argc, char **argv) version = 1; break; case 'w': - if (optarg && !*optarg) - write = NULL; - else - write = optarg; + write = optarg; break; case 'h': err = 0; + /* fallthrough */ default: usage(err); } @@ -178,6 +367,13 @@ int main(int argc, char **argv) goto exit; err = 2; + if (gc) { + blkid_gc_cache(cache); + goto exit; + } + if (output_format & OUTPUT_PRETTY_LIST) + pretty_print_dev(NULL); + if (lookup) { blkid_dev dev; @@ -218,8 +414,8 @@ int main(int argc, char **argv) BLKID_DEV_NORMAL); if (dev) { - if (search_type && - !blkid_dev_has_tag(dev, search_type, + if (search_type && + !blkid_dev_has_tag(dev, search_type, search_value)) continue; print_tags(dev, show, numtag, output_format); @@ -228,10 +424,8 @@ int main(int argc, char **argv) } exit: - if (search_type) - free(search_type); - if (search_value) - free(search_value); + free(search_type); + free(search_value); blkid_put_cache(cache); return err; }