c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Btrfs-prog/send: fix wrong dump_fd check in cmd_send_start()

Browse source 
In cmd_send_start(), there is a check to make sure dump_fd is not a tty
before parsing command options. So if we use the option "-f file",
it doesn't work for the dump_fd has not been created. So fix it.

Signed-off-by: Cheng Yang <chenyang.fnst@cn.fujitsu.com>
This commit is contained in:
Chen Yang 2013-01-31 16:21:24 +08:00 committed by David Sterba
parent 04af04e64f
commit 73355a60aa
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmds-send.c
View file

@ -431,11 +431,6 @@ int cmd_send_start(int argc, char **argv)
memset(&send, 0, sizeof(send));
send.dump_fd = fileno(stdout);
if (isatty(send.dump_fd)) {
fprintf(stderr, "ERROR: not dumping send stream into a terminal, redirect it into a file\n");
return 1;
}
while ((c = getopt(argc, argv, "vc:f:i:p:")) != -1) {
switch (c) {
case 'v':
@ -508,6 +503,13 @@ int cmd_send_start(int argc, char **argv)
}
}
if (isatty(send.dump_fd)) {
fprintf(stderr,
"ERROR: not dumping send stream into a terminal, "
"redirect it into a file\n");
return 1;
}
/* use first send subvol to determine mount_root */
subvol = argv[optind];