From owner-svn-src-all@freebsd.org Tue Jul 31 12:44:30 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81ACE1059412; Tue, 31 Jul 2018 12:44:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 309468938C; Tue, 31 Jul 2018 12:44:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B99113CC1; Tue, 31 Jul 2018 12:44:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6VCiTPi075239; Tue, 31 Jul 2018 12:44:29 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6VCiTDD075234; Tue, 31 Jul 2018 12:44:29 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201807311244.w6VCiTDD075234@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 31 Jul 2018 12:44:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336966 - head/sys/fs/msdosfs X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/fs/msdosfs X-SVN-Commit-Revision: 336966 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2018 12:44:30 -0000 Author: emaste Date: Tue Jul 31 12:44:28 2018 New Revision: 336966 URL: https://svnweb.freebsd.org/changeset/base/336966 Log: msdosfs: trim EOL whitespace Modified: head/sys/fs/msdosfs/msdosfs_conv.c head/sys/fs/msdosfs/msdosfs_denode.c head/sys/fs/msdosfs/msdosfs_lookup.c head/sys/fs/msdosfs/msdosfs_vfsops.c head/sys/fs/msdosfs/msdosfs_vnops.c Modified: head/sys/fs/msdosfs/msdosfs_conv.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_conv.c Tue Jul 31 12:36:46 2018 (r336965) +++ head/sys/fs/msdosfs/msdosfs_conv.c Tue Jul 31 12:44:28 2018 (r336966) @@ -70,7 +70,7 @@ static uint16_t unix2winchr(const u_char **, size_t *, /* * 0 - character disallowed in long file name. - * 1 - character should be replaced by '_' in DOS file name, + * 1 - character should be replaced by '_' in DOS file name, * and generation number inserted. * 2 - character ('.' and ' ') should be skipped in DOS file name, * and generation number inserted. @@ -353,7 +353,7 @@ unix2dosfn(const u_char *un, u_char dn[12], size_t unl * Note(2003/7): It seems recent Windows has * defferent rule than this code, that Windows * ignores all dots before extension, and use all - * chars as filename except for dots. + * chars as filename except for dots. */ dp = dp1 = NULL; for (cp = un + 1, i = unlen - 1; --i >= 0;) { Modified: head/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_denode.c Tue Jul 31 12:36:46 2018 (r336965) +++ head/sys/fs/msdosfs/msdosfs_denode.c Tue Jul 31 12:44:28 2018 (r336966) @@ -383,7 +383,7 @@ detrunc(struct denode *dep, u_long length, int flags, dep->de_StartCluster = 0; eofentry = ~0; } else { - error = pcbmap(dep, de_clcount(pmp, length) - 1, 0, + error = pcbmap(dep, de_clcount(pmp, length) - 1, 0, &eofentry, 0); if (error) { #ifdef MSDOSFS_DEBUG Modified: head/sys/fs/msdosfs/msdosfs_lookup.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_lookup.c Tue Jul 31 12:36:46 2018 (r336965) +++ head/sys/fs/msdosfs/msdosfs_lookup.c Tue Jul 31 12:44:28 2018 (r336966) @@ -457,7 +457,7 @@ found: */ brelse(bp); bp = NULL; - + foundroot: /* * If we entered at foundroot, then we are looking for the . or .. @@ -1013,7 +1013,7 @@ uniqdosname(struct denode *dep, struct componentname * daddr_t bn; struct buf *bp; int error; - + if (pmp->pm_flags & MSDOSFSMNT_SHORTNAME) return (unix2dosfn((const u_char *)cnp->cn_nameptr, cp, cnp->cn_namelen, 0, pmp) ? 0 : EINVAL); Modified: head/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vfsops.c Tue Jul 31 12:36:46 2018 (r336965) +++ head/sys/fs/msdosfs/msdosfs_vfsops.c Tue Jul 31 12:44:28 2018 (r336966) @@ -320,7 +320,7 @@ msdosfs_mount(struct mount *mp) /* Now that the volume is modifiable, mark it dirty. */ error = markvoldirty(pmp, 1); if (error) - return (error); + return (error); } } /* Modified: head/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vnops.c Tue Jul 31 12:36:46 2018 (r336965) +++ head/sys/fs/msdosfs/msdosfs_vnops.c Tue Jul 31 12:44:28 2018 (r336966) @@ -289,7 +289,7 @@ msdosfs_getattr(struct vop_getattr_args *ap) mode = S_IRWXU|S_IRWXG|S_IRWXO; if (dep->de_Attributes & ATTR_READONLY) mode &= ~(S_IWUSR|S_IWGRP|S_IWOTH); - vap->va_mode = mode & + vap->va_mode = mode & (ap->a_vp->v_type == VDIR ? pmp->pm_dirmask : pmp->pm_mask); vap->va_uid = pmp->pm_uid; vap->va_gid = pmp->pm_gid;