git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: Add guestfish --live, guestmount --live options.
[libguestfs.git]
/
df
/
main.c
diff --git
a/df/main.c
b/df/main.c
index
9565464
..
174692f
100644
(file)
--- a/
df/main.c
+++ b/
df/main.c
@@
-41,6
+41,7
@@
guestfs_h *g;
int read_only = 1;
guestfs_h *g;
int read_only = 1;
+int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
@@
-238,6
+239,7
@@
main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 0);
*/
assert (read_only == 1);
assert (inspector == 0);
+ assert (live == 0);
/* Must be no extra arguments on the command line. */
if (optind != argc)
/* Must be no extra arguments on the command line. */
if (optind != argc)
@@
-279,6
+281,10
@@
main (int argc, char *argv[])
switch (drvs->type) {
case drv_a:
name = strrchr (drvs->a.filename, '/');
switch (drvs->type) {
case drv_a:
name = strrchr (drvs->a.filename, '/');
+ if (name == NULL)
+ name = drvs->a.filename;
+ else
+ name++; /* skip '/' character */
break;
case drv_d:
name = drvs->d.guest;
break;
case drv_d:
name = drvs->d.guest;