Module Name: src
Committed By: christos
Date: Tue Sep 27 01:27:44 UTC 2011
Modified Files:
src/sys/fs/cd9660: cd9660_lookup.c cd9660_rrip.c cd9660_vnops.c
Log Message:
use ISO_MAXNAMLEN instead of NAME_MAX
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/fs/cd9660/cd9660_lookup.c
cvs rdiff -u -r1.16 -r1.17 src/sys/fs/cd9660/cd9660_rrip.c
cvs rdiff -u -r1.39 -r1.40 src/sys/fs/cd9660/cd9660_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/cd9660/cd9660_lookup.c
diff -u src/sys/fs/cd9660/cd9660_lookup.c:1.18 src/sys/fs/cd9660/cd9660_lookup.c:1.19
--- src/sys/fs/cd9660/cd9660_lookup.c:1.18 Thu Jun 24 09:03:09 2010
+++ src/sys/fs/cd9660/cd9660_lookup.c Mon Sep 26 21:27:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_lookup.c,v 1.18 2010/06/24 13:03:09 hannken Exp $ */
+/* $NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.18 2010/06/24 13:03:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@@ -116,7 +116,7 @@ cd9660_lookup(void *v)
ino_t ino = 0;
int reclen;
u_short namelen;
- char altname[NAME_MAX];
+ char altname[ISO_MAXNAMLEN];
int res;
int assoc, len;
const char *name;
Index: src/sys/fs/cd9660/cd9660_rrip.c
diff -u src/sys/fs/cd9660/cd9660_rrip.c:1.16 src/sys/fs/cd9660/cd9660_rrip.c:1.17
--- src/sys/fs/cd9660/cd9660_rrip.c:1.16 Fri May 16 05:21:59 2008
+++ src/sys/fs/cd9660/cd9660_rrip.c Mon Sep 26 21:27:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_rrip.c,v 1.16 2008/05/16 09:21:59 hannken Exp $ */
+/* $NetBSD: cd9660_rrip.c,v 1.17 2011/09/27 01:27:44 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.16 2008/05/16 09:21:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.17 2011/09/27 01:27:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -620,7 +620,7 @@ cd9660_rrip_getname(struct iso_directory
analyze.outbuf = outbuf;
analyze.outlen = outlen;
- analyze.maxlen = NAME_MAX;
+ analyze.maxlen = ISO_MAXNAMLEN;
analyze.inump = inump;
analyze.imp = imp;
analyze.fields = ISO_SUSP_ALTNAME | ISO_SUSP_RELDIR | ISO_SUSP_CLINK | ISO_SUSP_PLINK;
Index: src/sys/fs/cd9660/cd9660_vnops.c
diff -u src/sys/fs/cd9660/cd9660_vnops.c:1.39 src/sys/fs/cd9660/cd9660_vnops.c:1.40
--- src/sys/fs/cd9660/cd9660_vnops.c:1.39 Mon Mar 29 09:11:32 2010
+++ src/sys/fs/cd9660/cd9660_vnops.c Mon Sep 26 21:27:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vnops.c,v 1.39 2010/03/29 13:11:32 pooka Exp $ */
+/* $NetBSD: cd9660_vnops.c,v 1.40 2011/09/27 01:27:44 christos Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.39 2010/03/29 13:11:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.40 2011/09/27 01:27:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -757,7 +757,7 @@ cd9660_pathconf(void *v)
return (0);
case _PC_NAME_MAX:
if (VTOI(ap->a_vp)->i_mnt->iso_ftype == ISO_FTYPE_RRIP)
- *ap->a_retval = NAME_MAX;
+ *ap->a_retval = ISO_MAXNAMLEN;
else
*ap->a_retval = 37;
return (0);
