zstreamdump: replace with link to zstream

zstreamdump(8) was in quite a bad state,
and the wrapper didn't work if invoked without /sbin in $PATH

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#12015

Author: nabijaczleweli

cmd/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS  = zfs zpool zdb zhack zinject zstream zstreamdump ztest
+SUBDIRS  = zfs zpool zdb zhack zinject zstream ztest
 SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path
 SUBDIRS += zpool_influxdb
 

cmd/zstream/Makefile.am

@@ -15,3 +15,6 @@ zstream_LDADD = \
 	$(abs_top_builddir)/lib/libnvpair/libnvpair.la
 
 include $(top_srcdir)/config/CppCheck.am
+
+install-exec-hook:
+	$(LN_S) zstream $(DESTDIR)$(sbindir)/zstreamdump

cmd/zstream/zstream.c

@@ -49,6 +49,11 @@ zstream_usage(void)
 int
 main(int argc, char *argv[])
 {
+	char *basename = strrchr(argv[0], '/');
+	basename = basename ? (basename + 1) : argv[0];
+	if (argc >= 1 && strcmp(basename, "zstreamdump") == 0)
+		return (zstream_do_dump(argc, argv));
+
 	if (argc < 2)
 		zstream_usage();
 

cmd/zstreamdump/Makefile.am

@@ -48,6 +48,7 @@ AC_CONFIG_HEADERS([zfs_config.h], [
 LT_INIT
 AC_PROG_INSTALL
 AC_PROG_CC
+AC_PROG_LN_S
 PKG_PROG_PKG_CONFIG
 AM_PROG_AS
 AM_PROG_CC_C_O
@@ -83,7 +84,6 @@ AC_CONFIG_FILES([
 	cmd/zinject/Makefile
 	cmd/zpool/Makefile
 	cmd/zstream/Makefile
-	cmd/zstreamdump/Makefile
 	cmd/ztest/Makefile
 	cmd/zvol_id/Makefile
 	cmd/zvol_wait/Makefile

cmd/zstreamdump/zstreamdump

@@ -20,7 +20,7 @@
 .\"
 .\"
 .\" Copyright (c) 2020 by Delphix. All rights reserved.
-.Dd March 25, 2020
+.Dd May 8, 2021
 .Dt ZSTREAM 8
 .Os
 .Sh NAME
@@ -67,6 +67,12 @@ Print metadata for each record.
 Dump data contained in each record.
 Implies verbose.
 .El
+.Pp
+The
+.Nm zstreamdump
+alias is provided for compatibility and is equivalent to running
+.Nm
+.Cm dump .
 .It Xo
 .Nm
 .Cm token

configure.ac

@@ -0,0 +1 @@
+zstream.8