X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.c;h=61a84050df4f2dd047ed52bf49bcf49e2a3afdcb;hp=9316edaae494dadc34b31528b6f22ad18743ea1d;hb=ad752b80d7fa064b7bdd3d4c8d47c95d79265b58;hpb=22cee80bc2f631703bf417a54ef4e0f0837e921a diff --git a/fish/fish.c b/fish/fish.c index 9316eda..61a8405 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -26,9 +26,9 @@ #include #include #include -#include #include #include +#include #ifdef HAVE_LIBREADLINE #include @@ -38,6 +38,7 @@ #include #include "fish.h" +#include "c-ctype.h" #include "closeout.h" #include "progname.h" @@ -72,6 +73,7 @@ int echo_commands = 0; int remote_control_listen = 0; int remote_control = 0; int exit_on_error = 1; +int command_num = 0; int launch (guestfs_h *_g) @@ -81,8 +83,6 @@ launch (guestfs_h *_g) if (guestfs_is_config (g)) { if (guestfs_launch (g) == -1) return -1; - if (guestfs_wait_ready (g) == -1) - return -1; } return 0; } @@ -141,6 +141,10 @@ main (int argc, char *argv[]) atexit (close_stdout); + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEBASEDIR); + textdomain (PACKAGE); + enum { HELP_OPTION = CHAR_MAX + 1 }; static const char *options = "a:Df:h::im:nrv?Vx"; @@ -184,7 +188,7 @@ main (int argc, char *argv[]) g = guestfs_create (); if (g == NULL) { fprintf (stderr, _("guestfs_create: failed to create handle\n")); - exit (1); + exit (EXIT_FAILURE); } guestfs_set_autosync (g, 1); @@ -217,14 +221,14 @@ main (int argc, char *argv[]) switch (c) { case 0: /* options which are long only */ - if (strcmp (long_options[option_index].name, "listen") == 0) + if (STREQ (long_options[option_index].name, "listen")) remote_control_listen = 1; - else if (strcmp (long_options[option_index].name, "remote") == 0) { + else if (STREQ (long_options[option_index].name, "remote")) { if (optarg) { if (sscanf (optarg, "%d", &remote_control) != 1) { fprintf (stderr, _("%s: --listen=PID: PID was not a number: %s\n"), program_name, optarg); - exit (1); + exit (EXIT_FAILURE); } } else { p = getenv ("GUESTFISH_PID"); @@ -232,27 +236,27 @@ main (int argc, char *argv[]) fprintf (stderr, _("%s: remote: $GUESTFISH_PID must be set" " to the PID of the remote process\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } } - } else if (strcmp (long_options[option_index].name, "selinux") == 0) { + } else if (STREQ (long_options[option_index].name, "selinux")) { guestfs_set_selinux (g, 1); } else { fprintf (stderr, _("%s: unknown long option: %s (%d)\n"), program_name, long_options[option_index].name, option_index); - exit (1); + exit (EXIT_FAILURE); } break; case 'a': if (access (optarg, R_OK) != 0) { perror (optarg); - exit (1); + exit (EXIT_FAILURE); } drv = malloc (sizeof (struct drv)); if (!drv) { perror ("malloc"); - exit (1); + exit (EXIT_FAILURE); } drv->filename = optarg; drv->next = drvs; @@ -267,7 +271,7 @@ main (int argc, char *argv[]) if (file) { fprintf (stderr, _("%s: only one -f parameter can be given\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } file = optarg; break; @@ -279,7 +283,7 @@ main (int argc, char *argv[]) display_command (argv[optind++]); else list_commands (); - exit (0); + exit (EXIT_SUCCESS); case 'i': inspector = 1; @@ -289,7 +293,7 @@ main (int argc, char *argv[]) mp = malloc (sizeof (struct mp)); if (!mp) { perror ("malloc"); - exit (1); + exit (EXIT_FAILURE); } p = strchr (optarg, ':'); if (p) { @@ -317,17 +321,17 @@ main (int argc, char *argv[]) case 'V': printf ("%s %s\n", program_name, PACKAGE_VERSION); - exit (0); + exit (EXIT_SUCCESS); case 'x': echo_commands = 1; break; case HELP_OPTION: - usage (0); + usage (EXIT_SUCCESS); default: - usage (1); + usage (EXIT_FAILURE); } } @@ -341,13 +345,13 @@ main (int argc, char *argv[]) fprintf (stderr, _("%s: cannot use -i option with -a, -m," " --listen, --remote or --selinux\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } if (optind >= argc) { fprintf (stderr, _("%s: -i requires a libvirt domain or path(s) to disk image(s)\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } strcpy (cmd, "a=`virt-inspector"); @@ -357,7 +361,7 @@ main (int argc, char *argv[]) fprintf (stderr, _("%s: virt-inspector command too long for fixed-size buffer\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } strcat (cmd, " '"); strcat (cmd, argv[optind]); @@ -384,7 +388,7 @@ main (int argc, char *argv[]) r = system (cmd); if (r == -1) { perror ("system"); - exit (1); + exit (EXIT_FAILURE); } exit (WEXITSTATUS (r)); } @@ -394,7 +398,7 @@ main (int argc, char *argv[]) /* If we've got mountpoints, we must launch the guest and mount them. */ if (mps != NULL) { - if (launch (g) == -1) exit (1); + if (launch (g) == -1) exit (EXIT_FAILURE); mount_mps (mps); } @@ -403,7 +407,7 @@ main (int argc, char *argv[]) fprintf (stderr, _("%s: cannot use --listen and --remote options at the same time\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } if (remote_control_listen) { @@ -411,13 +415,13 @@ main (int argc, char *argv[]) fprintf (stderr, _("%s: extra parameters on the command line with --listen flag\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } if (file) { fprintf (stderr, _("%s: cannot use --listen and --file options at the same time\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } rc_listen (); } @@ -427,7 +431,7 @@ main (int argc, char *argv[]) close (0); if (open (file, O_RDONLY) == -1) { perror (file); - exit (1); + exit (EXIT_FAILURE); } } @@ -443,7 +447,7 @@ main (int argc, char *argv[]) cleanup_readline (); - exit (0); + exit (EXIT_SUCCESS); } void @@ -459,7 +463,7 @@ pod2text (const char *name, const char *shortdesc, const char *str) printf ("%s - %s\n\n%s\n", name, shortdesc, str); return; } - fprintf (fp, "=head1 %s - %s\n\n", name, shortdesc); + fprintf (fp, "=head1 NAME\n\n%s - %s\n\n", name, shortdesc); fputs (str, fp); pclose (fp); } @@ -472,12 +476,15 @@ mount_mps (struct mp *mp) if (mp) { mount_mps (mp->next); - if (!read_only) - r = guestfs_mount (g, mp->device, mp->mountpoint); - else - r = guestfs_mount_ro (g, mp->device, mp->mountpoint); + + /* Don't use guestfs_mount here because that will default to mount + * options -o sync,noatime. For more information, see guestfs(3) + * section "LIBGUESTFS GOTCHAS". + */ + const char *options = read_only ? "ro" : ""; + r = guestfs_mount_options (g, options, mp->device, mp->mountpoint); if (r == -1) - exit (1); + exit (EXIT_FAILURE); } } @@ -493,7 +500,7 @@ add_drives (struct drv *drv) else r = guestfs_add_drive_ro (g, drv->filename); if (r == -1) - exit (1); + exit (EXIT_FAILURE); } } @@ -581,7 +588,7 @@ script (int prompt) /* Skip any initial whitespace before the command. */ again: - while (*buf && isspace (*buf)) + while (*buf && c_isspace (*buf)) buf++; if (!*buf) continue; @@ -599,7 +606,7 @@ script (int prompt) (WIFSIGNALED (r) && (WTERMSIG (r) == SIGINT || WTERMSIG (r) == SIGQUIT)) || WEXITSTATUS (r) != 0) - exit (1); + exit (EXIT_FAILURE); } continue; } @@ -641,14 +648,14 @@ script (int prompt) len = strcspn (p, "\""); if (p[len] == '\0') { fprintf (stderr, _("%s: unterminated double quote\n"), program_name); - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); goto next_command; } if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) { fprintf (stderr, _("%s: command arguments not separated by whitespace\n"), program_name); - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); goto next_command; } p[len] = '\0'; @@ -658,14 +665,14 @@ script (int prompt) len = strcspn (p, "'"); if (p[len] == '\0') { fprintf (stderr, _("%s: unterminated single quote\n"), program_name); - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); goto next_command; } if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) { fprintf (stderr, _("%s: command arguments not separated by whitespace\n"), program_name); - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); goto next_command; } p[len] = '\0'; @@ -687,14 +694,14 @@ script (int prompt) if (c != 0) { fprintf (stderr, _("%s: unterminated \"[...]\" sequence\n"), program_name); - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); goto next_command; } if (*pend && (*pend != ' ' && *pend != '\t')) { fprintf (stderr, _("%s: command arguments not separated by whitespace\n"), program_name); - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); goto next_command; } *(pend-1) = '\0'; @@ -730,7 +737,7 @@ script (int prompt) if (i == sizeof argv / sizeof argv[0]) { fprintf (stderr, _("%s: too many arguments\n"), program_name); - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); goto next_command; } @@ -738,7 +745,7 @@ script (int prompt) got_command: if (issue_command (cmd, argv, pipe) == -1) { - if (exit_on_error) exit (1); + if (exit_on_error) exit (EXIT_FAILURE); } next_command:; @@ -757,21 +764,32 @@ cmdline (char *argv[], int optind, int argc) if (optind >= argc) return; cmd = argv[optind++]; - if (strcmp (cmd, ":") == 0) { + if (STREQ (cmd, ":")) { fprintf (stderr, _("%s: empty command on command line\n"), program_name); - exit (1); + exit (EXIT_FAILURE); } + + /* Allow -cmd on the command line to mean (temporarily) override + * the normal exit on error (RHBZ#578407). + */ + if (cmd[0] == '-') { + exit_on_error = 0; + cmd++; + } + params = &argv[optind]; /* Search for end of command list or ":" ... */ - while (optind < argc && strcmp (argv[optind], ":") != 0) + while (optind < argc && STRNEQ (argv[optind], ":")) optind++; if (optind == argc) { - if (issue_command (cmd, params, NULL) == -1) exit (1); + if (issue_command (cmd, params, NULL) == -1 && exit_on_error) + exit (EXIT_FAILURE); } else { argv[optind] = NULL; - if (issue_command (cmd, params, NULL) == -1) exit (1); + if (issue_command (cmd, params, NULL) == -1 && exit_on_error) + exit (EXIT_FAILURE); cmdline (argv, optind+1, argc); } } @@ -784,6 +802,9 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd) int pid = 0; int i, r; + /* This counts the commands issued, starting at 1. */ + command_num++; + if (echo_commands) { printf ("%s", cmd); for (i = 0; argv[i] != NULL; ++i) @@ -845,38 +866,40 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd) r = rc_remote (remote_control, cmd, argc, argv, exit_on_error); /* Otherwise execute it locally. */ - else if (strcasecmp (cmd, "help") == 0) { + else if (STRCASEEQ (cmd, "help")) { if (argc == 0) list_commands (); else display_command (argv[0]); r = 0; } - else if (strcasecmp (cmd, "quit") == 0 || - strcasecmp (cmd, "exit") == 0 || - strcasecmp (cmd, "q") == 0) { + else if (STRCASEEQ (cmd, "quit") || + STRCASEEQ (cmd, "exit") || + STRCASEEQ (cmd, "q")) { quit = 1; r = 0; } - else if (strcasecmp (cmd, "alloc") == 0 || - strcasecmp (cmd, "allocate") == 0) + else if (STRCASEEQ (cmd, "alloc") || + STRCASEEQ (cmd, "allocate")) r = do_alloc (cmd, argc, argv); - else if (strcasecmp (cmd, "echo") == 0) + else if (STRCASEEQ (cmd, "echo")) r = do_echo (cmd, argc, argv); - else if (strcasecmp (cmd, "edit") == 0 || - strcasecmp (cmd, "vi") == 0 || - strcasecmp (cmd, "emacs") == 0) + else if (STRCASEEQ (cmd, "edit") || + STRCASEEQ (cmd, "vi") || + STRCASEEQ (cmd, "emacs")) r = do_edit (cmd, argc, argv); - else if (strcasecmp (cmd, "lcd") == 0) + else if (STRCASEEQ (cmd, "lcd")) r = do_lcd (cmd, argc, argv); - else if (strcasecmp (cmd, "glob") == 0) + else if (STRCASEEQ (cmd, "glob")) r = do_glob (cmd, argc, argv); - else if (strcasecmp (cmd, "more") == 0 || - strcasecmp (cmd, "less") == 0) + else if (STRCASEEQ (cmd, "more") || + STRCASEEQ (cmd, "less")) r = do_more (cmd, argc, argv); - else if (strcasecmp (cmd, "reopen") == 0) + else if (STRCASEEQ (cmd, "reopen")) r = do_reopen (cmd, argc, argv); - else if (strcasecmp (cmd, "time") == 0) + else if (STRCASEEQ (cmd, "sparse")) + r = do_sparse (cmd, argc, argv); + else if (STRCASEEQ (cmd, "time")) r = do_time (cmd, argc, argv); else r = run_action (cmd, argc, argv); @@ -929,6 +952,8 @@ list_builtin_commands (void) printf ("%-20s %s\n", "reopen", _("close and reopen libguestfs handle")); printf ("%-20s %s\n", + "sparse", _("allocate a sparse image file")); + printf ("%-20s %s\n", "time", _("measure time taken to run command")); /* actions are printed after this (see list_commands) */ @@ -939,8 +964,8 @@ display_builtin_command (const char *cmd) { /* help for actions is auto-generated, see display_command */ - if (strcasecmp (cmd, "alloc") == 0 || - strcasecmp (cmd, "allocate") == 0) + if (STRCASEEQ (cmd, "alloc") || + STRCASEEQ (cmd, "allocate")) printf (_("alloc - allocate an image\n" " alloc \n" "\n" @@ -955,15 +980,18 @@ display_builtin_command (const char *cmd) " K or KB number of kilobytes\n" " M or MB number of megabytes\n" " G or GB number of gigabytes\n" + " T or TB number of terabytes\n" + " P or PB number of petabytes\n" + " E or EB number of exabytes\n" " sects number of 512 byte sectors\n")); - else if (strcasecmp (cmd, "echo") == 0) + else if (STRCASEEQ (cmd, "echo")) printf (_("echo - display a line of text\n" " echo [ ...]\n" "\n" " This echos the parameters to the terminal.\n")); - else if (strcasecmp (cmd, "edit") == 0 || - strcasecmp (cmd, "vi") == 0 || - strcasecmp (cmd, "emacs") == 0) + else if (STRCASEEQ (cmd, "edit") || + STRCASEEQ (cmd, "vi") || + STRCASEEQ (cmd, "emacs")) printf (_("edit - edit a file in the image\n" " edit \n" "\n" @@ -977,26 +1005,26 @@ display_builtin_command (const char *cmd) "\n" " NOTE: This will not work reliably for large files\n" " (> 2 MB) or binary files containing \\0 bytes.\n")); - else if (strcasecmp (cmd, "lcd") == 0) + else if (STRCASEEQ (cmd, "lcd")) printf (_("lcd - local change directory\n" " lcd \n" "\n" " Change guestfish's current directory. This command is\n" " useful if you want to download files to a particular\n" " place.\n")); - else if (strcasecmp (cmd, "glob") == 0) + else if (STRCASEEQ (cmd, "glob")) printf (_("glob - expand wildcards in command\n" " glob [ ...]\n" "\n" " Glob runs with wildcards expanded in any\n" " command args. Note that the command is run repeatedly\n" " once for each expanded argument.\n")); - else if (strcasecmp (cmd, "help") == 0) + else if (STRCASEEQ (cmd, "help")) printf (_("help - display a list of commands or help on a command\n" " help cmd\n" " help\n")); - else if (strcasecmp (cmd, "more") == 0 || - strcasecmp (cmd, "less") == 0) + else if (STRCASEEQ (cmd, "more") || + STRCASEEQ (cmd, "less")) printf (_("more - view a file in the pager\n" " more \n" "\n" @@ -1010,19 +1038,46 @@ display_builtin_command (const char *cmd) "\n" " NOTE: This will not work reliably for large files\n" " (> 2 MB) or binary files containing \\0 bytes.\n")); - else if (strcasecmp (cmd, "quit") == 0 || - strcasecmp (cmd, "exit") == 0 || - strcasecmp (cmd, "q") == 0) + else if (STRCASEEQ (cmd, "quit") || + STRCASEEQ (cmd, "exit") || + STRCASEEQ (cmd, "q")) printf (_("quit - quit guestfish\n" " quit\n")); - else if (strcasecmp (cmd, "reopen") == 0) + else if (STRCASEEQ (cmd, "reopen")) printf (_("reopen - close and reopen the libguestfs handle\n" " reopen\n" "\n" "Close and reopen the libguestfs handle. It is not necessary to use\n" "this normally, because the handle is closed properly when guestfish\n" "exits. However this is occasionally useful for testing.\n")); - else if (strcasecmp (cmd, "time") == 0) + else if (STRCASEEQ (cmd, "sparse")) + printf (_("sparse - allocate a sparse image file\n" + " sparse \n" + "\n" + " This creates an empty sparse file of the given size,\n" + " and then adds so it can be further examined.\n" + "\n" + " In all respects it works the same as the 'alloc'\n" + " command, except that the image file is allocated\n" + " sparsely, which means that disk blocks are not assigned\n" + " to the file until they are needed. Sparse disk files\n" + " only use space when written to, but they are slower\n" + " and there is a danger you could run out of real disk\n" + " space during a write operation.\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" + " T or TB number of terabytes\n" + " P or PB number of petabytes\n" + " E or EB number of exabytes\n" + " sects number of 512 byte sectors\n")); + else if (STRCASEEQ (cmd, "time")) printf (_("time - measure time taken to run command\n" " time [ ...]\n" "\n" @@ -1033,6 +1088,21 @@ display_builtin_command (const char *cmd) cmd); } +/* This is printed when the user types in an unknown command for the + * first command issued. A common case is the user doing: + * guestfish disk.img + * expecting guestfish to open 'disk.img' (in fact, this tried to + * run a command 'disk.img'). + */ +void +extended_help_message (void) +{ + fprintf (stderr, + _("Did you mean to open a disk image? guestfish -a disk.img\n" + "For a list of commands: guestfish -h\n" + "For complete documentation: man guestfish\n")); +} + void free_strings (char **argv) { @@ -1075,18 +1145,20 @@ int is_true (const char *str) { return - strcasecmp (str, "0") != 0 && - strcasecmp (str, "f") != 0 && - strcasecmp (str, "false") != 0 && - strcasecmp (str, "n") != 0 && - strcasecmp (str, "no") != 0; + STRCASENEQ (str, "0") && + STRCASENEQ (str, "f") && + STRCASENEQ (str, "false") && + STRCASENEQ (str, "n") && + STRCASENEQ (str, "no"); } /* Free strings from a non-NULL terminated char** */ static void free_n_strings (char **str, size_t len) { - for (size_t i = 0; i < len; i++) { + size_t i; + + for (i = 0; i < len; i++) { free (str[i]); } free (str); @@ -1127,7 +1199,7 @@ parse_string_list (const char *str) * as separate fragments because we can't just copy it: we have to remove * the \. */ - while (*p && (!isblank (*p) || in_quote)) { + while (*p && (!c_isblank (*p) || in_quote)) { const char *end = p; /* Check if the fragment starts with a quote */ @@ -1157,7 +1229,7 @@ parse_string_list (const char *str) perror ("realloc"); free_n_strings (argv, argv_len); free (tok); - exit (1); + exit (EXIT_FAILURE); } tok = tok_new; @@ -1203,7 +1275,7 @@ parse_string_list (const char *str) perror ("realloc"); free_n_strings (argv, argv_len-1); free (tok); - exit (1); + exit (EXIT_FAILURE); } argv = argv_new; @@ -1217,7 +1289,7 @@ parse_string_list (const char *str) if (NULL == argv_new) { perror ("realloc"); free_n_strings (argv, argv_len-1); - exit (1); + exit (EXIT_FAILURE); } argv = argv_new; @@ -1263,7 +1335,11 @@ cleanup_readline (void) } close (fd); +#ifdef HAVE_APPEND_HISTORY (void) append_history (nr_history_lines, histfile); +#else + (void) write_history (histfile); +#endif } #endif } @@ -1295,3 +1371,51 @@ xwrite (int fd, const void *v_buf, size_t len) return 0; } + +/* Resolve the special "win:..." form for Windows-specific paths. + * This always returns a newly allocated string which is freed by the + * caller function in "cmds.c". + */ +char * +resolve_win_path (const char *path) +{ + char *ret; + size_t i; + + if (STRCASENEQLEN (path, "win:", 4)) { + ret = strdup (path); + if (ret == NULL) + perror ("strdup"); + return ret; + } + + path += 4; + + /* Drop drive letter, if it's "C:". */ + if (STRCASEEQLEN (path, "c:", 2)) + path += 2; + + if (!*path) { + ret = strdup ("/"); + if (ret == NULL) + perror ("strdup"); + return ret; + } + + ret = strdup (path); + if (ret == NULL) { + perror ("strdup"); + return NULL; + } + + /* Blindly convert any backslashes into forward slashes. Is this good? */ + for (i = 0; i < strlen (ret); ++i) + if (ret[i] == '\\') + ret[i] = '/'; + + char *t = guestfs_case_sensitive_path (g, ret); + free (ret); + ret = t; + + return ret; +}