X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.c;h=374416e7a4a727dd3710c18923c765bc98515334;hp=d256c2b0f0c58776fb8763bb37e9e8566e1e323f;hb=843514eef9dc6d04d71e031ba9ddb16e2beb9a04;hpb=76f3ea8fb3318966c376bc6fbccbd5a81a9ec564 diff --git a/fish/fish.c b/fish/fish.c index d256c2b..374416e 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -22,7 +22,9 @@ #include #include #include +#include #include +#include #include @@ -40,6 +42,7 @@ static void shell_script (void); static void script (int prompt); static void cmdline (char *argv[], int optind, int argc); static int issue_command (const char *cmd, char *argv[]); +static int parse_size (const char *str, off_t *size_rtn); /* Currently open libguestfs handle. */ guestfs_h *g; @@ -78,13 +81,14 @@ usage (void) " ...\n" " EOF\n" "Options:\n" - " -h|--cmd-help List available commands\n" - " -h|--cmd-help cmd Display detailed help on 'cmd'\n" - " -a image Add image\n" - " -m dev[:mnt] Mount dev on mnt (if omitted, /)\n" - /*" --ro|-r All mounts are read-only\n"*/ - " -v|--verbose Verbose messages\n" - "For more information, see the manpage guestfish(1).\n"); + " -h|--cmd-help List available commands\n" + " -h|--cmd-help cmd Display detailed help on 'cmd'\n" + " -a|--add image Add image\n" + " -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n" + " -n|--no-sync Don't autosync\n" + /*" --ro|-r All mounts are read-only\n"*/ + " -v|--verbose Verbose messages\n" + "For more information, see the manpage guestfish(1).\n"); } int @@ -96,6 +100,7 @@ main (int argc, char *argv[]) { "cmd-help", 2, 0, 'h' }, { "help", 0, 0, '?' }, { "mount", 1, 0, 'm' }, + { "no-sync", 0, 0, 'n' }, { "verbose", 0, 0, 'v' }, { 0, 0, 0, 0 } }; @@ -113,6 +118,16 @@ main (int argc, char *argv[]) exit (1); } + guestfs_set_autosync (g, 1); + + /* If developing, add . to the path. Note that libtools interferes + * with this because uninstalled guestfish is a shell script that runs + * the real program with an absolute path. Detect that too. + */ + if (argv[0] && + (argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL)) + guestfs_set_path (g, ".:" GUESTFS_DEFAULT_PATH); + for (;;) { c = getopt_long (argc, argv, options, long_options, NULL); if (c == -1) break; @@ -153,6 +168,10 @@ main (int argc, char *argv[]) mps = mp->next; break; + case 'n': + guestfs_set_autosync (g, 0); + break; + case 'v': verbose++; guestfs_set_verbose (g, verbose); @@ -239,7 +258,8 @@ script (int prompt) int len, i; if (prompt) - printf ("Welcome to guestfish, the libguestfs filesystem interactive shell for\n" + printf ("\n" + "Welcome to guestfish, the libguestfs filesystem interactive shell for\n" "editing virtual machine filesystems.\n" "\n" "Type: 'help' for help with commands\n" @@ -270,7 +290,9 @@ script (int prompt) exit (1); } - (void) issue_command (cmd, argv); + if (issue_command (cmd, argv) == -1) { + if (!prompt) exit (1); + } } if (prompt) printf ("\n"); } @@ -320,10 +342,13 @@ issue_command (const char *cmd, char *argv[]) } else if (strcasecmp (cmd, "quit") == 0 || strcasecmp (cmd, "exit") == 0 || - strcasecmp (cmd, "q") == 0) - exit (0); + strcasecmp (cmd, "q") == 0) { + quit = 1; + return 0; + } else if (strcasecmp (cmd, "add") == 0 || strcasecmp (cmd, "drive") == 0 || + strcasecmp (cmd, "add-drive") == 0 || strcasecmp (cmd, "add_drive") == 0) { if (argc != 1) { fprintf (stderr, "use 'add image' to add a guest image\n"); @@ -332,15 +357,63 @@ issue_command (const char *cmd, char *argv[]) else return guestfs_add_drive (g, argv[0]); } - else if (strcasecmp (cmd, "cdrom") == 0) { + else if (strcasecmp (cmd, "cdrom") == 0 || + strcasecmp (cmd, "add-cdrom") == 0 || + strcasecmp (cmd, "add_cdrom") == 0) { if (argc != 1) { - fprintf (stderr, "use 'cdrom image' to add a guest cdrom\n"); + fprintf (stderr, "use 'cdrom image' to add a CD-ROM image\n"); return -1; } else return guestfs_add_cdrom (g, argv[0]); } - else if (strcasecmp (cmd, "launch") == 0) { + else if (strcasecmp (cmd, "alloc") == 0 || + strcasecmp (cmd, "allocate") == 0) { + if (argc != 2) { + fprintf (stderr, "use 'alloc file size' to create an image\n"); + return -1; + } + else { + off_t size; + int fd; + + if (parse_size (argv[1], &size) == -1) + return -1; + + if (g_launched) { + fprintf (stderr, "can't allocate or add disks after launching\n"); + return -1; + } + + fd = open (argv[0], O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK|O_TRUNC, 0666); + if (fd == -1) { + perror (argv[0]); + return -1; + } + + if (posix_fallocate (fd, 0, size) == -1) { + perror ("fallocate"); + close (fd); + unlink (argv[0]); + return -1; + } + + if (close (fd) == -1) { + perror (argv[0]); + unlink (argv[0]); + return -1; + } + + if (guestfs_add_drive (g, argv[0]) == -1) { + unlink (argv[0]); + return -1; + } + + return 0; + } + } + else if (strcasecmp (cmd, "launch") == 0 || + strcasecmp (cmd, "run") == 0) { if (argc != 0) { fprintf (stderr, "'launch' command takes no parameters\n"); return -1; @@ -355,26 +428,51 @@ issue_command (const char *cmd, char *argv[]) void list_builtin_commands (void) { + /* help and quit should appear at the top */ printf ("%-20s %s\n", "help", "display a list of commands or help on a command"); printf ("%-20s %s\n", "quit", "quit guestfish"); + + /* then the non-actions, in alphabetical order */ + printf ("%-20s %s\n", + "add", "add a guest image to be examined or modified"); printf ("%-20s %s\n", - "add", "add a guest image to be examined or modified"); + "alloc", "allocate an image"); printf ("%-20s %s\n", - "cdrom", "add a guest CD-ROM image to be examined"); + "cdrom", "add a CD-ROM image to be examined"); printf ("%-20s %s\n", "launch", "launch the subprocess"); + + /* actions are printed after this (see list_commands) */ } void display_builtin_command (const char *cmd) { + /* help for actions is auto-generated, see display_command */ + if (strcasecmp (cmd, "add") == 0) printf ("add - add a guest image to be examined or modified\n" " add \n"); + else if (strcasecmp (cmd, "alloc") == 0) + printf ("alloc - allocate an image\n" + " alloc \n" + "\n" + " This creates an empty (zeroed) file of the given size,\n" + " and then adds so it can be further examined.\n" + "\n" + " For more advanced image creation, see qemu-img utility.\n" + "\n" + " Size can be specified (where means a number):\n" + " number of kilobytes\n" + " eg: 1440 standard 3.5\" floppy\n" + " K or KB number of kilobytes\n" + " M or MB number of megabytes\n" + " G or GB number of gigabytes\n" + " sects number of 512 byte sectors\n"); else if (strcasecmp (cmd, "cdrom") == 0) - printf ("cdrom - add a guest CD-ROM image to be examined\n" + printf ("cdrom - add a CD-ROM image to be examined\n" " cdrom \n"); else if (strcasecmp (cmd, "help") == 0) printf ("help - display a list of commands or help on a command\n" @@ -390,3 +488,60 @@ display_builtin_command (const char *cmd) fprintf (stderr, "%s: command not known, use -h to list all commands\n", cmd); } + +/* Parse size parameter of alloc command. */ +static int +parse_size (const char *str, off_t *size_rtn) +{ + uint64_t size; + char type; + + /* Note that the parsing here is looser than what is specified in the + * help, but we may tighten it up in future so beware. + */ + if (sscanf (str, "%"SCNu64"%c", &size, &type) == 2) { + switch (type) { + case 'k': case 'K': size *= 1024; break; + case 'm': case 'M': size *= 1024 * 1024; break; + case 'g': case 'G': size *= 1024 * 1024 * 1024; break; + case 's': size *= 512; break; + default: + fprintf (stderr, "could not parse size specification '%s'\n", str); + return -1; + } + } + else if (sscanf (str, "%"SCNu64, &size) == 1) + size *= 1024; + else { + fprintf (stderr, "could not parse size specification '%s'\n", str); + return -1; + } + + printf ("size = %lu\n", size); + + /* XXX 32 bit file offsets, if anyone uses them? GCC should give + * a warning here anyhow. + */ + *size_rtn = size; + + return 0; +} + +void +free_strings (char **argv) +{ + int argc; + + for (argc = 0; argv[argc] != NULL; ++argc) + free (argv[argc]); + free (argv); +} + +void +print_strings (char **argv) +{ + int argc; + + for (argc = 0; argv[argc] != NULL; ++argc) + printf ("%s\n", argv[argc]); +}