svn commit: r343483 - in head/sbin: newfs tunefs

[Kirk McKusick]

Author: mckusick
Date: Sat Jan 26 22:27:12 2019
New Revision: 343483
URL: https://svnweb.freebsd.org/changeset/base/343483

Log:
  Update tunefs and newfs error messages for the -L (volume label) option
  to note that underscores are valid.
  
  PR:           235182
  Reported by:  Rodney W. Grimes (rgrimes@)
  Sponsored by: Netflix

Modified:
  head/sbin/newfs/newfs.c
  head/sbin/tunefs/tunefs.c

Modified: head/sbin/newfs/newfs.c
==============================================================================
--- head/sbin/newfs/newfs.c	Sat Jan 26 22:24:15 2019	(r343482)
+++ head/sbin/newfs/newfs.c	Sat Jan 26 22:27:12 2019	(r343483)
@@ -155,7 +155,8 @@ main(int argc, char *argv[])
 			while (isalnum(volumelabel[++i]) ||
 			    volumelabel[i] == '_');
 			if (volumelabel[i] != '\0') {
-				errx(1, "bad volume label. Valid characters are alphanumerics.");
+				errx(1, "bad volume label. Valid characters "
+				    "are alphanumerics and underscores.");
 			}
 			if (strlen(volumelabel) >= MAXVOLLEN) {
 				errx(1, "bad volume label. Length is longer than %d.",

Modified: head/sbin/tunefs/tunefs.c
==============================================================================
--- head/sbin/tunefs/tunefs.c	Sat Jan 26 22:24:15 2019	(r343482)
+++ head/sbin/tunefs/tunefs.c	Sat Jan 26 22:27:12 2019	(r343483)
@@ -191,9 +191,8 @@ main(int argc, char *argv[])
 			i = -1;
 			while (isalnum(Lvalue[++i]) || Lvalue[i] == '_');
 			if (Lvalue[i] != '\0') {
-				errx(10,
-				"bad %s. Valid characters are alphanumerics.",
-				    name);
+				errx(10, "bad %s. Valid characters are "
+				    "alphanumerics and underscores.", name);
 			}
 			if (strlen(Lvalue) >= MAXVOLLEN) {
 				errx(10, "bad %s. Length is longer than %d.",