[Libguestfs] [PATCH 1/2] Change 'fprintf (stdout,...)' -> printf.
Richard W.M. Jones
rjones at redhat.com
Mon Oct 5 11:25:08 UTC 2015
Result of earlier copy and paste.
---
align/scan.c | 35 ++++++++++---------
cat/cat.c | 39 +++++++++++----------
cat/filesystems.c | 69 +++++++++++++++++++-------------------
cat/log.c | 35 ++++++++++---------
cat/ls.c | 61 +++++++++++++++++----------------
df/main.c | 43 ++++++++++++------------
diff/diff.c | 67 ++++++++++++++++++-------------------
edit/edit.c | 43 ++++++++++++------------
fish/fish.c | 93 +++++++++++++++++++++++++--------------------------
format/format.c | 45 ++++++++++++-------------
fuse/guestmount.c | 61 +++++++++++++++++----------------
fuse/guestunmount.c | 27 +++++++--------
inspector/inspector.c | 37 ++++++++++----------
make-fs/make-fs.c | 37 ++++++++++----------
p2v/main.c | 21 ++++++------
rescue/rescue.c | 49 +++++++++++++--------------
16 files changed, 373 insertions(+), 389 deletions(-)
diff --git a/align/scan.c b/align/scan.c
index 188450c..ef92f42 100644
--- a/align/scan.c
+++ b/align/scan.c
@@ -73,24 +73,23 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: check alignment of virtual machine partitions\n"
- "Copyright (C) 2011 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname\n"
- " %s [--options] -a disk.img [-a disk.img ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " -P nr_threads Use at most nr_threads\n"
- " -q|--quiet No output, just exit code\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: check alignment of virtual machine partitions\n"
+ "Copyright (C) 2011 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname\n"
+ " %s [--options] -a disk.img [-a disk.img ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " -P nr_threads Use at most nr_threads\n"
+ " -q|--quiet No output, just exit code\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/cat/cat.c b/cat/cat.c
index 82f0055..222cfa9 100644
--- a/cat/cat.c
+++ b/cat/cat.c
@@ -53,26 +53,25 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: display files in a virtual machine\n"
- "Copyright (C) 2010 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname file [file ...]\n"
- " %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
- " Mount dev on mnt (if omitted, /)\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: display files in a virtual machine\n"
+ "Copyright (C) 2010 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname file [file ...]\n"
+ " %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
+ " Mount dev on mnt (if omitted, /)\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/cat/filesystems.c b/cat/filesystems.c
index 0e64e00..ef4f6ba 100644
--- a/cat/filesystems.c
+++ b/cat/filesystems.c
@@ -87,41 +87,40 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: list filesystems, partitions, block devices, LVM in a VM\n"
- "Copyright (C) 2010 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname\n"
- " %s [--options] -a disk.img [-a disk.img ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " --all Display everything\n"
- " --blkdevs|--block-devices\n"
- " Display block devices\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " --csv Output as Comma-Separated Values\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " --extra Display swap and data filesystems\n"
- " --filesystems Display mountable filesystems\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " -h|--human-readable Human-readable sizes in --long output\n"
- " --help Display brief help\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " -l|--long Long output\n"
- " --lvs|--logvols|--logical-volumes\n"
- " Display LVM logical volumes\n"
- " --no-title No title in --long output\n"
- " --parts|--partitions Display partitions\n"
- " --pvs|--physvols|--physical-volumes\n"
- " Display LVM physical volumes\n"
- " --uuid|--uuids Add UUIDs to --long output\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " --vgs|--volgroups|--volume-groups\n"
- " Display LVM volume groups\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: list filesystems, partitions, block devices, LVM in a VM\n"
+ "Copyright (C) 2010 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname\n"
+ " %s [--options] -a disk.img [-a disk.img ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " --all Display everything\n"
+ " --blkdevs|--block-devices\n"
+ " Display block devices\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " --csv Output as Comma-Separated Values\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " --extra Display swap and data filesystems\n"
+ " --filesystems Display mountable filesystems\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " -h|--human-readable Human-readable sizes in --long output\n"
+ " --help Display brief help\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " -l|--long Long output\n"
+ " --lvs|--logvols|--logical-volumes\n"
+ " Display LVM logical volumes\n"
+ " --no-title No title in --long output\n"
+ " --parts|--partitions Display partitions\n"
+ " --pvs|--physvols|--physical-volumes\n"
+ " Display LVM physical volumes\n"
+ " --uuid|--uuids Add UUIDs to --long output\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " --vgs|--volgroups|--volume-groups\n"
+ " Display LVM volume groups\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/cat/log.c b/cat/log.c
index 616baed..a8e55d8 100644
--- a/cat/log.c
+++ b/cat/log.c
@@ -62,24 +62,23 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: display log files in a virtual machine\n"
- "Copyright (C) 2010-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname\n"
- " %s [--options] -a disk.img [-a disk.img ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: display log files in a virtual machine\n"
+ "Copyright (C) 2010-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname\n"
+ " %s [--options] -a disk.img [-a disk.img ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/cat/ls.c b/cat/ls.c
index 987dcef..b8f901d 100644
--- a/cat/ls.c
+++ b/cat/ls.c
@@ -83,37 +83,36 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: list files in a virtual machine\n"
- "Copyright (C) 2010-2012 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname dir [dir ...]\n"
- " %s [--options] -a disk.img [-a disk.img ...] dir [dir ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " --checksum[=...] Display file checksums\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " --csv Comma-Separated Values output\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " --extra-stats Display extra stats\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " -h|--human-readable Human-readable sizes in output\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " -l|--long Long listing\n"
- " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
- " Mount dev on mnt (if omitted, /)\n"
- " -R|--recursive Recursive listing\n"
- " --times Display file times\n"
- " --time-days Display file times as days before now\n"
- " --time-relative Display file times as seconds before now\n"
- " --time-t Display file times as time_t's\n"
- " --uids Display UID, GID\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: list files in a virtual machine\n"
+ "Copyright (C) 2010-2012 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname dir [dir ...]\n"
+ " %s [--options] -a disk.img [-a disk.img ...] dir [dir ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " --checksum[=...] Display file checksums\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " --csv Comma-Separated Values output\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " --extra-stats Display extra stats\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " -h|--human-readable Human-readable sizes in output\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " -l|--long Long listing\n"
+ " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
+ " Mount dev on mnt (if omitted, /)\n"
+ " -R|--recursive Recursive listing\n"
+ " --times Display file times\n"
+ " --time-days Display file times as days before now\n"
+ " --time-relative Display file times as seconds before now\n"
+ " --time-t Display file times as time_t's\n"
+ " --uids Display UID, GID\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/df/main.c b/df/main.c
index 517bd45..ae5f250 100644
--- a/df/main.c
+++ b/df/main.c
@@ -66,28 +66,27 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: display free space on virtual filesystems\n"
- "Copyright (C) 2010 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname\n"
- " %s [--options] -a disk.img [-a disk.img ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " --csv Output as Comma-Separated Values\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " -h|--human-readable Human-readable sizes in --long output\n"
- " --help Display brief help\n"
- " -i|--inodes Display inodes\n"
- " --one-per-guest Separate appliance per guest\n"
- " -P nr_threads Use at most nr_threads\n"
- " --uuid Add UUIDs to --long output\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: display free space on virtual filesystems\n"
+ "Copyright (C) 2010 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname\n"
+ " %s [--options] -a disk.img [-a disk.img ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " --csv Output as Comma-Separated Values\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " -h|--human-readable Human-readable sizes in --long output\n"
+ " --help Display brief help\n"
+ " -i|--inodes Display inodes\n"
+ " --one-per-guest Separate appliance per guest\n"
+ " -P nr_threads Use at most nr_threads\n"
+ " --uuid Add UUIDs to --long output\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/diff/diff.c b/diff/diff.c
index 1261439..52c29ea 100644
--- a/diff/diff.c
+++ b/diff/diff.c
@@ -92,40 +92,39 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: list differences between virtual machines\n"
- "Copyright (C) 2010-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domain1 -D domain2\n"
- " %s [--options] -a disk1.img -A disk2.img [-a|-A ...]\n"
- "Options:\n"
- " -a|--add image Add image from first guest\n"
- " --all Same as: --extra-stats --times --uids --xattrs\n"
- " --atime Don't ignore access time changes\n"
- " -A image Add image from second guest\n"
- " --checksum[=...] Use checksum of file content\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " --csv Comma-Separated Values output\n"
- " --dir-links Don't ignore directory nlink changes\n"
- " --dir-times Don't ignore directory time changes\n"
- " -d|--domain guest Add disks from first libvirt guest\n"
- " -D guest Add disks from second libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " --extra-stats Display extra stats\n"
- " --format[=raw|..] Force disk format for -a or -A option\n"
- " --help Display brief help\n"
- " -h|--human-readable Human-readable sizes in output\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " --times Display file times\n"
- " --time-days Display file times as days before now\n"
- " --time-relative Display file times as seconds before now\n"
- " --time-t Display file times as time_t's\n"
- " --uids Display UID, GID\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- " --xattrs Display extended attributes\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: list differences between virtual machines\n"
+ "Copyright (C) 2010-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domain1 -D domain2\n"
+ " %s [--options] -a disk1.img -A disk2.img [-a|-A ...]\n"
+ "Options:\n"
+ " -a|--add image Add image from first guest\n"
+ " --all Same as: --extra-stats --times --uids --xattrs\n"
+ " --atime Don't ignore access time changes\n"
+ " -A image Add image from second guest\n"
+ " --checksum[=...] Use checksum of file content\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " --csv Comma-Separated Values output\n"
+ " --dir-links Don't ignore directory nlink changes\n"
+ " --dir-times Don't ignore directory time changes\n"
+ " -d|--domain guest Add disks from first libvirt guest\n"
+ " -D guest Add disks from second libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " --extra-stats Display extra stats\n"
+ " --format[=raw|..] Force disk format for -a or -A option\n"
+ " --help Display brief help\n"
+ " -h|--human-readable Human-readable sizes in output\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " --times Display file times\n"
+ " --time-days Display file times as days before now\n"
+ " --time-relative Display file times as seconds before now\n"
+ " --time-t Display file times as time_t's\n"
+ " --uids Display UID, GID\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ " --xattrs Display extended attributes\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/edit/edit.c b/edit/edit.c
index b874492..9df99c3 100644
--- a/edit/edit.c
+++ b/edit/edit.c
@@ -63,28 +63,27 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: Edit a file in a virtual machine\n"
- "Copyright (C) 2009-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname file [file ...]\n"
- " %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " -b|--backup .ext Backup original as original.ext\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " -e|--expr expr Non-interactive editing using Perl expr\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
- " Mount dev on mnt (if omitted, /)\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: Edit a file in a virtual machine\n"
+ "Copyright (C) 2009-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname file [file ...]\n"
+ " %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " -b|--backup .ext Backup original as original.ext\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " -e|--expr expr Non-interactive editing using Perl expr\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
+ " Mount dev on mnt (if omitted, /)\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/fish/fish.c b/fish/fish.c
index c37368e..12a62a1 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -105,53 +105,52 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: guest filesystem shell\n"
- "%s lets you edit virtual machine filesystems\n"
- "Copyright (C) 2009-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] cmd [: cmd : cmd ...]\n"
- "Options:\n"
- " -h|--cmd-help List available commands\n"
- " -h|--cmd-help cmd Display detailed help on 'cmd'\n"
- " -a|--add image Add image\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " --csh Make --listen csh-compatible\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " -f|--file file Read commands from file\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " -i|--inspector Automatically mount filesystems\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " --listen Listen for remote commands\n"
- " --live Connect to a live virtual machine\n"
- " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
- " Mount dev on mnt (if omitted, /)\n"
- " --network Enable network\n"
- " -N|--new [filename=]type\n"
- " Create prepared disk (test<N>.img or filename)\n"
- " -n|--no-sync Don't autosync\n"
- " --no-dest-paths Don't tab-complete paths from guest fs\n"
- " --pipe-error Pipe commands can detect write errors\n"
- " --progress-bars Enable progress bars even when not interactive\n"
- " --no-progress-bars Disable progress bars\n"
- " --remote[=pid] Send commands to remote %s\n"
- " -r|--ro Mount read-only\n"
- " --selinux Enable SELinux support\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -w|--rw Mount read-write\n"
- " -x Echo each command before executing it\n"
- "\n"
- "To examine a disk image, ISO, hard disk, filesystem etc:\n"
- " %s [--ro|--rw] -i -a /path/to/disk.img\n"
- "or\n"
- " %s [--ro|--rw] -i -d name-of-libvirt-domain\n"
- "\n"
- "--ro recommended to avoid any writes to the disk image. If -i option fails\n"
- "run again without -i and use 'run' + 'list-filesystems' + 'mount' cmds.\n"
- "\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: guest filesystem shell\n"
+ "%s lets you edit virtual machine filesystems\n"
+ "Copyright (C) 2009-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] cmd [: cmd : cmd ...]\n"
+ "Options:\n"
+ " -h|--cmd-help List available commands\n"
+ " -h|--cmd-help cmd Display detailed help on 'cmd'\n"
+ " -a|--add image Add image\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " --csh Make --listen csh-compatible\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " -f|--file file Read commands from file\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " -i|--inspector Automatically mount filesystems\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " --listen Listen for remote commands\n"
+ " --live Connect to a live virtual machine\n"
+ " -m|--mount dev[:mnt[:opts[:fstype]]]\n"
+ " Mount dev on mnt (if omitted, /)\n"
+ " --network Enable network\n"
+ " -N|--new [filename=]type\n"
+ " Create prepared disk (test<N>.img or filename)\n"
+ " -n|--no-sync Don't autosync\n"
+ " --no-dest-paths Don't tab-complete paths from guest fs\n"
+ " --pipe-error Pipe commands can detect write errors\n"
+ " --progress-bars Enable progress bars even when not interactive\n"
+ " --no-progress-bars Disable progress bars\n"
+ " --remote[=pid] Send commands to remote %s\n"
+ " -r|--ro Mount read-only\n"
+ " --selinux Enable SELinux support\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -w|--rw Mount read-write\n"
+ " -x Echo each command before executing it\n"
+ "\n"
+ "To examine a disk image, ISO, hard disk, filesystem etc:\n"
+ " %s [--ro|--rw] -i -a /path/to/disk.img\n"
+ "or\n"
+ " %s [--ro|--rw] -i -d name-of-libvirt-domain\n"
+ "\n"
+ "--ro recommended to avoid any writes to the disk image. If -i option fails\n"
+ "run again without -i and use 'run' + 'list-filesystems' + 'mount' cmds.\n"
+ "\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
diff --git a/format/format.c b/format/format.c
index d7d531a..ba8fe8c 100644
--- a/format/format.c
+++ b/format/format.c
@@ -65,29 +65,28 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n%s\n"),
guestfs_int_program_name, warning);
else {
- fprintf (stdout,
- _("%s: erase and make a blank disk\n"
- "Copyright (C) 2012 Red Hat Inc.\n"
- "\n"
- "%s\n"
- "\n"
- "Usage:\n"
- " %s [--options] -a disk.img [-a disk.img ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " --filesystem=.. Create empty filesystem\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " --label=.. Set filesystem label\n"
- " --lvm=.. Create Linux LVM2 logical volume\n"
- " --partition=.. Create / set partition type\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " --wipe Write zeroes over whole disk\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"
- "\n"
- "%s\n\n"),
+ printf (_("%s: erase and make a blank disk\n"
+ "Copyright (C) 2012 Red Hat Inc.\n"
+ "\n"
+ "%s\n"
+ "\n"
+ "Usage:\n"
+ " %s [--options] -a disk.img [-a disk.img ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " --filesystem=.. Create empty filesystem\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " --label=.. Set filesystem label\n"
+ " --lvm=.. Create Linux LVM2 logical volume\n"
+ " --partition=.. Create / set partition type\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " --wipe Write zeroes over whole disk\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"
+ "\n"
+ "%s\n\n"),
guestfs_int_program_name, warning, guestfs_int_program_name, guestfs_int_program_name,
warning);
}
diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index 9853490..661d0b4 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -100,37 +100,36 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: FUSE module for libguestfs\n"
- "%s lets you mount a virtual machine filesystem\n"
- "Copyright (C) 2009-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] mountpoint\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " --dir-cache-timeout Set readdir cache timeout (default 5 sec)\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " --fd=FD Write to pipe FD when mountpoint is ready\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --fuse-help Display extra FUSE options\n"
- " -i|--inspector Automatically mount filesystems\n"
- " --help Display help message and exit\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " --live Connect to a live virtual machine\n"
- " -m|--mount dev[:mnt[:opts[:fstype]] Mount dev on mnt (if omitted, /)\n"
- " --no-fork Don't daemonize\n"
- " -n|--no-sync Don't autosync\n"
- " -o|--option opt Pass extra option to FUSE\n"
- " --pid-file filename Write PID to filename\n"
- " -r|--ro Mount read-only\n"
- " --selinux Enable SELinux support\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -w|--rw Mount read-write\n"
- " -x|--trace Trace guestfs API calls\n"
- ),
+ printf (_("%s: FUSE module for libguestfs\n"
+ "%s lets you mount a virtual machine filesystem\n"
+ "Copyright (C) 2009-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] mountpoint\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " --dir-cache-timeout Set readdir cache timeout (default 5 sec)\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " --fd=FD Write to pipe FD when mountpoint is ready\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --fuse-help Display extra FUSE options\n"
+ " -i|--inspector Automatically mount filesystems\n"
+ " --help Display help message and exit\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " --live Connect to a live virtual machine\n"
+ " -m|--mount dev[:mnt[:opts[:fstype]] Mount dev on mnt (if omitted, /)\n"
+ " --no-fork Don't daemonize\n"
+ " -n|--no-sync Don't autosync\n"
+ " -o|--option opt Pass extra option to FUSE\n"
+ " --pid-file filename Write PID to filename\n"
+ " -r|--ro Mount read-only\n"
+ " --selinux Enable SELinux support\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -w|--rw Mount read-write\n"
+ " -x|--trace Trace guestfs API calls\n"
+ ),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name);
}
exit (status);
diff --git a/fuse/guestunmount.c b/fuse/guestunmount.c
index 9687401..c04cfad 100644
--- a/fuse/guestunmount.c
+++ b/fuse/guestunmount.c
@@ -52,20 +52,19 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: clean up a mounted filesystem\n"
- "Copyright (C) 2013 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--fd=FD] mountpoint\n"
- "Options:\n"
- " --fd=FD Pipe file descriptor to monitor\n"
- " --help Display help message and exit\n"
- " -q|--quiet Don't print fusermount errors\n"
- " --no-retry Don't retry fusermount\n"
- " --retry=N Retry fusermount N times (default: 5)\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- ),
+ printf (_("%s: clean up a mounted filesystem\n"
+ "Copyright (C) 2013 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--fd=FD] mountpoint\n"
+ "Options:\n"
+ " --fd=FD Pipe file descriptor to monitor\n"
+ " --help Display help message and exit\n"
+ " -q|--quiet Don't print fusermount errors\n"
+ " --no-retry Don't retry fusermount\n"
+ " --retry=N Retry fusermount N times (default: 5)\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ ),
guestfs_int_program_name, guestfs_int_program_name);
}
exit (status);
diff --git a/inspector/inspector.c b/inspector/inspector.c
index 70b7cd3..fd596b5 100644
--- a/inspector/inspector.c
+++ b/inspector/inspector.c
@@ -67,25 +67,24 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: display information about a virtual machine\n"
- "Copyright (C) 2010 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname file [file ...]\n"
- " %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --echo-keys Don't turn off echo for passphrases\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " --keys-from-stdin Read passphrases from stdin\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- " --xpath query Perform an XPath query\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: display information about a virtual machine\n"
+ "Copyright (C) 2010 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname file [file ...]\n"
+ " %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --echo-keys Don't turn off echo for passphrases\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " --keys-from-stdin Read passphrases from stdin\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ " --xpath query Perform an XPath query\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/make-fs/make-fs.c b/make-fs/make-fs.c
index 980bfeb..67b0456 100644
--- a/make-fs/make-fs.c
+++ b/make-fs/make-fs.c
@@ -74,25 +74,24 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: make a filesystem from a tar archive or files\n"
- "Copyright (C) 2010-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] input.tar output.img\n"
- " %s [--options] input.tar.gz output.img\n"
- " %s [--options] directory output.img\n"
- "Options:\n"
- " --floppy Make a virtual floppy disk\n"
- " --format=raw|qcow2|.. Set output format\n"
- " --help Display brief help\n"
- " --label=label Filesystem label\n"
- " --partition=mbr|gpt|.. Set partition type\n"
- " --size=size|+size Set size of output disk\n"
- " --type=ext4|.. Set filesystem type\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: make a filesystem from a tar archive or files\n"
+ "Copyright (C) 2010-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] input.tar output.img\n"
+ " %s [--options] input.tar.gz output.img\n"
+ " %s [--options] directory output.img\n"
+ "Options:\n"
+ " --floppy Make a virtual floppy disk\n"
+ " --format=raw|qcow2|.. Set output format\n"
+ " --help Display brief help\n"
+ " --label=label Filesystem label\n"
+ " --partition=mbr|gpt|.. Set partition type\n"
+ " --size=size|+size Set size of output disk\n"
+ " --type=ext4|.. Set filesystem type\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
diff --git a/p2v/main.c b/p2v/main.c
index d59465a..83fcd8c 100644
--- a/p2v/main.c
+++ b/p2v/main.c
@@ -65,17 +65,16 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: Convert a physical machine to use KVM\n"
- "Copyright (C) 2009-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options]\n"
- "Options:\n"
- " --help Display brief help\n"
- " --cmdline=CMDLINE Used to debug command line parsing\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: Convert a physical machine to use KVM\n"
+ "Copyright (C) 2009-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options]\n"
+ "Options:\n"
+ " --help Display brief help\n"
+ " --cmdline=CMDLINE Used to debug command line parsing\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name);
}
exit (status);
diff --git a/rescue/rescue.c b/rescue/rescue.c
index 9e0a516..f25a86b 100644
--- a/rescue/rescue.c
+++ b/rescue/rescue.c
@@ -56,31 +56,30 @@ usage (int status)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
guestfs_int_program_name);
else {
- fprintf (stdout,
- _("%s: Run a rescue shell on a virtual machine\n"
- "Copyright (C) 2009-2015 Red Hat Inc.\n"
- "Usage:\n"
- " %s [--options] -d domname\n"
- " %s [--options] -a disk.img [-a disk.img ...]\n"
- "Options:\n"
- " -a|--add image Add image\n"
- " --append kernelopts Append kernel options\n"
- " -c|--connect uri Specify libvirt URI for -d option\n"
- " -d|--domain guest Add disks from libvirt guest\n"
- " --format[=raw|..] Force disk format for -a option\n"
- " --help Display brief help\n"
- " -m|--memsize MB Set memory size in megabytes\n"
- " --network Enable network\n"
- " -r|--ro Access read-only\n"
- " --scratch[=N] Add scratch disk(s)\n"
- " --selinux Enable SELinux\n"
- " --smp N Enable SMP with N >= 2 virtual CPUs\n"
- " --suggest Suggest mount commands for this guest\n"
- " -v|--verbose Verbose messages\n"
- " -V|--version Display version and exit\n"
- " -w|--rw Mount read-write\n"
- " -x Trace libguestfs API calls\n"
- "For more information, see the manpage %s(1).\n"),
+ printf (_("%s: Run a rescue shell on a virtual machine\n"
+ "Copyright (C) 2009-2015 Red Hat Inc.\n"
+ "Usage:\n"
+ " %s [--options] -d domname\n"
+ " %s [--options] -a disk.img [-a disk.img ...]\n"
+ "Options:\n"
+ " -a|--add image Add image\n"
+ " --append kernelopts Append kernel options\n"
+ " -c|--connect uri Specify libvirt URI for -d option\n"
+ " -d|--domain guest Add disks from libvirt guest\n"
+ " --format[=raw|..] Force disk format for -a option\n"
+ " --help Display brief help\n"
+ " -m|--memsize MB Set memory size in megabytes\n"
+ " --network Enable network\n"
+ " -r|--ro Access read-only\n"
+ " --scratch[=N] Add scratch disk(s)\n"
+ " --selinux Enable SELinux\n"
+ " --smp N Enable SMP with N >= 2 virtual CPUs\n"
+ " --suggest Suggest mount commands for this guest\n"
+ " -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
+ " -w|--rw Mount read-write\n"
+ " -x Trace libguestfs API calls\n"
+ "For more information, see the manpage %s(1).\n"),
guestfs_int_program_name, guestfs_int_program_name, guestfs_int_program_name,
guestfs_int_program_name);
}
--
2.5.0
More information about the Libguestfs
mailing list