Module Name: src
Committed By: christos
Date: Wed Mar 14 00:25:19 UTC 2012
Modified Files:
src/lib/libc/compat/gen: compat___fts13.c compat___fts30.c
compat___fts31.c
src/lib/libc/gen: fts.c
Log Message:
rename the macros ftsent_ since they apply to the ftsent struct not the
fts one.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/compat/gen/compat___fts13.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/gen/compat___fts30.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat___fts31.c
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/gen/fts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compat/gen/compat___fts13.c
diff -u src/lib/libc/compat/gen/compat___fts13.c:1.8 src/lib/libc/compat/gen/compat___fts13.c:1.9
--- src/lib/libc/compat/gen/compat___fts13.c:1.8 Tue Mar 13 18:37:51 2012
+++ src/lib/libc/compat/gen/compat___fts13.c Tue Mar 13 20:25:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___fts13.c,v 1.8 2012/03/13 22:37:51 joerg Exp $ */
+/* $NetBSD: compat___fts13.c,v 1.9 2012/03/14 00:25:19 christos Exp $ */
#include "namespace.h"
#include <sys/cdefs.h>
@@ -33,12 +33,14 @@ __warn_references(__fts_set13,
#define __fts_dev_t uint32_t
#define __fts_level_t short
-#undef fts_namelen_truncate
-#define fts_namelen_truncate(a) \
+#ifndef ftsent_namelen_truncate
+#define ftsent_namelen_truncate(a) \
((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#undef fts_pathlen_truncate
+#endif
+#ifndef ftsent_pathlen_truncate
#define ftsent_pathlen_truncate(a) \
((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
+#endif
#define stat __stat13
#define lstat __lstat13
Index: src/lib/libc/compat/gen/compat___fts30.c
diff -u src/lib/libc/compat/gen/compat___fts30.c:1.5 src/lib/libc/compat/gen/compat___fts30.c:1.6
--- src/lib/libc/compat/gen/compat___fts30.c:1.5 Tue Mar 13 18:37:51 2012
+++ src/lib/libc/compat/gen/compat___fts30.c Tue Mar 13 20:25:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___fts30.c,v 1.5 2012/03/13 22:37:51 joerg Exp $ */
+/* $NetBSD: compat___fts30.c,v 1.6 2012/03/14 00:25:19 christos Exp $ */
#include "namespace.h"
#include <sys/cdefs.h>
@@ -36,13 +36,14 @@ __warn_references(__fts_set30,
#define lstat __lstat30
#define fstat __fstat30
-#ifndef fts_namelen_truncate
-#define fts_namelen_truncate(a) \
+#ifndef ftsent_namelen_truncate
+#define ftsent_namelen_truncate(a) \
((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
#endif
-#undef fts_pathlen_truncate
+#ifndef ftsent_pathlen_truncate
#define ftsent_pathlen_truncate(a) \
((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
+#endif
#undef fts_children
#define fts_children __fts_children30
Index: src/lib/libc/compat/gen/compat___fts31.c
diff -u src/lib/libc/compat/gen/compat___fts31.c:1.3 src/lib/libc/compat/gen/compat___fts31.c:1.4
--- src/lib/libc/compat/gen/compat___fts31.c:1.3 Tue Mar 13 17:13:31 2012
+++ src/lib/libc/compat/gen/compat___fts31.c Tue Mar 13 20:25:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___fts31.c,v 1.3 2012/03/13 21:13:31 christos Exp $ */
+/* $NetBSD: compat___fts31.c,v 1.4 2012/03/14 00:25:19 christos Exp $ */
#include "namespace.h"
#include <sys/cdefs.h>
@@ -31,8 +31,12 @@ __warn_references(__fts_set31,
#define __fts_dev_t uint32_t
#define __fts_level_t short
-#ifndef fts_namelen_truncate
-#define fts_namelen_truncate(a) \
+#ifndef ftsent_namelen_truncate
+#define ftsent_namelen_truncate(a) \
+ ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
+#endif
+#ifndef ftsent_pathlen_truncate
+#define ftsent_pathlen_truncate(a) \
((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
#endif
Index: src/lib/libc/gen/fts.c
diff -u src/lib/libc/gen/fts.c:1.43 src/lib/libc/gen/fts.c:1.44
--- src/lib/libc/gen/fts.c:1.43 Tue Mar 13 17:13:35 2012
+++ src/lib/libc/gen/fts.c Tue Mar 13 20:25:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fts.c,v 1.43 2012/03/13 21:13:35 christos Exp $ */
+/* $NetBSD: fts.c,v 1.44 2012/03/14 00:25:19 christos Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-__RCSID("$NetBSD: fts.c,v 1.43 2012/03/13 21:13:35 christos Exp $");
+__RCSID("$NetBSD: fts.c,v 1.44 2012/03/14 00:25:19 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -79,20 +79,20 @@ static int fts_safe_changedir(const FTS
#undef FTS_ALLOC_ALIGNED
#endif
-#ifndef fts_namelen_truncate
-#define fts_namelen_truncate(a) \
- ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
-#endif
-#ifndef fts_pathlen_truncate
-#define fts_pathlen_truncate(a) \
+#ifndef ftsent_namelen_truncate
+#define ftsent_namelen_truncate(a) \
((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
#endif
#ifndef ftsent_pathlen_truncate
#define ftsent_pathlen_truncate(a) \
((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
#endif
-#ifndef ftsent_nitems_truncate
-#define ftsent_nitems_truncate(a) \
+#ifndef fts_pathlen_truncate
+#define fts_pathlen_truncate(a) \
+ ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
+#endif
+#ifndef fts_nitems_truncate
+#define fts_nitems_truncate(a) \
((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
#endif
@@ -252,7 +252,7 @@ fts_load(FTS *sp, FTSENT *p)
if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
len = strlen(++cp);
memmove(p->fts_name, cp, len + 1);
- p->fts_namelen = fts_namelen_truncate(len);
+ p->fts_namelen = ftsent_namelen_truncate(len);
}
p->fts_accpath = p->fts_path = sp->fts_path;
sp->fts_dev = p->fts_dev;
@@ -1011,7 +1011,7 @@ fts_sort(FTS *sp, FTSENT *head, size_t n
if (new == 0)
return (head);
sp->fts_array = new;
- sp->fts_nitems = ftsent_nitems_truncate(nitems + 40);
+ sp->fts_nitems = fts_nitems_truncate(nitems + 40);
}
for (ap = sp->fts_array, p = head; p; p = p->fts_link)
*ap++ = p;
@@ -1069,7 +1069,7 @@ fts_alloc(FTS *sp, const char *name, siz
/* Copy the name plus the trailing NULL. */
memmove(p->fts_name, name, namelen + 1);
- p->fts_namelen = fts_namelen_truncate(namelen);
+ p->fts_namelen = ftsent_namelen_truncate(namelen);
p->fts_path = sp->fts_path;
p->fts_errno = 0;
p->fts_flags = 0;
