Module Name: src
Committed By: christos
Date: Mon Feb 1 16:53:24 UTC 2016
Modified Files:
src/sys/fs/msdosfs: msdosfs_conv.c msdosfs_vnops.c
Log Message:
- split a long line.
- remove extra test.
- move d_namlen setting to msdosfs_vnops.c to avoid the ifdef.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/fs/msdosfs/msdosfs_conv.c
cvs rdiff -u -r1.95 -r1.96 src/sys/fs/msdosfs/msdosfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_conv.c
diff -u src/sys/fs/msdosfs/msdosfs_conv.c:1.13 src/sys/fs/msdosfs/msdosfs_conv.c:1.14
--- src/sys/fs/msdosfs/msdosfs_conv.c:1.13 Mon Feb 1 05:37:57 2016
+++ src/sys/fs/msdosfs/msdosfs_conv.c Mon Feb 1 11:53:23 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_conv.c,v 1.13 2016/02/01 10:37:57 martin Exp $ */
+/* $NetBSD: msdosfs_conv.c,v 1.14 2016/02/01 16:53:23 christos Exp $ */
/*-
* Copyright (C) 1995, 1997 Wolfgang Solfrank.
@@ -62,7 +62,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.13 2016/02/01 10:37:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.14 2016/02/01 16:53:23 christos Exp $");
/*
* System include files.
@@ -1590,9 +1590,10 @@ win2unixfn(struct winentry *wep, struct
/*
* Translate ucs-2 to UNIX name
*/
- len = utf8 ? ucs2utf8str(wn, WIN_CHARS, buf, sizeof(buf)) : ucs2char8str(wn, WIN_CHARS, buf, sizeof(buf));
+ len = utf8 ? ucs2utf8str(wn, WIN_CHARS, buf, sizeof(buf))
+ : ucs2char8str(wn, WIN_CHARS, buf, sizeof(buf));
- if (len < 0 || (size_t)len > sizeof(dp->d_name) - 1)
+ if ((size_t)len > sizeof(dp->d_name) - 1)
return -1;
/*
@@ -1612,10 +1613,6 @@ win2unixfn(struct winentry *wep, struct
memmove(&dp->d_name[len], &dp->d_name[0], *namlen - len);
memcpy(dp->d_name, buf, len);
-#ifdef __NetBSD__
- dp->d_namlen = *namlen;
-#endif
-
return chksum;
}
Index: src/sys/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.95 src/sys/fs/msdosfs/msdosfs_vnops.c:1.96
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.95 Sun Jan 31 21:59:33 2016
+++ src/sys/fs/msdosfs/msdosfs_vnops.c Mon Feb 1 11:53:23 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.95 2016/02/01 02:59:33 christos Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.96 2016/02/01 16:53:23 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.95 2016/02/01 02:59:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.96 2016/02/01 16:53:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1544,6 +1544,8 @@ msdosfs_readdir(void *v)
chksum = win2unixfn((struct winentry *)dentp,
dirbuf, chksum, &namlen,
pmp->pm_flags & MSDOSFSMNT_UTF8);
+ if (chksum != -1)
+ dirbuf->d_namlen = namlen;
continue;
}
