Author: mav
Date: Fri Nov 13 09:25:47 2015
New Revision: 290755
URL: https://svnweb.freebsd.org/changeset/base/290755
Log:
MFC r289313: 5764 "zfs send -nv" directs output to stderr
Reviewed by: Matthew Ahrens <mahr...@delphix.com>
Reviewed by: Paul Dagnelie <paul.dagne...@delphix.com>
Reviewed by: Basil Crow <basil.c...@delphix.com>
Reviewed by: Steven Hartland <kill...@multiplay.co.uk>
Reviewed by: Bayard Bell <buffer.g.overf...@gmail.com>
Approved by: Dan McDonald <dan...@omniti.com>
Author: Manoj Joseph <manoj.jos...@delphix.com>
illumos/illumos-gate@dc5f28a3c341db7c241bba77ddc109c141072f27
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Nov 13 09:23:48
2015 (r290754)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Nov 13 09:25:47
2015 (r290755)
@@ -2630,6 +2630,9 @@ useful in conjunction with the
or
.Fl P
flags to determine what data will be sent.
+In this case, the verbose output will be written to
+standard output (contrast with a non-dry-run, where the stream is written
+to standard output and the verbose output goes to standard error).
.It Fl P
Print machine-parsable verbose information about the stream package generated.
.It Fl v
Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Fri Nov 13 09:23:48 2015 (r290754)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Fri Nov 13 09:25:47 2015 (r290755)
@@ -818,7 +818,8 @@ typedef struct send_dump_data {
char prevsnap[ZFS_MAXNAMELEN];
uint64_t prevsnap_obj;
boolean_t seenfrom, seento, replicate, doall, fromorigin;
- boolean_t verbose, dryrun, parsable, progress, embed_data, large_block;
+ boolean_t verbose, dryrun, parsable, progress, embed_data, std_out;
+ boolean_t large_block;
int outfd;
boolean_t err;
nvlist_t *fss;
@@ -1047,6 +1048,7 @@ dump_snapshot(zfs_handle_t *zhp, void *a
int err;
boolean_t isfromsnap, istosnap, fromorigin;
boolean_t exclude = B_FALSE;
+ FILE *fout = sdd->std_out ? stdout : stderr;
err = 0;
thissnap = strchr(zhp->zfs_name, '@') + 1;
@@ -1121,30 +1123,30 @@ dump_snapshot(zfs_handle_t *zhp, void *a
if (sdd->parsable) {
if (sdd->prevsnap[0] != '\0') {
- (void) fprintf(stderr, "incremental\t%s\t%s",
+ (void) fprintf(fout, "incremental\t%s\t%s",
sdd->prevsnap, zhp->zfs_name);
} else {
- (void) fprintf(stderr, "full\t%s",
+ (void) fprintf(fout, "full\t%s",
zhp->zfs_name);
}
} else {
- (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
+ (void) fprintf(fout, dgettext(TEXT_DOMAIN,
"send from @%s to %s"),
sdd->prevsnap, zhp->zfs_name);
}
if (err == 0) {
if (sdd->parsable) {
- (void) fprintf(stderr, "\t%llu\n",
+ (void) fprintf(fout, "\t%llu\n",
(longlong_t)size);
} else {
char buf[16];
zfs_nicenum(size, buf, sizeof (buf));
- (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
+ (void) fprintf(fout, dgettext(TEXT_DOMAIN,
" estimated size is %s\n"), buf);
}
sdd->size += size;
} else {
- (void) fprintf(stderr, "\n");
+ (void) fprintf(fout, "\n");
}
}
@@ -1388,6 +1390,7 @@ zfs_send(zfs_handle_t *zhp, const char *
int pipefd[2];
dedup_arg_t dda = { 0 };
int featureflags = 0;
+ FILE *fout;
(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
"cannot send '%s'"), zhp->zfs_name);
@@ -1515,6 +1518,9 @@ zfs_send(zfs_handle_t *zhp, const char *
sdd.filter_cb_arg = cb_arg;
if (debugnvp)
sdd.debugnv = *debugnvp;
+ if (sdd.verbose && sdd.dryrun)
+ sdd.std_out = B_TRUE;
+ fout = sdd.std_out ? stdout : stderr;
/*
* Some flags require that we place user holds on the datasets that are
@@ -1554,12 +1560,12 @@ zfs_send(zfs_handle_t *zhp, const char *
if (flags->verbose) {
if (flags->parsable) {
- (void) fprintf(stderr, "size\t%llu\n",
+ (void) fprintf(fout, "size\t%llu\n",
(longlong_t)sdd.size);
} else {
char buf[16];
zfs_nicenum(sdd.size, buf, sizeof (buf));
- (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
+ (void) fprintf(fout, dgettext(TEXT_DOMAIN,
"total estimated size is %s\n"), buf);
}
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
