From owner-svn-src-stable-11@freebsd.org  Mon May 14 19:20:38 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 D1E77E687D9;
 Mon, 14 May 2018 19:20:38 +0000 (UTC) (envelope-from pfg@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 863C772FC0;
 Mon, 14 May 2018 19:20:38 +0000 (UTC) (envelope-from pfg@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 68C8A2056B;
 Mon, 14 May 2018 19:20:38 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EJKcmP008330;
 Mon, 14 May 2018 19:20:38 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EJKcHk008329;
 Mon, 14 May 2018 19:20:38 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201805141920.w4EJKcHk008329@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 14 May 2018 19:20:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r333610 - stable/11/sys/fs/msdosfs
X-SVN-Group: stable-11
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: stable/11/sys/fs/msdosfs
X-SVN-Commit-Revision: 333610
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 May 2018 19:20:39 -0000

Author: pfg
Date: Mon May 14 19:20:37 2018
New Revision: 333610
URL: https://svnweb.freebsd.org/changeset/base/333610

Log:
  MFC r333239:
  msdosfs: long names of files are created incorrectly.
  
  This fixes a regression that happened in r120492 (2003) where libkiconv
  was introduced and we went from checking unlen to checking for '\0'.
  
  PR:		111843
  Patch by:	Damjan Jovanovic
  Approved by:	re (gjb)

Modified:
  stable/11/sys/fs/msdosfs/msdosfs_conv.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/fs/msdosfs/msdosfs_conv.c
==============================================================================
--- stable/11/sys/fs/msdosfs/msdosfs_conv.c	Mon May 14 17:49:41 2018	(r333609)
+++ stable/11/sys/fs/msdosfs/msdosfs_conv.c	Mon May 14 19:20:37 2018	(r333610)
@@ -568,7 +568,7 @@ unix2winfn(const u_char *un, size_t unlen, struct wine
 		if (!code)
 			end = WIN_LAST;
 	}
-	if (*un == '\0')
+	if (!unlen)
 		end = WIN_LAST;
 	wep->weCnt |= end;
 	return !end;