X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Fcmds.c;h=6d8e45434bc9b61757821e01f08a98d45be6fca6;hp=3116c947b770b52769daf67eb840c051a8632c43;hb=73d6932ab2dd3f9120a1f4a532621c07cb174705;hpb=1cf85b1e60e85c4940869c6291d75ac44a5bd190 diff --git a/fish/cmds.c b/fish/cmds.c index 3116c94..6d8e454 100644 --- a/fish/cmds.c +++ b/fish/cmds.c @@ -22,7 +22,9 @@ #include #include #include +#include +#include #include "fish.h" void list_commands (void) @@ -30,18 +32,32 @@ void list_commands (void) printf (" %-16s %s\n", "Command", "Description"); list_builtin_commands (); printf ("%-20s %s\n", "cat", "list the contents of a file"); + printf ("%-20s %s\n", "list-devices", "list the block devices"); + printf ("%-20s %s\n", "list-partitions", "list the partitions"); printf ("%-20s %s\n", "ll", "list the files in a directory (long format)"); printf ("%-20s %s\n", "ls", "list the files in a directory"); + printf ("%-20s %s\n", "lvs", "list the LVM logical volumes (LVs)"); printf ("%-20s %s\n", "mount", "mount a guest disk at a position in the filesystem"); + printf ("%-20s %s\n", "pvs", "list the LVM physical volumes (PVs)"); printf ("%-20s %s\n", "sync", "sync disks, writes are flushed through to the disk image"); printf ("%-20s %s\n", "touch", "update file timestamps or create a new file"); + printf ("%-20s %s\n", "vgs", "list the LVM volume groups (VGs)"); printf (" Use -h / help to show detailed help for a command.\n"); } void display_command (const char *cmd) { + if (strcasecmp (cmd, "mount") == 0) + pod2text ("mount - mount a guest disk at a position in the filesystem", " mount \n\nMount a guest disk at a position in the filesystem. Block devices\nare named C, C and so on, as they were added to\nthe guest. If those block devices contain partitions, they will have\nthe usual names (eg. C). Also LVM C-style\nnames can be used.\n\nThe rules are the same as for L: A filesystem must\nfirst be mounted on C before others can be mounted. Other\nfilesystems can only be mounted on directories which already\nexist.\n\nThe mounted filesystem is writable, if we have sufficient permissions\non the underlying device.\n\nThe filesystem options C and C are set with this\ncall, in order to improve reliability."); + else + if (strcasecmp (cmd, "sync") == 0) + pod2text ("sync - sync disks, writes are flushed through to the disk image", " sync\n\nThis syncs the disk, so that any writes are flushed through to the\nunderlying disk image.\n\nYou should always call this if you have modified a disk image, before\ncalling C."); + else + if (strcasecmp (cmd, "touch") == 0) + pod2text ("touch - update file timestamps or create a new file", " touch \n\nTouch acts like the L command. It can be used to\nupdate the timestamps on a file, or, if the file does not exist,\nto create a new zero-length file."); + else if (strcasecmp (cmd, "cat") == 0) - pod2text ("cat - list the contents of a file", " cat \n\nReturn the contents of the file named C.\n\nNote that this function cannot correctly handle binary files\n(specifically, files containing C<\\0> character which is treated\nas end of string). For those you need to use the C\nfunction which has a more complex interface.\n\nBecause of the message protocol, there is a transfer limit \nof somewhere between 2MB and 4MB. To transfer large files you should use\nFTP."); + pod2text ("cat - list the contents of a file", " cat \n\nReturn the contents of the file named C.\n\nNote that this function cannot correctly handle binary files\n(specifically, files containing C<\\0> character which is treated\nas end of string). For those you need to use the C\nfunction which has a more complex interface.\n\nBecause of the message protocol, there is a transfer limit \nof somewhere between 2MB and 4MB. To transfer large files you should use\nFTP."); else if (strcasecmp (cmd, "ll") == 0) pod2text ("ll - list the files in a directory (long format)", " ll \n\nList the files in C (relative to the root directory,\nthere is no cwd) in the format of 'ls -la'.\n\nThis command is mostly useful for interactive sessions. It\nis I intended that you try to parse the output string."); @@ -49,18 +65,168 @@ void display_command (const char *cmd) if (strcasecmp (cmd, "ls") == 0) pod2text ("ls - list the files in a directory", " ls \n\nList the files in C (relative to the root directory,\nthere is no cwd). The '.' and '..' entries are not returned, but\nhidden files are shown.\n\nThis command is mostly useful for interactive sessions. Programs\nshould probably use C instead."); else - if (strcasecmp (cmd, "mount") == 0) - pod2text ("mount - mount a guest disk at a position in the filesystem", " mount \n\nMount a guest disk at a position in the filesystem. Block devices\nare named C, C and so on, as they were added to\nthe guest. If those block devices contain partitions, they will have\nthe usual names (eg. C). Also LVM C-style\nnames can be used.\n\nThe rules are the same as for L: A filesystem must\nfirst be mounted on C before others can be mounted. Other\nfilesystems can only be mounted on directories which already\nexist.\n\nThe mounted filesystem is writable, if we have sufficient permissions\non the underlying device.\n\nThe filesystem options C and C are set with this\ncall, in order to improve reliability."); + if (strcasecmp (cmd, "list_devices") == 0 || strcasecmp (cmd, "list-devices") == 0) + pod2text ("list-devices - list the block devices", " list-devices\n\nList all the block devices.\n\nThe full block device names are returned, eg. C\n"); else - if (strcasecmp (cmd, "sync") == 0) - pod2text ("sync - sync disks, writes are flushed through to the disk image", " sync\n\nThis syncs the disk, so that any writes are flushed through to the\nunderlying disk image.\n\nYou should always call this if you have modified a disk image, before\ncalling C."); + if (strcasecmp (cmd, "list_partitions") == 0 || strcasecmp (cmd, "list-partitions") == 0) + pod2text ("list-partitions - list the partitions", " list-partitions\n\nList all the partitions detected on all block devices.\n\nThe full partition device names are returned, eg. C\n\nThis does not return logical volumes. For that you will need to\ncall C."); else - if (strcasecmp (cmd, "touch") == 0) - pod2text ("touch - update file timestamps or create a new file", " touch \n\nTouch acts like the L command. It can be used to\nupdate the timestamps on a file, or, if the file does not exist,\nto create a new zero-length file."); + if (strcasecmp (cmd, "pvs") == 0) + pod2text ("pvs - list the LVM physical volumes (PVs)", " pvs\n\nList all the physical volumes detected. This is the equivalent\nof the L command."); + else + if (strcasecmp (cmd, "vgs") == 0) + pod2text ("vgs - list the LVM volume groups (VGs)", " vgs\n\nList all the volumes groups detected. This is the equivalent\nof the L command."); + else + if (strcasecmp (cmd, "lvs") == 0) + pod2text ("lvs - list the LVM logical volumes (LVs)", " lvs\n\nList all the logical volumes detected. This is the equivalent\nof the L command."); else display_builtin_command (cmd); } +static void print_pv (struct guestfs_lvm_pv *pv) +{ + int i; + + printf ("pv_name: %s\n", pv->pv_name); + printf ("pv_uuid: "); + for (i = 0; i < 32; ++i) + printf ("%c", pv->pv_uuid[i]); + printf ("\n"); + printf ("pv_fmt: %s\n", pv->pv_fmt); + printf ("pv_size: %" PRIu64 "\n", pv->pv_size); + printf ("dev_size: %" PRIu64 "\n", pv->dev_size); + printf ("pv_free: %" PRIu64 "\n", pv->pv_free); + printf ("pv_used: %" PRIu64 "\n", pv->pv_used); + printf ("pv_attr: %s\n", pv->pv_attr); + printf ("pv_pe_count: %" PRIi64 "\n", pv->pv_pe_count); + printf ("pv_pe_alloc_count: %" PRIi64 "\n", pv->pv_pe_alloc_count); + printf ("pv_tags: %s\n", pv->pv_tags); + printf ("pe_start: %" PRIu64 "\n", pv->pe_start); + printf ("pv_mda_count: %" PRIi64 "\n", pv->pv_mda_count); + printf ("pv_mda_free: %" PRIu64 "\n", pv->pv_mda_free); +} + +static void print_pv_list (struct guestfs_lvm_pv_list *pvs) +{ + int i; + + for (i = 0; i < pvs->len; ++i) + print_pv (&pvs->val[i]); +} + +static void print_vg (struct guestfs_lvm_vg *vg) +{ + int i; + + printf ("vg_name: %s\n", vg->vg_name); + printf ("vg_uuid: "); + for (i = 0; i < 32; ++i) + printf ("%c", vg->vg_uuid[i]); + printf ("\n"); + printf ("vg_fmt: %s\n", vg->vg_fmt); + printf ("vg_attr: %s\n", vg->vg_attr); + printf ("vg_size: %" PRIu64 "\n", vg->vg_size); + printf ("vg_free: %" PRIu64 "\n", vg->vg_free); + printf ("vg_sysid: %s\n", vg->vg_sysid); + printf ("vg_extent_size: %" PRIu64 "\n", vg->vg_extent_size); + printf ("vg_extent_count: %" PRIi64 "\n", vg->vg_extent_count); + printf ("vg_free_count: %" PRIi64 "\n", vg->vg_free_count); + printf ("max_lv: %" PRIi64 "\n", vg->max_lv); + printf ("max_pv: %" PRIi64 "\n", vg->max_pv); + printf ("pv_count: %" PRIi64 "\n", vg->pv_count); + printf ("lv_count: %" PRIi64 "\n", vg->lv_count); + printf ("snap_count: %" PRIi64 "\n", vg->snap_count); + printf ("vg_seqno: %" PRIi64 "\n", vg->vg_seqno); + printf ("vg_tags: %s\n", vg->vg_tags); + printf ("vg_mda_count: %" PRIi64 "\n", vg->vg_mda_count); + printf ("vg_mda_free: %" PRIu64 "\n", vg->vg_mda_free); +} + +static void print_vg_list (struct guestfs_lvm_vg_list *vgs) +{ + int i; + + for (i = 0; i < vgs->len; ++i) + print_vg (&vgs->val[i]); +} + +static void print_lv (struct guestfs_lvm_lv *lv) +{ + int i; + + printf ("lv_name: %s\n", lv->lv_name); + printf ("lv_uuid: "); + for (i = 0; i < 32; ++i) + printf ("%c", lv->lv_uuid[i]); + printf ("\n"); + printf ("lv_attr: %s\n", lv->lv_attr); + printf ("lv_major: %" PRIi64 "\n", lv->lv_major); + printf ("lv_minor: %" PRIi64 "\n", lv->lv_minor); + printf ("lv_kernel_major: %" PRIi64 "\n", lv->lv_kernel_major); + printf ("lv_kernel_minor: %" PRIi64 "\n", lv->lv_kernel_minor); + printf ("lv_size: %" PRIu64 "\n", lv->lv_size); + printf ("seg_count: %" PRIi64 "\n", lv->seg_count); + printf ("origin: %s\n", lv->origin); + if (lv->snap_percent >= 0) printf ("snap_percent: %g %%\n", lv->snap_percent); + else printf ("snap_percent: \n"); + if (lv->copy_percent >= 0) printf ("copy_percent: %g %%\n", lv->copy_percent); + else printf ("copy_percent: \n"); + printf ("move_pv: %s\n", lv->move_pv); + printf ("lv_tags: %s\n", lv->lv_tags); + printf ("mirror_log: %s\n", lv->mirror_log); + printf ("modules: %s\n", lv->modules); +} + +static void print_lv_list (struct guestfs_lvm_lv_list *lvs) +{ + int i; + + for (i = 0; i < lvs->len; ++i) + print_lv (&lvs->val[i]); +} + +static int run_mount (const char *cmd, int argc, char *argv[]) +{ + int r; + const char *device; + const char *mountpoint; + if (argc != 2) { + fprintf (stderr, "%s should have 2 parameter(s)\n", cmd); + fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); + return -1; + } + device = argv[0]; + mountpoint = argv[1]; + r = guestfs_mount (g, device, mountpoint); + return r; +} + +static int run_sync (const char *cmd, int argc, char *argv[]) +{ + int r; + if (argc != 0) { + fprintf (stderr, "%s should have 0 parameter(s)\n", cmd); + fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); + return -1; + } + r = guestfs_sync (g); + return r; +} + +static int run_touch (const char *cmd, int argc, char *argv[]) +{ + int r; + const char *path; + if (argc != 1) { + fprintf (stderr, "%s should have 1 parameter(s)\n", cmd); + fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); + return -1; + } + path = argv[0]; + r = guestfs_touch (g, path); + return r; +} + static int run_cat (const char *cmd, int argc, char *argv[]) { char *r; @@ -112,50 +278,92 @@ static int run_ls (const char *cmd, int argc, char *argv[]) return 0; } -static int run_mount (const char *cmd, int argc, char *argv[]) +static int run_list_devices (const char *cmd, int argc, char *argv[]) { - int r; - const char *device; - const char *mountpoint; - if (argc != 2) { - fprintf (stderr, "%s should have 2 parameter(s)\n", cmd); + char **r; + if (argc != 0) { + fprintf (stderr, "%s should have 0 parameter(s)\n", cmd); fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); return -1; } - device = argv[0]; - mountpoint = argv[1]; - r = guestfs_mount (g, device, mountpoint); - return r; + r = guestfs_list_devices (g); + if (r == NULL) return -1; + print_strings (r); + free_strings (r); + return 0; } -static int run_sync (const char *cmd, int argc, char *argv[]) +static int run_list_partitions (const char *cmd, int argc, char *argv[]) { - int r; + char **r; if (argc != 0) { fprintf (stderr, "%s should have 0 parameter(s)\n", cmd); fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); return -1; } - r = guestfs_sync (g); - return r; + r = guestfs_list_partitions (g); + if (r == NULL) return -1; + print_strings (r); + free_strings (r); + return 0; } -static int run_touch (const char *cmd, int argc, char *argv[]) +static int run_pvs (const char *cmd, int argc, char *argv[]) { - int r; - const char *path; - if (argc != 1) { - fprintf (stderr, "%s should have 1 parameter(s)\n", cmd); + struct guestfs_lvm_pv_list *r; + if (argc != 0) { + fprintf (stderr, "%s should have 0 parameter(s)\n", cmd); fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); return -1; } - path = argv[0]; - r = guestfs_touch (g, path); - return r; + r = guestfs_pvs (g); + if (r == NULL) return -1; + print_pv_list (r); + guestfs_free_lvm_pv_list (r); + return 0; +} + +static int run_vgs (const char *cmd, int argc, char *argv[]) +{ + struct guestfs_lvm_vg_list *r; + if (argc != 0) { + fprintf (stderr, "%s should have 0 parameter(s)\n", cmd); + fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); + return -1; + } + r = guestfs_vgs (g); + if (r == NULL) return -1; + print_vg_list (r); + guestfs_free_lvm_vg_list (r); + return 0; +} + +static int run_lvs (const char *cmd, int argc, char *argv[]) +{ + struct guestfs_lvm_lv_list *r; + if (argc != 0) { + fprintf (stderr, "%s should have 0 parameter(s)\n", cmd); + fprintf (stderr, "type 'help %s' for help on %s\n", cmd, cmd); + return -1; + } + r = guestfs_lvs (g); + if (r == NULL) return -1; + print_lv_list (r); + guestfs_free_lvm_lv_list (r); + return 0; } int run_action (const char *cmd, int argc, char *argv[]) { + if (strcasecmp (cmd, "mount") == 0) + return run_mount (cmd, argc, argv); + else + if (strcasecmp (cmd, "sync") == 0) + return run_sync (cmd, argc, argv); + else + if (strcasecmp (cmd, "touch") == 0) + return run_touch (cmd, argc, argv); + else if (strcasecmp (cmd, "cat") == 0) return run_cat (cmd, argc, argv); else @@ -165,14 +373,20 @@ int run_action (const char *cmd, int argc, char *argv[]) if (strcasecmp (cmd, "ls") == 0) return run_ls (cmd, argc, argv); else - if (strcasecmp (cmd, "mount") == 0) - return run_mount (cmd, argc, argv); + if (strcasecmp (cmd, "list_devices") == 0 || strcasecmp (cmd, "list-devices") == 0) + return run_list_devices (cmd, argc, argv); else - if (strcasecmp (cmd, "sync") == 0) - return run_sync (cmd, argc, argv); + if (strcasecmp (cmd, "list_partitions") == 0 || strcasecmp (cmd, "list-partitions") == 0) + return run_list_partitions (cmd, argc, argv); else - if (strcasecmp (cmd, "touch") == 0) - return run_touch (cmd, argc, argv); + if (strcasecmp (cmd, "pvs") == 0) + return run_pvs (cmd, argc, argv); + else + if (strcasecmp (cmd, "vgs") == 0) + return run_vgs (cmd, argc, argv); + else + if (strcasecmp (cmd, "lvs") == 0) + return run_lvs (cmd, argc, argv); else { fprintf (stderr, "%s: unknown command\n", cmd);