#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
" -v|--verbose Verbose messages\n"
" -x Echo each command before executing it\n"
" -V|--version Display version and exit\n"
- "For more information, see the manpage %s(1).\n"),
+ "For more information, see the manpage %s(1).\n"),
program_name, program_name, program_name,
program_name, program_name, program_name,
program_name, program_name, program_name);
file = optarg;
break;
- case 'h':
+ case 'h': {
+ int r = 0;
+
if (optarg)
- display_command (optarg);
+ r = display_command (optarg);
else if (argv[optind] && argv[optind][0] != '-')
- display_command (argv[optind++]);
+ r = display_command (argv[optind++]);
else
list_commands ();
- exit (EXIT_SUCCESS);
+
+ exit (r == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
+ }
case 'i':
inspector = 1;
guestfs_set_verbose (g, verbose);
break;
- case 'V':
- printf ("%s %s\n", program_name, PACKAGE_VERSION);
+ case 'V': {
+ struct guestfs_version *v = guestfs_version (g);
+ printf ("%s %"PRIi64".%"PRIi64".%"PRIi64"%s\n", program_name,
+ v->major, v->minor, v->release, v->extra);
exit (EXIT_SUCCESS);
+ }
case 'x':
guestfs_set_trace (g, 1);
/* If we've got mountpoints, we must launch the guest and mount them. */
if (mps != NULL) {
+ /* RHBZ#612178: If --listen flag is given, then we will fork into
+ * the background in rc_listen(). However you can't do this while
+ * holding a libguestfs handle open because the recovery process
+ * will think the main program has died and kill qemu. Therefore
+ * don't use the recovery process for this case. (A better
+ * solution would be to call launch () etc after the fork, but
+ * that greatly complicates the code here).
+ */
+ if (remote_control_listen)
+ guestfs_set_recovery_proc (g, 0);
+
if (launch (g) == -1) exit (EXIT_FAILURE);
mount_mps (mps);
}
/* Otherwise execute it locally. */
else if (STRCASEEQ (cmd, "help")) {
- if (argc == 0)
+ if (argc == 0) {
list_commands ();
- else
- display_command (argv[0]);
- r = 0;
+ r = 0;
+ } else
+ r = display_command (argv[0]);
}
else if (STRCASEEQ (cmd, "quit") ||
STRCASEEQ (cmd, "exit") ||
/* actions are printed after this (see list_commands) */
}
-void
+int
display_builtin_command (const char *cmd)
{
/* help for actions is auto-generated, see display_command */
if (STRCASEEQ (cmd, "alloc") ||
- STRCASEEQ (cmd, "allocate"))
+ STRCASEEQ (cmd, "allocate")) {
printf (_("alloc - allocate an image\n"
" alloc <filename> <size>\n"
"\n"
" <nn>P or <nn>PB number of petabytes\n"
" <nn>E or <nn>EB number of exabytes\n"
" <nn>sects number of 512 byte sectors\n"));
- else if (STRCASEEQ (cmd, "echo"))
+ return 0;
+ }
+ else if (STRCASEEQ (cmd, "echo")) {
printf (_("echo - display a line of text\n"
" echo [<params> ...]\n"
"\n"
" This echos the parameters to the terminal.\n"));
+ return 0;
+ }
else if (STRCASEEQ (cmd, "edit") ||
STRCASEEQ (cmd, "vi") ||
- STRCASEEQ (cmd, "emacs"))
+ STRCASEEQ (cmd, "emacs")) {
printf (_("edit - edit a file in the image\n"
" edit <filename>\n"
"\n"
"\n"
" NOTE: This will not work reliably for large files\n"
" (> 2 MB) or binary files containing \\0 bytes.\n"));
- else if (STRCASEEQ (cmd, "lcd"))
+ return 0;
+ }
+ else if (STRCASEEQ (cmd, "lcd")) {
printf (_("lcd - local change directory\n"
" lcd <directory>\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 (STRCASEEQ (cmd, "glob"))
+ return 0;
+ }
+ else if (STRCASEEQ (cmd, "glob")) {
printf (_("glob - expand wildcards in command\n"
" glob <command> [<args> ...]\n"
"\n"
" Glob runs <command> with wildcards expanded in any\n"
" command args. Note that the command is run repeatedly\n"
" once for each expanded argument.\n"));
- else if (STRCASEEQ (cmd, "help"))
+ return 0;
+ }
+ else if (STRCASEEQ (cmd, "help")) {
printf (_("help - display a list of commands or help on a command\n"
" help cmd\n"
" help\n"));
+ return 0;
+ }
else if (STRCASEEQ (cmd, "more") ||
- STRCASEEQ (cmd, "less"))
+ STRCASEEQ (cmd, "less")) {
printf (_("more - view a file in the pager\n"
" more <filename>\n"
"\n"
"\n"
" NOTE: This will not work reliably for large files\n"
" (> 2 MB) or binary files containing \\0 bytes.\n"));
+ return 0;
+ }
else if (STRCASEEQ (cmd, "quit") ||
STRCASEEQ (cmd, "exit") ||
- STRCASEEQ (cmd, "q"))
+ STRCASEEQ (cmd, "q")) {
printf (_("quit - quit guestfish\n"
" quit\n"));
- else if (STRCASEEQ (cmd, "reopen"))
+ return 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 (STRCASEEQ (cmd, "sparse"))
+ return 0;
+ }
+ else if (STRCASEEQ (cmd, "sparse")) {
printf (_("sparse - allocate a sparse image file\n"
" sparse <filename> <size>\n"
"\n"
" <nn>P or <nn>PB number of petabytes\n"
" <nn>E or <nn>EB number of exabytes\n"
" <nn>sects number of 512 byte sectors\n"));
- else if (STRCASEEQ (cmd, "time"))
+ return 0;
+ }
+ else if (STRCASEEQ (cmd, "time")) {
printf (_("time - measure time taken to run command\n"
" time <command> [<args> ...]\n"
"\n"
" This runs <command> as usual, and prints the elapsed\n"
" time afterwards.\n"));
- else
+ return 0;
+ }
+ else {
fprintf (stderr, _("%s: command not known, use -h to list all commands\n"),
cmd);
+ return -1;
+ }
}
/* This is printed when the user types in an unknown command for the
git.annexia.org / libguestfs.git / blobdiff