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

[Dmitry Morozovsky]

Author: marck (doc committer)
Date: Tue Jan 29 10:21:41 2019
New Revision: 343548
URL: https://svnweb.freebsd.org/changeset/base/343548

Log:
  Allow dashes as a valid character in UFS labels.
  
  Reviewed by:	mckusick, imp, 0mp
  MFC after:	2 weeks
  Differential Revision:	D18991

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

Modified: head/sbin/newfs/newfs.8
==============================================================================
--- head/sbin/newfs/newfs.8	Tue Jan 29 09:22:20 2019	(r343547)
+++ head/sbin/newfs/newfs.8	Tue Jan 29 10:21:41 2019	(r343548)
@@ -28,7 +28,7 @@
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
 .\" $FreeBSD$
 .\"
-.Dd July 7, 2017
+.Dd January 29, 2019
 .Dt NEWFS 8
 .Os
 .Sh NAME
@@ -89,7 +89,7 @@ See
 for details.
 .It Fl L Ar volname
 Add a volume label to the new file system.
-Legal characters are alphanumerics and underscores.
+Legal characters are alphanumerics, dashes, and underscores.
 .It Fl N
 Cause the file system parameters to be printed out
 without really creating the file system.

Modified: head/sbin/newfs/newfs.c
==============================================================================
--- head/sbin/newfs/newfs.c	Tue Jan 29 09:22:20 2019	(r343547)
+++ head/sbin/newfs/newfs.c	Tue Jan 29 10:21:41 2019	(r343548)
@@ -153,10 +153,10 @@ main(int argc, char *argv[])
 			volumelabel = optarg;
 			i = -1;
 			while (isalnum(volumelabel[++i]) ||
-			    volumelabel[i] == '_');
+			    volumelabel[i] == '_' || volumelabel[i] == '-');
 			if (volumelabel[i] != '\0') {
 				errx(1, "bad volume label. Valid characters "
-				    "are alphanumerics and underscores.");
+				    "are alphanumerics, dashes, and underscores.");
 			}
 			if (strlen(volumelabel) >= MAXVOLLEN) {
 				errx(1, "bad volume label. Length is longer than %d.",

Modified: head/sbin/tunefs/tunefs.8
==============================================================================
--- head/sbin/tunefs/tunefs.8	Tue Jan 29 09:22:20 2019	(r343547)
+++ head/sbin/tunefs/tunefs.8	Tue Jan 29 10:21:41 2019	(r343548)
@@ -28,7 +28,7 @@
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd April 19, 2016
+.Dd January 29, 2019
 .Dt TUNEFS 8
 .Os
 .Sh NAME
@@ -112,7 +112,7 @@ By default
 sets it to half of the space reserved to minfree.
 .It Fl L Ar volname
 Add/modify an optional file system volume label.
-Legal characters are alphanumerics and underscores.
+Legal characters are alphanumerics, dashes, and underscores.
 .It Fl l Cm enable | disable
 Turn on/off MAC multilabel flag.
 .It Fl m Ar minfree

Modified: head/sbin/tunefs/tunefs.c
==============================================================================
--- head/sbin/tunefs/tunefs.c	Tue Jan 29 09:22:20 2019	(r343547)
+++ head/sbin/tunefs/tunefs.c	Tue Jan 29 10:21:41 2019	(r343548)
@@ -189,10 +189,13 @@ main(int argc, char *argv[])
 			name = "volume label";
 			Lvalue = optarg;
 			i = -1;
-			while (isalnum(Lvalue[++i]) || Lvalue[i] == '_');
+			while (isalnum(Lvalue[++i]) || Lvalue[i] == '_' ||
+			    Lvalue[i] == '-')
+				;
 			if (Lvalue[i] != '\0') {
 				errx(10, "bad %s. Valid characters are "
-				    "alphanumerics and underscores.", name);
+				    "alphanumerics, dashes, and underscores.",
+				    name);
 			}
 			if (strlen(Lvalue) >= MAXVOLLEN) {
 				errx(10, "bad %s. Length is longer than %d.",