Deleted Added
sdiff udiff text old ( 33760 ) new ( 33768 )
full compact
msdosfs_vnops.c (33760) msdosfs_vnops.c (33768)
1/* $Id: msdosfs_vnops.c,v 1.58 1998/02/22 18:00:54 ache Exp $ */
1/* $Id: msdosfs_vnops.c,v 1.59 1998/02/23 09:39:27 ache Exp $ */
2/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
3
4/*-
5 * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
6 * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
7 * All rights reserved.
8 * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
9 *

--- 1688 unchanged lines hidden (view full) ---

1698 /*
1699 * Handle Win95 long directory entries
1700 */
1701 if (dentp->deAttributes == ATTR_WIN95) {
1702 if (pmp->pm_flags & MSDOSFSMNT_SHORTNAME)
1703 continue;
1704 chksum = win2unixfn((struct winentry *)dentp,
1705 &dirbuf, chksum,
2/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
3
4/*-
5 * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
6 * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
7 * All rights reserved.
8 * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
9 *

--- 1688 unchanged lines hidden (view full) ---

1698 /*
1699 * Handle Win95 long directory entries
1700 */
1701 if (dentp->deAttributes == ATTR_WIN95) {
1702 if (pmp->pm_flags & MSDOSFSMNT_SHORTNAME)
1703 continue;
1704 chksum = win2unixfn((struct winentry *)dentp,
1705 &dirbuf, chksum,
1706 (pmp->pm_flags & MSDOSFSMNT_U2WTABLE) ?
1707 pmp->pm_u2w : NULL);
1706 pmp->pm_flags & MSDOSFSMNT_U2WTABLE,
1707 pmp->pm_u2w);
1708 continue;
1709 }
1710
1711 /*
1712 * Skip volume labels
1713 */
1714 if (dentp->deAttributes & ATTR_VOLUME) {
1715 chksum = -1;

--- 22 unchanged lines hidden (view full) ---

1738 dirbuf.d_type = DT_DIR;
1739 } else {
1740 dirbuf.d_fileno = offset / sizeof(struct direntry);
1741 dirbuf.d_type = DT_REG;
1742 }
1743 if (chksum != winChksum(dentp->deName))
1744 dirbuf.d_namlen = dos2unixfn(dentp->deName,
1745 (u_char *)dirbuf.d_name,
1708 continue;
1709 }
1710
1711 /*
1712 * Skip volume labels
1713 */
1714 if (dentp->deAttributes & ATTR_VOLUME) {
1715 chksum = -1;

--- 22 unchanged lines hidden (view full) ---

1738 dirbuf.d_type = DT_DIR;
1739 } else {
1740 dirbuf.d_fileno = offset / sizeof(struct direntry);
1741 dirbuf.d_type = DT_REG;
1742 }
1743 if (chksum != winChksum(dentp->deName))
1744 dirbuf.d_namlen = dos2unixfn(dentp->deName,
1745 (u_char *)dirbuf.d_name,
1746 pmp->pm_flags & MSDOSFSMNT_SHORTNAME,
1747 (pmp->pm_flags & MSDOSFSMNT_ULTABLE) ?
1748 pmp->pm_ul : NULL);
1746 pmp->pm_flags & MSDOSFSMNT_U2WTABLE,
1747 pmp->pm_d2u,
1748 pmp->pm_flags & MSDOSFSMNT_ULTABLE,
1749 pmp->pm_ul);
1749 else
1750 dirbuf.d_name[dirbuf.d_namlen] = 0;
1751 chksum = -1;
1752 dirbuf.d_reclen = GENERIC_DIRSIZ(&dirbuf);
1753 if (uio->uio_resid < dirbuf.d_reclen) {
1754 brelse(bp);
1755 goto out;
1756 }

--- 218 unchanged lines hidden --- 		1750 else
1751 dirbuf.d_name[dirbuf.d_namlen] = 0;
1752 chksum = -1;
1753 dirbuf.d_reclen = GENERIC_DIRSIZ(&dirbuf);
1754 if (uio->uio_resid < dirbuf.d_reclen) {
1755 brelse(bp);
1756 goto out;
1757 }

--- 218 unchanged lines hidden ---