svn commit: r297121 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Mon Mar 21 00:27:00 2016
New Revision: 297121
URL: https://svnweb.freebsd.org/changeset/base/297121

Log:
  MFC r296541: MFV r296540: 4448 zfs diff misprints unicode characters
  
  Reviewed by: Igor Kozhukhov <ikozhukhov at gmail.com>
  Reviewed by: Toomas Soome <tsoome at me.com>
  Approved by: Matthew Ahrens <mahrens at delphix.com>
  Author: Joshua M. Clulow <jmc at joyent.com>
  
  illumos/illumos-gate at b211eb9181f99c20acbf4c528f94cb44b4ca8c31

Modified:
  stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c	Mon Mar 21 00:26:14 2016	(r297120)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c	Mon Mar 21 00:27:00 2016	(r297121)
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 /*
@@ -136,12 +137,13 @@ get_stats_for_obj(differ_info_t *di, con
 static void
 stream_bytes(FILE *fp, const char *string)
 {
-	while (*string) {
-		if (*string > ' ' && *string != '\\' && *string < '\177')
-			(void) fprintf(fp, "%c", *string++);
-		else {
-			(void) fprintf(fp, "\\%03hho",
-			    (unsigned char)*string++);
+	char c;
+
+	while ((c = *string++) != '\0') {
+		if (c > ' ' && c != '\\' && c < '\177') {
+			(void) fprintf(fp, "%c", c);
+		} else {
+			(void) fprintf(fp, "\\%03o", (uint8_t)c);
 		}
 	}
 }