Date: Tue, 12 Feb 2019 13:58:16 +0000 (UTC) From: Dmitry Morozovsky <marck@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r344051 - in stable/12/sbin: newfs tunefs Message-ID: <201902121358.x1CDwGf9047873@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marck (doc committer) Date: Tue Feb 12 13:58:16 2019 New Revision: 344051 URL: https://svnweb.freebsd.org/changeset/base/344051 Log: MFC 343548: Allow dashes as a valid character in UFS labels. Modified: stable/12/sbin/newfs/newfs.8 stable/12/sbin/newfs/newfs.c stable/12/sbin/tunefs/tunefs.8 stable/12/sbin/tunefs/tunefs.c Modified: stable/12/sbin/newfs/newfs.8 ============================================================================== --- stable/12/sbin/newfs/newfs.8 Tue Feb 12 13:01:55 2019 (r344050) +++ stable/12/sbin/newfs/newfs.8 Tue Feb 12 13:58:16 2019 (r344051) @@ -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: stable/12/sbin/newfs/newfs.c ============================================================================== --- stable/12/sbin/newfs/newfs.c Tue Feb 12 13:01:55 2019 (r344050) +++ stable/12/sbin/newfs/newfs.c Tue Feb 12 13:58:16 2019 (r344051) @@ -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: stable/12/sbin/tunefs/tunefs.8 ============================================================================== --- stable/12/sbin/tunefs/tunefs.8 Tue Feb 12 13:01:55 2019 (r344050) +++ stable/12/sbin/tunefs/tunefs.8 Tue Feb 12 13:58:16 2019 (r344051) @@ -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: stable/12/sbin/tunefs/tunefs.c ============================================================================== --- stable/12/sbin/tunefs/tunefs.c Tue Feb 12 13:01:55 2019 (r344050) +++ stable/12/sbin/tunefs/tunefs.c Tue Feb 12 13:58:16 2019 (r344051) @@ -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.",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902121358.x1CDwGf9047873>