From owner-svn-src-head@FreeBSD.ORG  Wed Dec 18 04:44:39 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0E5C8EEF;
 Wed, 18 Dec 2013 04:44:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EF24F11C0;
 Wed, 18 Dec 2013 04:44:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBI4icqZ015943;
 Wed, 18 Dec 2013 04:44:38 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBI4icNi015942;
 Wed, 18 Dec 2013 04:44:38 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201312180444.rBI4icNi015942@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 18 Dec 2013 04:44:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259539 - head/lib/libstand
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Dec 2013 04:44:39 -0000

Author: marcel
Date: Wed Dec 18 04:44:38 2013
New Revision: 259539
URL: http://svnweb.freebsd.org/changeset/base/259539

Log:
  Support long filenames.
  
  Obtained from:	Juniper Networks, Inc.

Modified:
  head/lib/libstand/dosfs.c

Modified: head/lib/libstand/dosfs.c
==============================================================================
--- head/lib/libstand/dosfs.c	Wed Dec 18 04:36:35 2013	(r259538)
+++ head/lib/libstand/dosfs.c	Wed Dec 18 04:44:38 2013	(r259539)
@@ -381,21 +381,32 @@ dos_readdir(struct open_file *fd, struct
 	if (dd.de.name[0] == 0xe5)
 	    continue;
 
-	/* Skip volume labels */
-	if (dd.de.attr & FA_LABEL)
-	    continue;
-
-	if ((dd.de.attr & FA_MASK) == FA_XDE) {
-	    if (dd.xde.seq & 0x40)
-		chk = dd.xde.chk;
-	    else if (dd.xde.seq != xdn - 1 || dd.xde.chk != chk)
-		continue;
-	    x = dd.xde.seq & ~0x40;
-	    if (x < 1 || x > 20) {
-		x = 0;
+	/* Check if directory entry is volume label */
+	if (dd.de.attr & FA_LABEL) {
+	    /* 
+	     * If volume label set, check if the current entry is
+	     * extended entry (FA_XDE) for long file names.
+	     */
+	    if ((dd.de.attr & FA_MASK) == FA_XDE) {
+		/*
+		 * Read through all following extended entries
+		 * to get the long file name. 0x40 marks the
+		 * last entry containing part of long file name.
+		 */
+		if (dd.xde.seq & 0x40)
+		    chk = dd.xde.chk;
+		else if (dd.xde.seq != xdn - 1 || dd.xde.chk != chk)
+		    continue;
+		x = dd.xde.seq & ~0x40;
+		if (x < 1 || x > 20) {
+		    x = 0;
+		    continue;
+		}
+		cp_xdnm(fn, &dd.xde);
+	    } else {
+		/* skip only volume label entries */
 		continue;
 	    }
-	    cp_xdnm(fn, &dd.xde);
 	} else {
 	    if (xdn == 1) {
 		x = 0;