CVS commit: src/sys/dev/pci
Module Name:src Committed By: christos Date: Fri Oct 30 01:57:48 UTC 2009 Modified Files: src/sys/dev/pci: pm2reg.h Log Message: spell the guys name properly. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/pm2reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pm2reg.h diff -u src/sys/dev/pci/pm2reg.h:1.2 src/sys/dev/pci/pm2reg.h:1.3 --- src/sys/dev/pci/pm2reg.h:1.2 Wed Oct 28 00:25:13 2009 +++ src/sys/dev/pci/pm2reg.h Thu Oct 29 21:57:48 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pm2reg.h,v 1.2 2009/10/28 04:25:13 macallan Exp $ */ +/* $NetBSD: pm2reg.h,v 1.3 2009/10/30 01:57:48 christos Exp $ */ /* * Copyright (c) 2009 Michael Lorenz @@ -132,6 +132,6 @@ #define PM2FLT_PASS_SYNC 0x0400 #define PM2_RE_DDA_MODE 0x87e0 #define PM2DDA_ENABLE 0x0001 -#define PM2DDA_GORAUD 0x0002 /* flat otherwise */ +#define PM2DDA_GOURAUD 0x0002 /* flat otherwise */ #define PM2_RE_BLOCK_COLOUR 0x8ac8 #endif /* PM2_REG_H */
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Fri Oct 30 01:53:02 UTC 2009 Modified Files: src/external/bsd/byacc/dist: config_h.in Log Message: restore proper Id To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/config_h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/byacc/dist/config_h.in diff -u src/external/bsd/byacc/dist/config_h.in:1.2 src/external/bsd/byacc/dist/config_h.in:1.3 --- src/external/bsd/byacc/dist/config_h.in:1.2 Wed Oct 28 20:56:19 2009 +++ src/external/bsd/byacc/dist/config_h.in Thu Oct 29 21:53:02 2009 @@ -1,3 +1,3 @@ /* @configure_input@ */ -/* $Id: config_h.in,v 1.2 2009/10/29 00:56:19 christos Exp $ */ +/* Id: config_h.in,v 1.1 1995/01/01 19:34:59 tom Exp */ @DEFS@
CVS commit: src/usr.bin/m4
Module Name:src Committed By: joerg Date: Fri Oct 30 01:40:46 UTC 2009 Modified Files: src/usr.bin/m4: m4.1 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/m4/m4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/m4/m4.1 diff -u src/usr.bin/m4/m4.1:1.20 src/usr.bin/m4/m4.1:1.21 --- src/usr.bin/m4/m4.1:1.20 Mon Oct 26 21:11:28 2009 +++ src/usr.bin/m4/m4.1 Fri Oct 30 01:40:45 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: m4.1,v 1.20 2009/10/26 21:11:28 christos Exp $ +.\" $NetBSD: m4.1,v 1.21 2009/10/30 01:40:45 joerg Exp $ .\" @(#) $OpenBSD: m4.1,v 1.56 2009/10/14 17:19:47 sthen Exp $ .\" .\" Copyright (c) 1989, 1993 @@ -100,9 +100,7 @@ .Pp The options are as follows: .Bl -tag -width Ds -.It Fl D Ns Ar name Ns Oo -.Pf = Ns Ar value -.Oc +.It Fl D Ns Ar name Ns Op Pf = Ns Ar value Define the symbol .Ar name to have some value (or
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: christos Date: Fri Oct 30 00:53:29 UTC 2009 Modified Files: src/sys/ufs/lfs: lfs_vnops.c Log Message: compile without COMPAT_50 To generate a diff of this commit: cvs rdiff -u -r1.222 -r1.223 src/sys/ufs/lfs/lfs_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/ufs/lfs/lfs_vnops.c diff -u src/sys/ufs/lfs/lfs_vnops.c:1.222 src/sys/ufs/lfs/lfs_vnops.c:1.223 --- src/sys/ufs/lfs/lfs_vnops.c:1.222 Thu Oct 29 13:10:32 2009 +++ src/sys/ufs/lfs/lfs_vnops.c Thu Oct 29 20:53:29 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vnops.c,v 1.222 2009/10/29 17:10:32 christos Exp $ */ +/* $NetBSD: lfs_vnops.c,v 1.223 2009/10/30 00:53:29 christos Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.222 2009/10/29 17:10:32 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.223 2009/10/30 00:53:29 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1490,7 +1490,9 @@ /* FALLSTHROUGH */ case LFCNSEGWAIT: tvp = (struct timeval *)ap->a_data; +#ifdef COMPAT_50 segwait_common: +#endif /* COMPAT_50 */ mutex_enter(&lfs_lock); ++fs->lfs_sleepers; mutex_exit(&lfs_lock);
CVS commit: src/tools/lex
Module Name:src
Committed By: christos
Date: Fri Oct 30 00:30:20 UTC 2009
Modified Files:
src/tools/lex: Makefile
Log Message:
short circuit lex and yacc rules.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tools/lex/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/lex/Makefile
diff -u src/tools/lex/Makefile:1.8 src/tools/lex/Makefile:1.9
--- src/tools/lex/Makefile:1.8 Thu Oct 29 13:16:40 2009
+++ src/tools/lex/Makefile Thu Oct 29 20:30:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/10/29 17:16:40 christos Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/30 00:30:20 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}lex
HOST_SRCDIR= external/bsd/flex/bin
@@ -6,6 +6,9 @@
.include "${.CURDIR}/../Makefile.host"
HOST_CPPFLAGS+= -DM4=\"${TOOL_M4}\"
+.y.c .l.c .y.h:
+ @true
+
scan.c:
echo '#include ' >$@
parse.c:
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: christos
Date: Thu Oct 29 21:11:58 UTC 2009
Modified Files:
src/external/bsd/byacc/dist: output.c
Log Message:
fix line accounting.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/dist/output.c
diff -u src/external/bsd/byacc/dist/output.c:1.3 src/external/bsd/byacc/dist/output.c:1.4
--- src/external/bsd/byacc/dist/output.c:1.3 Thu Oct 29 17:03:59 2009
+++ src/external/bsd/byacc/dist/output.c Thu Oct 29 17:11:57 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: output.c,v 1.3 2009/10/29 21:03:59 christos Exp $ */
+/* $NetBSD: output.c,v 1.4 2009/10/29 21:11:57 christos Exp $ */
/* Id: output.c,v 1.21 2009/10/27 10:55:05 tom Exp */
#include "defs.h"
#include
-__RCSID("$NetBSD: output.c,v 1.3 2009/10/29 21:03:59 christos Exp $");
+__RCSID("$NetBSD: output.c,v 1.4 2009/10/29 21:11:57 christos Exp $");
static int nvectors;
static int nentries;
@@ -108,6 +108,7 @@
fprintf(code_file, "# define YYLEX yylex(YYLEX_PARAM)\n");
++outline;
fprintf(code_file, "#else\n");
+++outline;
if (pure_parser)
fprintf(code_file, "# define YYLEX yylex(&yylval, ");
else
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: christos
Date: Thu Oct 29 21:03:59 UTC 2009
Modified Files:
src/external/bsd/byacc/dist: defs.h output.c reader.c skeleton.c
Log Message:
Add support for pure parsers yyparse and yylex params, similar to bison.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/defs.h \
src/external/bsd/byacc/dist/output.c src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/skeleton.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/dist/defs.h
diff -u src/external/bsd/byacc/dist/defs.h:1.2 src/external/bsd/byacc/dist/defs.h:1.3
--- src/external/bsd/byacc/dist/defs.h:1.2 Wed Oct 28 20:56:19 2009
+++ src/external/bsd/byacc/dist/defs.h Thu Oct 29 17:03:59 2009
@@ -96,6 +96,9 @@
#define IDENT 9
#define EXPECT 10
#define EXPECT_RR 11
+#define PURE_PARSER 12
+#define PARSE_PARAM 13
+#define LEX_PARAM 14
/* symbol classes */
@@ -182,6 +185,13 @@
Value_t shift[1];
};
+typedef struct param param;
+struct param {
+struct param *next;
+char *name;
+char *type;
+};
+
/* the structure used to store reductions */
typedef struct reductions reductions;
@@ -223,6 +233,7 @@
extern int lineno;
extern int outline;
extern int exit_code;
+extern int pure_parser;
extern const char * const banner[];
extern const char * const tables[];
@@ -307,6 +318,9 @@
extern Value_t *itemsetend;
extern unsigned *ruleset;
+extern param *lex_param;
+extern param *parse_param;
+
/* global functions */
extern bucket *lookup(const char *);
@@ -393,7 +407,7 @@
extern void reader(void);
/* skeleton.c */
-extern void write_section(const char * const section[]);
+extern void write_section(const char * const section[], int);
/* verbose.c */
extern void verbose(void);
Index: src/external/bsd/byacc/dist/output.c
diff -u src/external/bsd/byacc/dist/output.c:1.2 src/external/bsd/byacc/dist/output.c:1.3
--- src/external/bsd/byacc/dist/output.c:1.2 Wed Oct 28 20:56:20 2009
+++ src/external/bsd/byacc/dist/output.c Thu Oct 29 17:03:59 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: output.c,v 1.2 2009/10/29 00:56:20 christos Exp $ */
+/* $NetBSD: output.c,v 1.3 2009/10/29 21:03:59 christos Exp $ */
/* Id: output.c,v 1.21 2009/10/27 10:55:05 tom Exp */
#include "defs.h"
#include
-__RCSID("$NetBSD: output.c,v 1.2 2009/10/29 00:56:20 christos Exp $");
+__RCSID("$NetBSD: output.c,v 1.3 2009/10/29 21:03:59 christos Exp $");
static int nvectors;
static int nentries;
@@ -55,6 +55,70 @@
}
static void
+output_yacc_decl(void)
+{
+param *p;
+++outline;
+fprintf(code_file, "/* compatibility with bison */\n");
+++outline;
+fprintf(code_file, "#ifdef YYPARSE_PARAM\n");
+++outline;
+fprintf(code_file, "/* compatibility with FreeBSD */\n");
+++outline;
+fprintf(code_file, "# ifdef YYPARSE_PARAM_TYPE\n");
+++outline;
+fprintf(code_file, "# define YYPARSE_DECL() "
+ "yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)\n");
+++outline;
+fprintf(code_file, "# else\n");
+++outline;
+fprintf(code_file, "# define YYPARSE_DECL() "
+ "yyparse(void *YYPARSE_PARAM)\n");
+++outline;
+fprintf(code_file, "# endif\n");
+++outline;
+fprintf(code_file, "#else\n");
+++outline;
+fprintf(code_file, "# define YYPARSE_DECL() yyparse(");
+if (!parse_param)
+ fprintf(code_file, "void");
+else
+ for (p = lex_param; p; p = p->next)
+ fprintf(code_file, "%s %s%s", p->type, p->name,
+ p->next ? ", " : "");
+fprintf(code_file, ")\n");
+outline += 2;
+fprintf(code_file, "#endif\n\n");
+}
+
+static void
+output_lex_decl(void)
+{
+param *p;
+++outline;
+fprintf(code_file, "/* Pure parsers. */\n");
+++outline;
+fprintf(code_file, "#define YYPURE %d\n", pure_parser);
+++outline;
+fprintf(code_file, "#ifdef YYLEX_PARAM\n");
+++outline;
+if (pure_parser)
+ fprintf(code_file, "# define YYLEX yylex(&yylval, YYLEX_PARAM)\n");
+else
+ fprintf(code_file, "# define YYLEX yylex(YYLEX_PARAM)\n");
+++outline;
+fprintf(code_file, "#else\n");
+if (pure_parser)
+ fprintf(code_file, "# define YYLEX yylex(&yylval, ");
+else
+ fprintf(code_file, "# define YYLEX yylex(");
+for (p = lex_param; p; p = p->next)
+ fprintf(code_file, "%s%s", p->name, p->next ? ", " : "");
+fprintf(code_file, ")\n");
+outline += 2;
+fprintf(code_file, "#endif\n\n");
+}
+static void
output_prefix(void)
{
if (symbol_prefix == NULL)
@@ -837,7 +901,8 @@
rewind(union_file);
while ((c = getc(union_file)) != EOF)
putc(c, defines_file);
- fprintf(defines_file, " YYSTYPE;\nextern YYSTYPE %slval;\n",
+ if (!pure_parser)
+ fprintf(defines_file, " YYSTYPE;\nextern YYSTYPE %slval;\n",
symbol_prefix);
}
}
@@ -1210,6 +1275,9 @@
free_itemsets();
free_shifts();
fr
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: eeh
Date: Thu Oct 29 18:20:11 UTC 2009
Modified Files:
src/sys/ufs/lfs: lfs_vfsops.c
Log Message:
Fix up numoutput accounting.
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/sys/ufs/lfs/lfs_vfsops.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/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.278 src/sys/ufs/lfs/lfs_vfsops.c:1.279
--- src/sys/ufs/lfs/lfs_vfsops.c:1.278 Sun Sep 13 05:17:37 2009
+++ src/sys/ufs/lfs/lfs_vfsops.c Thu Oct 29 18:20:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.278 2009/09/13 05:17:37 tsutsui Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.279 2009/10/29 18:20:11 eeh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.278 2009/09/13 05:17:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.279 2009/10/29 18:20:11 eeh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -1678,10 +1678,6 @@
UVMPAGER_MAPIN_WAITOK);
}
- mutex_enter(&vp->v_interlock);
- vp->v_numoutput += 2; /* one for biodone, one for aiodone */
- mutex_exit(&vp->v_interlock);
-
mbp = getiobuf(NULL, true);
UVMHIST_LOG(ubchist, "vp %p mbp %p num now %d bytes 0x%x",
vp, mbp, vp->v_numoutput, bytes);
@@ -1738,9 +1734,14 @@
/* if it's really one i/o, don't make a second buf */
if (offset == startoffset && iobytes == bytes) {
bp = mbp;
- /* correct overcount if there is no second buffer */
+ /*
+ * All the LFS output is done by the segwriter. It
+ * will increment numoutput by one for all the bufs it
+ * recieves. However this buffer needs one extra to
+ * account for aiodone.
+ */
mutex_enter(&vp->v_interlock);
- --vp->v_numoutput;
+ vp->v_numoutput++;
mutex_exit(&vp->v_interlock);
} else {
bp = getiobuf(NULL, true);
@@ -1754,15 +1755,6 @@
* converted this to use nestiobuf --pooka
*/
bp->b_flags &= ~B_ASYNC;
- /*
- * LFS uses VOP_BWRITE instead of VOP_STRATEGY.
- * Therefore biodone doesn't get called for
- * the buffer. Therefore decrement the output
- * counter that nestiobuf_setup() incremented.
- */
- mutex_enter(&vp->v_interlock);
- vp->v_numoutput--;
- mutex_exit(&vp->v_interlock);
}
/* XXX This is silly ... is this necessary? */
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: christos Date: Thu Oct 29 17:17:33 UTC 2009 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: We can rebuild our yacc generated files now To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.4 src/external/bsd/flex/bin/Makefile:1.5 --- src/external/bsd/flex/bin/Makefile:1.4 Thu Oct 29 09:03:09 2009 +++ src/external/bsd/flex/bin/Makefile Thu Oct 29 13:17:33 2009 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.4 2009/10/29 13:03:09 christos Exp $ +# $NetBSD: Makefile,v 1.5 2009/10/29 17:17:33 christos Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -37,10 +37,6 @@ tblcmp.c \ yylex.c -# Don't frob yacc files until we have a good bison -.y.c .y.h: - @true - YHEADER=1 CLEANFILES+=scan.c skel.c parse.c parse.h INCS =FlexLexer.h
CVS commit: src/external/bsd/flex/dist
Module Name:src
Committed By: christos
Date: Thu Oct 29 17:17:12 UTC 2009
Added Files:
src/external/bsd/flex/dist: initparse.c initparse.h
Removed Files:
src/external/bsd/flex/dist: parse.c parse.h
Log Message:
we can regenerate yacc files now
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/flex/dist/initparse.c \
src/external/bsd/flex/dist/initparse.h
cvs rdiff -u -r1.2 -r0 src/external/bsd/flex/dist/parse.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/parse.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/flex/dist/initparse.c
diff -u /dev/null src/external/bsd/flex/dist/initparse.c:1.1
--- /dev/null Thu Oct 29 13:17:12 2009
+++ src/external/bsd/flex/dist/initparse.c Thu Oct 29 13:17:12 2009
@@ -0,0 +1,1808 @@
+#ifndef lint
+static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
+#endif
+
+#ifdef _LIBC
+#include "namespace.h"
+#endif
+#include
+#include
+
+#define YYBYACC 1
+#define YYMAJOR 1
+#define YYMINOR 9
+
+#define YYLEX yylex()
+#define YYEMPTY(-1)
+#define yyclearin (yychar = YYEMPTY)
+#define yyerrok(yyerrflag = 0)
+#define YYRECOVERING() (yyerrflag != 0)
+
+/* compatibility with bison */
+#ifdef YYPARSE_PARAM
+/* compatibility with FreeBSD */
+#ifdef YYPARSE_PARAM_TYPE
+#define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
+#else
+#define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
+#endif
+#else
+#define YYPARSE_DECL() yyparse(void)
+#endif /* YYPARSE_PARAM */
+
+static int yygrowstack(void);
+#define YYPREFIX "yy"
+#line 37 "/usr/src/external/bsd/flex/dist/parse.y"
+/* Copyright (c) 1990 The Regents of the University of California. */
+/* All rights reserved. */
+
+/* This code is derived from software contributed to Berkeley by */
+/* Vern Paxson. */
+
+/* The United States Government has rights in this work pursuant */
+/* to contract no. DE-AC03-76SF00098 between the United States */
+/* Department of Energy and the University of California. */
+
+/* This file is part of flex. */
+
+/* Redistribution and use in source and binary forms, with or without */
+/* modification, are permitted provided that the following conditions */
+/* are met: */
+
+/* 1. Redistributions of source code must retain the above copyright */
+/* notice, this list of conditions and the following disclaimer. */
+/* 2. Redistributions in binary form must reproduce the above copyright */
+/* notice, this list of conditions and the following disclaimer in the */
+/* documentation and/or other materials provided with the distribution. */
+
+/* Neither the name of the University nor the names of its contributors */
+/* may be used to endorse or promote products derived from this software */
+/* without specific prior written permission. */
+
+/* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */
+/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
+/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
+/* PURPOSE. */
+
+#include "flexdef.h"
+#include "tables.h"
+
+int pat, scnum, eps, headcnt, trailcnt, lastchar, i, rulelen;
+int trlcontxt, xcluflg, currccl, cclsorted, varlength, variable_trail_rule;
+
+int *scon_stk;
+int scon_stk_ptr;
+
+static int madeany = false; /* whether we've made the '.' character class */
+static int ccldot, cclany;
+int previous_continued_action; /* whether the previous rule's action was '|' */
+
+#define format_warn3(fmt, a1, a2) \
+ do{ \
+char fw3_msg[MAXLINE];\
+snprintf( fw3_msg, MAXLINE,(fmt), (a1), (a2) );\
+lwarn( fw3_msg );\
+ }while(0)
+
+/* Expand a POSIX character class expression. */
+#define CCL_EXPR(func) \
+ do{ \
+ int c; \
+ for ( c = 0; c < csize; ++c ) \
+ if ( isascii(c) && func(c) ) \
+ ccladd( currccl, c ); \
+ }while(0)
+
+/* negated class */
+#define CCL_NEG_EXPR(func) \
+ do{ \
+ int c; \
+ for ( c = 0; c < csize; ++c ) \
+ if ( !func(c) ) \
+ ccladd( currccl, c ); \
+ }while(0)
+
+/* While POSIX defines isblank(), it's not ANSI C. */
+#define IS_BLANK(c) ((c) == ' ' || (c) == '\t')
+
+/* On some over-ambitious machines, such as DEC Alpha's, the default
+ * token type is "long" instead of "int"; this leads to problems with
+ * declaring yylval in flexdef.h. But so far, all the yacc's I've seen
+ * wrap their definitions of YYSTYPE with "#ifndef YYSTYPE"'s, so the
+ * following should ensure that the default token type is "int".
+ */
+#define YYSTYPE int
+
+#line 116 "/usr/src/external/bsd/flex/dist/parse.c"
+#define CHAR 257
+#define NUMBER 258
+#define SECTEND 259
+#define SCDECL 260
+#define XSCDECL 261
+#define NAME 262
+#define PREVCCL 263
+#define EOF_OP 264
+#define OPTION_OP 265
+#define OPT_OUTFILE 266
+#define OPT_PREFIX 267
+#define OPT_YYCLASS 268
+#define OPT_HEADER 269
+#define OPT_EXTRA_TYPE 270
+#define OPT_TABLES 271
+#def
CVS commit: src/tools/lex
Module Name:src
Committed By: christos
Date: Thu Oct 29 17:16:40 UTC 2009
Modified Files:
src/tools/lex: Makefile
Log Message:
use bootstrap files for yacc too.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tools/lex/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/lex/Makefile
diff -u src/tools/lex/Makefile:1.7 src/tools/lex/Makefile:1.8
--- src/tools/lex/Makefile:1.7 Mon Oct 26 17:32:14 2009
+++ src/tools/lex/Makefile Thu Oct 29 13:16:40 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/10/26 21:32:14 christos Exp $
+# $NetBSD: Makefile,v 1.8 2009/10/29 17:16:40 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}lex
HOST_SRCDIR= external/bsd/flex/bin
@@ -8,3 +8,11 @@
scan.c:
echo '#include ' >$@
+parse.c:
+ echo '#include ' >$@
+parse.h:
+ echo '#include ' >$@
+
+scan.c: parse.h
+
+CLEANFILES+=scan.c parse.c parse.h
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: christos
Date: Thu Oct 29 17:10:32 UTC 2009
Modified Files:
src/sys/ufs/lfs: lfs.h lfs_vnops.c
Log Message:
PR/42246: NAKAJIMA Yoshihiro: provide COMPAT_50 for LFS
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.221 -r1.222 src/sys/ufs/lfs/lfs_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/ufs/lfs/lfs.h
diff -u src/sys/ufs/lfs/lfs.h:1.128 src/sys/ufs/lfs/lfs.h:1.129
--- src/sys/ufs/lfs/lfs.h:1.128 Sat Jul 18 23:39:14 2009
+++ src/sys/ufs/lfs/lfs.h Thu Oct 29 13:10:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.128 2009/07/19 03:39:14 dholland Exp $ */
+/* $NetBSD: lfs.h,v 1.129 2009/10/29 17:10:32 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -66,6 +66,9 @@
#include
#include
#include
+#ifdef COMPAT_50
+#include
+#endif
/*
* Compile-time options for LFS.
@@ -1081,8 +1084,8 @@
int blkcnt; /* number of blocks */
};
-#define LFCNSEGWAITALL _FCNR_FSPRIV('L', 0, struct timeval)
-#define LFCNSEGWAIT _FCNR_FSPRIV('L', 1, struct timeval)
+#define LFCNSEGWAITALL _FCNR_FSPRIV('L', 14, struct timeval)
+#define LFCNSEGWAIT _FCNR_FSPRIV('L', 15, struct timeval)
#define LFCNBMAPV _FCNRW_FSPRIV('L', 2, struct lfs_fcntl_markv)
#define LFCNMARKV _FCNRW_FSPRIV('L', 3, struct lfs_fcntl_markv)
#define LFCNRECLAIM _FCNO_FSPRIV('L', 4)
@@ -1101,12 +1104,22 @@
# define LFS_WRAP_WAITING 0x1
#define LFCNWRAPSTATUS _FCNW_FSPRIV('L', 13, int)
/* Compat */
-#define LFCNSEGWAITALL_COMPAT _FCNW_FSPRIV('L', 0, struct timeval)
-#define LFCNSEGWAIT_COMPAT _FCNW_FSPRIV('L', 1, struct timeval)
+#ifdef COMPAT_20
+#define LFCNSEGWAITALL_COMPAT _FCNW_FSPRIV('L', 0, struct timeval50)
+#define LFCNSEGWAIT_COMPAT _FCNW_FSPRIV('L', 1, struct timeval50)
+#endif
+#ifdef COMPAT_30
#define LFCNIFILEFH_COMPAT _FCNW_FSPRIV('L', 5, struct lfs_fhandle)
+#endif
+#ifdef COMPAT_40
#define LFCNIFILEFH_COMPAT2 _FCN_FSPRIV(F_FSOUT, 'L', 11, 32)
#define LFCNWRAPSTOP_COMPAT _FCNO_FSPRIV('L', 9)
#define LFCNWRAPGO_COMPAT _FCNO_FSPRIV('L', 10)
+#endif
+#ifdef COMPAT_50
+#define LFCNSEGWAITALL_COMPAT_50 _FCNR_FSPRIV('L', 0, struct timeval50)
+#define LFCNSEGWAIT_COMPAT_50 _FCNR_FSPRIV('L', 1, struct timeval50)
+#endif
#ifdef _KERNEL
/* XXX MP */
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.221 src/sys/ufs/lfs/lfs_vnops.c:1.222
--- src/sys/ufs/lfs/lfs_vnops.c:1.221 Thu May 7 16:32:51 2009
+++ src/sys/ufs/lfs/lfs_vnops.c Thu Oct 29 13:10:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.221 2009/05/07 20:32:51 elad Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.222 2009/10/29 17:10:32 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.221 2009/05/07 20:32:51 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.222 2009/10/29 17:10:32 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1426,6 +1426,9 @@
int a_fflag;
kauth_cred_t a_cred;
} */ *ap = v;
+#ifdef COMPAT_50
+ struct timeval tv;
+#endif
struct timeval *tvp;
BLOCK_INFO *blkiov;
CLEANERINFO *cip;
@@ -1463,13 +1466,31 @@
error = 0;
switch ((int)ap->a_command) {
- case LFCNSEGWAITALL:
+#ifdef COMPAT_50
+ case LFCNSEGWAITALL_COMPAT_50:
+#ifdef COMPAT_20
case LFCNSEGWAITALL_COMPAT:
+#endif
fsidp = NULL;
/* FALLSTHROUGH */
- case LFCNSEGWAIT:
+ case LFCNSEGWAIT_COMPAT_50:
+#ifdef COMPAT_20
case LFCNSEGWAIT_COMPAT:
+#endif
+ {
+ struct timeval50 *tvp50
+= (struct timeval50 *)ap->a_data;
+ timeval50_to_timeval(tvp50, &tv);
+ tvp = &tv;
+ }
+ goto segwait_common;
+#endif /* COMPAT_50 */
+ case LFCNSEGWAITALL:
+ fsidp = NULL;
+ /* FALLSTHROUGH */
+ case LFCNSEGWAIT:
tvp = (struct timeval *)ap->a_data;
+segwait_common:
mutex_enter(&lfs_lock);
++fs->lfs_sleepers;
mutex_exit(&lfs_lock);
@@ -1553,7 +1574,9 @@
return lfs_vptofh(fs->lfs_ivnode, &(fhp->fh_fid), &fh_size);
#endif
+#ifdef COMPAT_40
case LFCNIFILEFH_COMPAT2:
+#endif
case LFCNIFILEFH:
/* Return the filehandle of the Ifile */
fhp = (struct fhandle *)ap->a_data;
@@ -1583,7 +1606,9 @@
return lfs_resize_fs(fs, *(int *)ap->a_data);
case LFCNWRAPSTOP:
+#ifdef COMPAT_40
case LFCNWRAPSTOP_COMPAT:
+#endif
/*
* Hold lfs_newseg at segment 0; if requested, sleep until
* the filesystem wraps around. To support external agents
@@ -1601,8 +1626,11 @@
if (fs->lfs_nowrap == 0)
log(LOG_NOTICE, "%s: disabled log wrap\n", fs->lfs_fsmnt);
++fs->lfs_nowrap;
- if (*(int *)ap->a_data == 1 ||
- ap->a_command == LFCNWRAPSTOP_COMPAT) {
+ if (*(int *)ap->a_data == 1
+#ifdef COMPAT_40
+ || ap->a_command == LFCNWRAPSTOP_COMPAT
+#endif
+
CVS commit: src/external/bsd/flex/dist
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:49:40 UTC 2009
Modified Files:
src/external/bsd/flex/dist: initscan.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/initscan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/dist/initscan.c
diff -u src/external/bsd/flex/dist/initscan.c:1.3 src/external/bsd/flex/dist/initscan.c:1.4
--- src/external/bsd/flex/dist/initscan.c:1.3 Wed Oct 28 18:00:56 2009
+++ src/external/bsd/flex/dist/initscan.c Thu Oct 29 10:49:40 2009
@@ -1,5 +1,5 @@
-#line 3 "scan.c"
+#line 3 ""
#define YY_INT_ALIGNED short int
@@ -26,6 +26,8 @@
/* end standard C headers. */
+/* $NetBSD: initscan.c,v 1.4 2009/10/29 14:49:40 christos Exp $ */
+
/* flex integer type definitions */
#ifndef FLEXINT_H
@@ -1874,9 +1876,10 @@
#define YY_MORE_ADJ (yy_more_len)
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
-#line 1 "scan.l"
+#line 1 "/usr/src/external/bsd/flex/dist/scan.l"
+/* $NetBSD: initscan.c,v 1.4 2009/10/29 14:49:40 christos Exp $ */
/* scan.l - scanner for flex input -*-C-*- */
-#line 4 "scan.l"
+#line 6 "/usr/src/external/bsd/flex/dist/scan.l"
/* Copyright (c) 1990 The Regents of the University of California. */
/* All rights reserved. */
@@ -1944,7 +1947,7 @@
#define RETURNNAME \
if(yyleng < MAXLINE) \
{ \
- strcpy( nmstr, yytext ); \
+ strlcpy( nmstr, yytext, sizeof(nmstr) ); \
} \
else \
{ \
@@ -1976,7 +1979,7 @@
-#line 1977 "scan.c"
+#line 1983 ""
#define INITIAL 0
#define SECT2 1
@@ -2058,8 +2061,12 @@
#endif
#endif
+#ifndef YY_NO_UNPUT
+
static void yyunput (int c,char *buf_ptr );
+#endif
+
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
@@ -2107,7 +2114,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -2192,7 +2199,7 @@
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 131 "scan.l"
+#line 133 "/usr/src/external/bsd/flex/dist/scan.l"
static int bracelevel, didadef, indented_code;
static int doing_rule_action = false;
@@ -2203,7 +2210,7 @@
Char nmdef[MAXLINE];
-#line 2204 "scan.c"
+#line 2214 ""
if ( !(yy_init) )
{
@@ -2280,7 +2287,9 @@
yy_find_action:
yy_current_state = *--(yy_state_ptr);
(yy_lp) = yy_accept[yy_current_state];
+#ifdef YY_USES_REJECT
find_rule: /* we branch to this label when backing up */
+#endif
for ( ; ; ) /* until we find what rule we matched */
{
if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
@@ -2305,33 +2314,33 @@
case 1:
YY_RULE_SETUP
-#line 142 "scan.l"
+#line 144 "/usr/src/external/bsd/flex/dist/scan.l"
indented_code = true; BEGIN(CODEBLOCK);
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 143 "scan.l"
+#line 145 "/usr/src/external/bsd/flex/dist/scan.l"
ACTION_ECHO; yy_push_state( COMMENT );
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 144 "scan.l"
+#line 146 "/usr/src/external/bsd/flex/dist/scan.l"
yy_push_state( LINEDIR );
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 145 "scan.l"
+#line 147 "/usr/src/external/bsd/flex/dist/scan.l"
return SCDECL;
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 146 "scan.l"
+#line 148 "/usr/src/external/bsd/flex/dist/scan.l"
return XSCDECL;
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 147 "scan.l"
+#line 149 "/usr/src/external/bsd/flex/dist/scan.l"
{
++linenum;
line_directive_out( (FILE *) 0, 1 );
@@ -2342,7 +2351,7 @@
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 153 "scan.l"
+#line 155 "/usr/src/external/bsd/flex/dist/scan.l"
{
brace_start_line = linenum;
++linenum;
@@ -2353,17 +2362,17 @@
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 161 "scan.l"
+#line 163 "/usr/src/external/bsd/flex/dist/scan.l"
synerr( _("malformed '%top' directive") );
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 163 "scan.l"
+#line 165 "/usr/src/external/bsd/flex/dist/scan.l"
/* discard */
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 165 "scan.l"
+#line 167 "/usr/src/external/bsd/flex/dist/scan.l"
{
sectnum = 2;
bracelevel = 0;
@@ -2376,46 +2385,46 @@
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 174 "scan.l"
+#line 176 "/usr/src/external/bsd/flex/dist/scan.l"
yytext_is_array = false; ++linenum;
YY_BREAK
case 12:
/* rule 12 can match eol */
YY_RULE_SETUP
-#line 175 "scan.l"
+#line 177 "/usr/src/external/bsd/flex/dist/scan.l"
yytext_is_array = true; ++linenum;
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 177 "scan.l"
+#line 179 "/usr/src/external/bsd/flex/dist/scan.l"
BEGIN(OPTION); return OPTION_OP;
YY_BREAK
case 14:
/* rule 14 can match eol */
YY_RULE_SETUP
-#line 179 "scan.l"
+#line 1
CVS commit: src
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:49:04 UTC 2009
Modified Files:
src/crypto/dist/heimdal/lib/com_err: lex.l
src/crypto/dist/heimdal/lib/sl: lex.l slc-lex.l
src/dist/libpcap: scanner.l
src/external/gpl3/binutils/dist/ld: ldlex.l
src/gnu/dist/binutils/ld: ldlex.l
src/lib/libc/net: nslexer.l
src/sbin/cgdconfig: cgdlex.l
src/sbin/veriexecctl: veriexecctl_conf.l
src/usr.bin/fgen: fgen.l
src/usr.bin/m4: tokenizer.l
src/usr.bin/mkesdb: lex.l
src/usr.bin/xlint/lint1: scan.l
src/usr.sbin/ndiscvt: inf-token.l
Log Message:
use %option instead of #define YY_NO_...
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/dist/heimdal/lib/com_err/lex.l
cvs rdiff -u -r1.5 -r1.6 src/crypto/dist/heimdal/lib/sl/lex.l
cvs rdiff -u -r1.1 -r1.2 src/crypto/dist/heimdal/lib/sl/slc-lex.l
cvs rdiff -u -r1.2 -r1.3 src/dist/libpcap/scanner.l
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/binutils/dist/ld/ldlex.l
cvs rdiff -u -r1.1.1.3 -r1.2 src/gnu/dist/binutils/ld/ldlex.l
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/net/nslexer.l
cvs rdiff -u -r1.4 -r1.5 src/sbin/cgdconfig/cgdlex.l
cvs rdiff -u -r1.13 -r1.14 src/sbin/veriexecctl/veriexecctl_conf.l
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/fgen/fgen.l
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/m4/tokenizer.l
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/mkesdb/lex.l
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/xlint/lint1/scan.l
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/ndiscvt/inf-token.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/heimdal/lib/com_err/lex.l
diff -u src/crypto/dist/heimdal/lib/com_err/lex.l:1.3 src/crypto/dist/heimdal/lib/com_err/lex.l:1.4
--- src/crypto/dist/heimdal/lib/com_err/lex.l:1.3 Sat Mar 22 04:37:06 2008
+++ src/crypto/dist/heimdal/lib/com_err/lex.l Thu Oct 29 10:49:02 2009
@@ -45,17 +45,16 @@
#include "lex.h"
__RCSID("$Heimdal: lex.l 15143 2005-05-16 08:52:54Z lha $"
-"$NetBSD: lex.l,v 1.3 2008/03/22 08:37:06 mlelstv Exp $");
+"$NetBSD: lex.l,v 1.4 2009/10/29 14:49:02 christos Exp $");
static unsigned lineno = 1;
static int getstring(void);
-#define YY_NO_UNPUT
-
#undef ECHO
%}
+%option nounput
%%
et { return ET; }
Index: src/crypto/dist/heimdal/lib/sl/lex.l
diff -u src/crypto/dist/heimdal/lib/sl/lex.l:1.5 src/crypto/dist/heimdal/lib/sl/lex.l:1.6
--- src/crypto/dist/heimdal/lib/sl/lex.l:1.5 Sat Mar 22 04:37:23 2008
+++ src/crypto/dist/heimdal/lib/sl/lex.l Thu Oct 29 10:49:03 2009
@@ -38,17 +38,16 @@
#include "parse.h"
__RCSID("$Heimdal: lex.l 10703 2001-09-16 23:10:10Z assar $"
-"$NetBSD: lex.l,v 1.5 2008/03/22 08:37:23 mlelstv Exp $");
+"$NetBSD: lex.l,v 1.6 2009/10/29 14:49:03 christos Exp $");
static unsigned lineno = 1;
static int getstring(void);
-#define YY_NO_UNPUT
-
#undef ECHO
%}
+%option nounput
%%
command_table { return TABLE; }
Index: src/crypto/dist/heimdal/lib/sl/slc-lex.l
diff -u src/crypto/dist/heimdal/lib/sl/slc-lex.l:1.1 src/crypto/dist/heimdal/lib/sl/slc-lex.l:1.2
--- src/crypto/dist/heimdal/lib/sl/slc-lex.l:1.1 Sat Mar 22 04:37:23 2008
+++ src/crypto/dist/heimdal/lib/sl/slc-lex.l Thu Oct 29 10:49:03 2009
@@ -33,7 +33,7 @@
*/
/* $Heimdal: slc-lex.l 15118 2005-05-10 22:19:01Z lha $
- $NetBSD: slc-lex.l,v 1.1 2008/03/22 08:37:23 mlelstv Exp $ */
+ $NetBSD: slc-lex.l,v 1.2 2009/10/29 14:49:03 christos Exp $ */
#undef ECHO
@@ -48,11 +48,13 @@
static void handle_comment(void);
static char * handle_string(void);
-#define YY_NO_UNPUT
#undef ECHO
%}
+
+%option nounput
+
%%
[A-Za-z][-A-Za-z0-9_]* {
yylval.string = strdup ((const char *)yytext);
Index: src/dist/libpcap/scanner.l
diff -u src/dist/libpcap/scanner.l:1.2 src/dist/libpcap/scanner.l:1.3
--- src/dist/libpcap/scanner.l:1.2 Mon Feb 27 10:55:30 2006
+++ src/dist/libpcap/scanner.l Thu Oct 29 10:49:03 2009
@@ -22,7 +22,7 @@
#ifndef lint
static const char rcsid[] _U_ =
-"@(#) $Header: /cvsroot/src/dist/libpcap/scanner.l,v 1.2 2006/02/27 15:55:30 drochner Exp $ (LBL)";
+"@(#) $Header: /cvsroot/src/dist/libpcap/scanner.l,v 1.3 2009/10/29 14:49:03 christos Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -63,7 +63,6 @@
static inline int xdtoi(int);
#ifdef FLEX_SCANNER
-#define YY_NO_UNPUT
static YY_BUFFER_STATE in_buffer;
#else
static char *in_buffer;
@@ -166,6 +165,8 @@
V6 ({V680}|{V670}|{V671}|{V672}|{V673}|{V674}|{V675}|{V676}|{V677}|{V660}|{V661}|{V662}|{V663}|{V664}|{V665}|{V666}|{V650}|{V651}|{V652}|{V653}|{V654}|{V655}|{V640}|{V641}|{V642}|{V643}|{V644}|{V630}|{V631}|{V632}|{V633}|{V620}|{V621}|{V622}|{V610}|{V611}|{V600}|{V6604}|{V6504}|{V6514}|{V6524}|{V6534}|{V6544}|{V6554}|{V6404}|{V6414}|{V6424}|{V6434}|{V6444}|{V6304}|{V6314}|{V6324}|{V6334}|{V6204}|{V6214}|{V6224}|{V6104}|{V6114}|{V6004})
+%option nounput
+
%%
dst
CVS commit: src/external/gpl3/binutils/usr.bin/gprof
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:44:09 UTC 2009
Modified Files:
src/external/gpl3/binutils/usr.bin/gprof: Makefile
Log Message:
no need for YY_NO here.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/usr.bin/gprof/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/usr.bin/gprof/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.3 src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.4
--- src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.3 Sun Sep 27 08:58:59 2009
+++ src/external/gpl3/binutils/usr.bin/gprof/Makefile Thu Oct 29 10:44:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/09/27 12:58:59 blymn Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/29 14:44:09 christos Exp $
.include
@@ -9,7 +9,7 @@
PROG= gprof
SRCS= ${G_gprof_OBJECTS:.o=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} -DYY_NO_INPUT
+CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
LDADD= -lintl
DPADD= ${LIBINTL}
CVS commit: src/external/bsd/am-utils/bin/fsinfo
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:43:27 UTC 2009
Modified Files:
src/external/bsd/am-utils/bin/fsinfo: Makefile
Log Message:
no need for YY_NO here
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/bin/fsinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/bin/fsinfo/Makefile
diff -u src/external/bsd/am-utils/bin/fsinfo/Makefile:1.2 src/external/bsd/am-utils/bin/fsinfo/Makefile:1.3
--- src/external/bsd/am-utils/bin/fsinfo/Makefile:1.2 Mon Apr 20 12:05:29 2009
+++ src/external/bsd/am-utils/bin/fsinfo/Makefile Thu Oct 29 10:43:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/04/20 16:05:29 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/29 14:43:27 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -20,7 +20,7 @@
FSINFOOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR}
-CPPFLAGS+= -I${DIST} -I${FSINFOOBJDIR} -DYY_NO_INPUT
+CPPFLAGS+= -I${DIST} -I${FSINFOOBJDIR}
YHEADER= 1
.include
CVS commit: src/external/bsd/am-utils/bin/amd
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:42:54 UTC 2009
Modified Files:
src/external/bsd/am-utils/bin/amd: Makefile
Log Message:
no need for YY_NO here.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/bin/amd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/bin/amd/Makefile
diff -u src/external/bsd/am-utils/bin/amd/Makefile:1.3 src/external/bsd/am-utils/bin/amd/Makefile:1.4
--- src/external/bsd/am-utils/bin/amd/Makefile:1.3 Mon Apr 20 12:05:29 2009
+++ src/external/bsd/am-utils/bin/amd/Makefile Thu Oct 29 10:42:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/20 16:05:29 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/29 14:42:54 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -54,7 +54,7 @@
AMDOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR}
-CPPFLAGS+= -I${DIST} -I${AMDOBJDIR} -DYY_NO_INPUT
+CPPFLAGS+= -I${DIST} -I${AMDOBJDIR}
LDADD+= ${LIBAMU} -lrpcsvc
DPADD+= ${LIBRPCSVC}
YHEADER= 1
CVS commit: src/usr.sbin/ypserv/ypserv
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:41:02 UTC 2009
Modified Files:
src/usr.sbin/ypserv/ypserv: Makefile
Log Message:
no need for YY_NO here.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/ypserv/ypserv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ypserv/ypserv/Makefile
diff -u src/usr.sbin/ypserv/ypserv/Makefile:1.17 src/usr.sbin/ypserv/ypserv/Makefile:1.18
--- src/usr.sbin/ypserv/ypserv/Makefile:1.17 Sat May 20 16:03:28 2006
+++ src/usr.sbin/ypserv/ypserv/Makefile Thu Oct 29 10:41:02 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/20 20:03:28 christos Exp $
+# $NetBSD: Makefile,v 1.18 2009/10/29 14:41:02 christos Exp $
.include
@@ -9,7 +9,7 @@
LIBCDIR=${NETBSDSRCDIR}/lib/libc
.PATH: ${LIBCDIR}/net
-CPPFLAGS+=-DYY_NO_UNPUT -DOPTIMIZE_DB -DLIBWRAP -I. -I${LIBCDIR}/include
+CPPFLAGS+=-DOPTIMIZE_DB -DLIBWRAP -I. -I${LIBCDIR}/include
YHEADER=1
LDADD+= -lwrap -lutil
CVS commit: src/usr.sbin/wsmoused
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:40:09 UTC 2009
Modified Files:
src/usr.sbin/wsmoused: Makefile config_lex.l
Log Message:
option noinput nounput
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/wsmoused/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/wsmoused/config_lex.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/wsmoused/Makefile
diff -u src/usr.sbin/wsmoused/Makefile:1.8 src/usr.sbin/wsmoused/Makefile:1.9
--- src/usr.sbin/wsmoused/Makefile:1.8 Wed Apr 22 11:23:10 2009
+++ src/usr.sbin/wsmoused/Makefile Thu Oct 29 10:40:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/22 15:23:10 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/29 14:40:09 christos Exp $
#
WARNS?= 2 # XXX -Wcast-qual (etc)
@@ -21,7 +21,7 @@
SRCS+= selection.c
.endif
-CPPFLAGS+= -I${.CURDIR} -I. -DYY_NO_INPUT
+CPPFLAGS+= -I${.CURDIR} -I.
LDADD+= -lutil
YHEADER= yes
Index: src/usr.sbin/wsmoused/config_lex.l
diff -u src/usr.sbin/wsmoused/config_lex.l:1.6 src/usr.sbin/wsmoused/config_lex.l:1.7
--- src/usr.sbin/wsmoused/config_lex.l:1.6 Wed Oct 28 18:49:38 2009
+++ src/usr.sbin/wsmoused/config_lex.l Thu Oct 29 10:40:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: config_lex.l,v 1.6 2009/10/28 22:49:38 christos Exp $ */
+/* $NetBSD: config_lex.l,v 1.7 2009/10/29 14:40:09 christos Exp $ */
/*
* Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: config_lex.l,v 1.6 2009/10/28 22:49:38 christos Exp $");
+__RCSID("$NetBSD: config_lex.l,v 1.7 2009/10/29 14:40:09 christos Exp $");
#endif /* not lint */
#include
@@ -50,11 +50,10 @@
extern int yyerror(const char *fmt, ...);
int yylex(void);
-#define YY_NO_UNPUT
%}
-%option noyywrap
+%option noyywrap noinput nounput
STRING [\$A-Za-z\.\/_\-0-9]*
SP_STRING [\$A-Za-z\.\/_\-0-9 ]*
CVS commit: src/usr.sbin/isdn/isdnd
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:39:24 UTC 2009
Modified Files:
src/usr.sbin/isdn/isdnd: Makefile rc_scan.l
Log Message:
option noinput
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/isdn/isdnd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/isdn/isdnd/rc_scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/isdn/isdnd/Makefile
diff -u src/usr.sbin/isdn/isdnd/Makefile:1.8 src/usr.sbin/isdn/isdnd/Makefile:1.9
--- src/usr.sbin/isdn/isdnd/Makefile:1.8 Mon Apr 20 12:05:30 2009
+++ src/usr.sbin/isdn/isdnd/Makefile Thu Oct 29 10:39:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/20 16:05:30 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/29 14:39:23 christos Exp $
PROG = isdnd
SRCS = rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \
@@ -7,7 +7,7 @@
holiday.c
CPPFLAGS+= -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel
-CPPFLAGS+= -I${.CURDIR} -I${.OBJDIR} -DYY_NO_INPUT
+CPPFLAGS+= -I${.CURDIR} -I${.OBJDIR}
# compile debug support
CPPFLAGS+= -DDEBUG
Index: src/usr.sbin/isdn/isdnd/rc_scan.l
diff -u src/usr.sbin/isdn/isdnd/rc_scan.l:1.6 src/usr.sbin/isdn/isdnd/rc_scan.l:1.7
--- src/usr.sbin/isdn/isdnd/rc_scan.l:1.6 Sat Oct 30 04:19:30 2004
+++ src/usr.sbin/isdn/isdnd/rc_scan.l Thu Oct 29 10:39:24 2009
@@ -30,7 +30,7 @@
* i4b daemon - runtime configuration lexical analyzer
* ---
*
- * $Id: rc_scan.l,v 1.6 2004/10/30 08:19:30 dsl Exp $
+ * $Id: rc_scan.l,v 1.7 2009/10/29 14:39:24 christos Exp $
*
* $FreeBSD$
*
@@ -55,8 +55,7 @@
%}
-%option noyywrap
-%option nounput
+%option noyywrap nounput noinput
%%
CVS commit: src/usr.sbin/envstat
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:38:38 UTC 2009
Modified Files:
src/usr.sbin/envstat: Makefile config_lex.l
Log Message:
option noinput nounput
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/envstat/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/envstat/config_lex.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/envstat/Makefile
diff -u src/usr.sbin/envstat/Makefile:1.6 src/usr.sbin/envstat/Makefile:1.7
--- src/usr.sbin/envstat/Makefile:1.6 Wed Apr 22 11:23:03 2009
+++ src/usr.sbin/envstat/Makefile Thu Oct 29 10:38:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/22 15:23:03 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/29 14:38:37 christos Exp $
PROG= envstat
SRCS+= envstat.c config.c config_yacc.y config_lex.l
@@ -8,7 +8,7 @@
MAN= envstat.8 envsys.conf.5
-CPPFLAGS+= -I${.CURDIR} -I. -DYY_NO_INPUT
+CPPFLAGS+= -I${.CURDIR} -I.
YHEADER= yes
Index: src/usr.sbin/envstat/config_lex.l
diff -u src/usr.sbin/envstat/config_lex.l:1.5 src/usr.sbin/envstat/config_lex.l:1.6
--- src/usr.sbin/envstat/config_lex.l:1.5 Wed Oct 28 18:37:50 2009
+++ src/usr.sbin/envstat/config_lex.l Thu Oct 29 10:38:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: config_lex.l,v 1.5 2009/10/28 22:37:50 christos Exp $ */
+/* $NetBSD: config_lex.l,v 1.6 2009/10/29 14:38:37 christos Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: config_lex.l,v 1.5 2009/10/28 22:37:50 christos Exp $");
+__RCSID("$NetBSD: config_lex.l,v 1.6 2009/10/29 14:38:37 christos Exp $");
#endif /* not lint */
#include
@@ -42,11 +42,10 @@
extern int yyerror(const char *, ...);
int yylex(void);
-#define YY_NO_UNPUT
%}
-%option noyywrap
+%option noyywrap noinput nounput
DEVICEPROP refresh-timeout
SENSOR sensor[0-9]+
CVS commit: src/usr.bin/msgc
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:37:56 UTC 2009
Modified Files:
src/usr.bin/msgc: Makefile msgscan.l
Log Message:
option noinput
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/msgc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/msgc/msgscan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/msgc/Makefile
diff -u src/usr.bin/msgc/Makefile:1.17 src/usr.bin/msgc/Makefile:1.18
--- src/usr.bin/msgc/Makefile:1.17 Mon Apr 20 12:05:30 2009
+++ src/usr.bin/msgc/Makefile Thu Oct 29 10:37:56 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/04/20 16:05:30 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2009/10/29 14:37:56 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual issues
@@ -7,7 +7,7 @@
PROG= msgc
SRCS= msgmain.c msgparse.y msgscan.l msgdb.c util.c avl.c
.PATH: ${NETBSDSRCDIR}/usr.bin/menuc
-CPPFLAGS+= -I. -I${.CURDIR} -DYY_NO_INPUT
+CPPFLAGS+= -I. -I${.CURDIR}
YHEADER=
.if ${MKSHARE} != "no"
Index: src/usr.bin/msgc/msgscan.l
diff -u src/usr.bin/msgc/msgscan.l:1.4 src/usr.bin/msgc/msgscan.l:1.5
--- src/usr.bin/msgc/msgscan.l:1.4 Thu Jul 17 04:33:05 2003
+++ src/usr.bin/msgc/msgscan.l Thu Oct 29 10:37:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msgscan.l,v 1.4 2003/07/17 08:33:05 lukem Exp $ */
+/* $NetBSD: msgscan.l,v 1.5 2009/10/29 14:37:56 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -42,7 +42,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msgscan.l,v 1.4 2003/07/17 08:33:05 lukem Exp $");
+__RCSID("$NetBSD: msgscan.l,v 1.5 2009/10/29 14:37:56 christos Exp $");
#endif
@@ -58,6 +58,8 @@
%x COMMENT
%x BRACE
+%option noinput
+
%%
[ \t]+ { /* ignore spaces and tabs */ }
CVS commit: src/usr.bin/mkcsmapper
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:37:16 UTC 2009
Modified Files:
src/usr.bin/mkcsmapper: Makefile lex.l
Log Message:
option noinput nounput
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/mkcsmapper/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/mkcsmapper/lex.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mkcsmapper/Makefile
diff -u src/usr.bin/mkcsmapper/Makefile:1.6 src/usr.bin/mkcsmapper/Makefile:1.7
--- src/usr.bin/mkcsmapper/Makefile:1.6 Mon Apr 20 12:05:30 2009
+++ src/usr.bin/mkcsmapper/Makefile Thu Oct 29 10:37:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/29 14:37:16 christos Exp $
NOMAN=# defined (must come before bsd.own.mk)
@@ -15,7 +15,7 @@
CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/lib/libc \
-I${NETBSDSRCDIR}/lib/libc/citrus \
-I${NETBSDSRCDIR}/lib/libc/citrus/modules \
- -DHOSTPROG -DLIBC_SCCS -DYY_NO_INPUT
+ -DHOSTPROG -DLIBC_SCCS
YHEADER= 1
.ifndef HOSTPROG
Index: src/usr.bin/mkcsmapper/lex.l
diff -u src/usr.bin/mkcsmapper/lex.l:1.5 src/usr.bin/mkcsmapper/lex.l:1.6
--- src/usr.bin/mkcsmapper/lex.l:1.5 Wed Oct 28 18:09:02 2009
+++ src/usr.bin/mkcsmapper/lex.l Thu Oct 29 10:37:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.l,v 1.5 2009/10/28 22:09:02 christos Exp $ */
+/* $NetBSD: lex.l,v 1.6 2009/10/29 14:37:16 christos Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: lex.l,v 1.5 2009/10/28 22:09:02 christos Exp $");
+__RCSID("$NetBSD: lex.l,v 1.6 2009/10/29 14:37:16 christos Exp $");
#endif /* not lint */
#include
@@ -49,10 +49,11 @@
int line_number = 1;
-#define YY_NO_UNPUT
%}
+%option noinput nounput
+
%x COMMENT
%%
CVS commit: src/usr.bin/menuc
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:36:14 UTC 2009
Modified Files:
src/usr.bin/menuc: Makefile scan.l
Log Message:
option noinput
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/menuc/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/menuc/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/menuc/Makefile
diff -u src/usr.bin/menuc/Makefile:1.13 src/usr.bin/menuc/Makefile:1.14
--- src/usr.bin/menuc/Makefile:1.13 Mon Apr 20 12:05:30 2009
+++ src/usr.bin/menuc/Makefile Thu Oct 29 10:36:14 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/20 16:05:30 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2009/10/29 14:36:14 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual issues
@@ -6,7 +6,7 @@
PROG= menuc
SRCS= main.c parse.y scan.l avl.c mdb.c util.c
-CPPFLAGS+= -I. -I${.CURDIR} -DYY_NO_INPUT
+CPPFLAGS+= -I. -I${.CURDIR}
YHEADER=
.if ${MKSHARE} != "no"
Index: src/usr.bin/menuc/scan.l
diff -u src/usr.bin/menuc/scan.l:1.14 src/usr.bin/menuc/scan.l:1.15
--- src/usr.bin/menuc/scan.l:1.14 Mon Aug 2 17:29:07 2004
+++ src/usr.bin/menuc/scan.l Thu Oct 29 10:36:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scan.l,v 1.14 2004/08/02 21:29:07 dsl Exp $ */
+/* $NetBSD: scan.l,v 1.15 2009/10/29 14:36:14 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -52,6 +52,8 @@
%x COMMENT
%x BRACE
+%option noinput
+
%%
[ \t]+ { /* ignore spaces and tabs */ }
CVS commit: src/usr.bin/fgen
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:35:25 UTC 2009
Modified Files:
src/usr.bin/fgen: Makefile fgen.l
Log Message:
option noinput
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/fgen/Makefile
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/fgen/fgen.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/fgen/Makefile
diff -u src/usr.bin/fgen/Makefile:1.7 src/usr.bin/fgen/Makefile:1.8
--- src/usr.bin/fgen/Makefile:1.7 Mon Apr 20 12:05:30 2009
+++ src/usr.bin/fgen/Makefile Thu Oct 29 10:35:25 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2009/04/20 16:05:30 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2009/10/29 14:35:25 christos Exp $
-CPPFLAGS+= -I${.CURDIR} -DYY_NO_INPUT
+CPPFLAGS+= -I${.CURDIR}
PROG= fgen
SRCS= fgen.l
MAN= fgen.1
Index: src/usr.bin/fgen/fgen.l
diff -u src/usr.bin/fgen/fgen.l:1.31 src/usr.bin/fgen/fgen.l:1.32
--- src/usr.bin/fgen/fgen.l:1.31 Mon Oct 19 14:12:37 2009
+++ src/usr.bin/fgen/fgen.l Thu Oct 29 10:35:25 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: fgen.l,v 1.31 2009/10/19 18:12:37 snj Exp $ */
+/* $NetBSD: fgen.l,v 1.32 2009/10/29 14:35:25 christos Exp $ */
/* FLEX input for FORTH input file scanner */
/*
* Copyright (c) 1998 Eduardo Horvath.
@@ -42,12 +42,12 @@
#endif
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: fgen.l,v 1.31 2009/10/19 18:12:37 snj Exp $");
+__RCSID("$NetBSD: fgen.l,v 1.32 2009/10/29 14:35:25 christos Exp $");
#endif
%}
-%option yylineno
+%option yylineno noinput
decimal [0-9.]
hex [0-9A-Fa-f.]
CVS commit: src/crypto/dist/ipsec-tools/src/setkey
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:34:28 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: token.l
Log Message:
use %option noinput nounput
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/crypto/dist/ipsec-tools/src/setkey/token.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/setkey/token.l
diff -u src/crypto/dist/ipsec-tools/src/setkey/token.l:1.13 src/crypto/dist/ipsec-tools/src/setkey/token.l:1.14
--- src/crypto/dist/ipsec-tools/src/setkey/token.l:1.13 Wed Oct 28 17:22:49 2009
+++ src/crypto/dist/ipsec-tools/src/setkey/token.l Thu Oct 29 10:34:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: token.l,v 1.13 2009/10/28 21:22:49 christos Exp $ */
+/* $NetBSD: token.l,v 1.14 2009/10/29 14:34:27 christos Exp $ */
/* $KAME: token.l,v 1.44 2003/10/21 07:20:58 itojun Exp $ */
@@ -59,8 +59,6 @@
#include "y.tab.h"
#endif
-#define YY_NO_UNPUT
-
#include "extern.h"
/* make the code compile on *BSD-current */
@@ -113,8 +111,10 @@
%s S_PL S_AUTHALG S_ENCALG
+%option noinput nounput
%%
+
add { return(ADD); }
delete { return(DELETE); }
deleteall { return(DELETEALL); }
CVS commit: src/sbin/setkey
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:34:06 UTC 2009
Modified Files:
src/sbin/setkey: Makefile
Log Message:
no need for noinput
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/setkey/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/setkey/Makefile
diff -u src/sbin/setkey/Makefile:1.11 src/sbin/setkey/Makefile:1.12
--- src/sbin/setkey/Makefile:1.11 Mon Apr 20 12:05:30 2009
+++ src/sbin/setkey/Makefile Thu Oct 29 10:34:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/04/20 16:05:30 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2009/10/29 14:34:06 christos Exp $
WARNS?= 3 # XXX: sign-compare issues
@@ -13,7 +13,7 @@
DIST= ${NETBSDSRCDIR}/crypto/dist/ipsec-tools
CPPFLAGS+= -I${DIST}/src/setkey -I${DIST}/src/libipsec
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipsec -I. -DYY_NO_INPUT
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipsec -I.
CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H
CPPFLAGS+= -DSADB_X_EALG_AESCBC=SADB_X_EALG_AES
CVS commit: src/gnu/usr.bin/binutils/gprof
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:32:18 UTC 2009
Modified Files:
src/gnu/usr.bin/binutils/gprof: Makefile
Log Message:
YY_NO is not needed here.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/binutils/gprof/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/binutils/gprof/Makefile
diff -u src/gnu/usr.bin/binutils/gprof/Makefile:1.6 src/gnu/usr.bin/binutils/gprof/Makefile:1.7
--- src/gnu/usr.bin/binutils/gprof/Makefile:1.6 Mon Apr 20 12:05:29 2009
+++ src/gnu/usr.bin/binutils/gprof/Makefile Thu Oct 29 10:32:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/20 16:05:29 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/29 14:32:18 christos Exp $
.include
@@ -9,7 +9,7 @@
PROG= gprof
SRCS= ${G_gprof_OBJECTS:.o=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} -DYY_NO_INPUT
+CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
LDADD= -lintl
DPADD= ${LIBINTL}
CVS commit: src/games/atc
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:27:26 UTC 2009
Modified Files:
src/games/atc: Makefile lex.l
Log Message:
use %option noinput nounput
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/games/atc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/games/atc/lex.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/atc/Makefile
diff -u src/games/atc/Makefile:1.27 src/games/atc/Makefile:1.28
--- src/games/atc/Makefile:1.27 Mon Apr 20 12:05:29 2009
+++ src/games/atc/Makefile Thu Oct 29 10:27:26 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2009/04/20 16:05:29 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2009/10/29 14:27:26 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include
PROG= atc
-CPPFLAGS+=-DBSD -I${.CURDIR} -I. -DYY_NO_UNPUT -DYY_NO_INPUT
+CPPFLAGS+=-DBSD -I${.CURDIR} -I.
SRCS= extern.c grammar.y graphics.c input.c lex.l list.c log.c \
main.c tunable.c update.c
YHEADER=1
Index: src/games/atc/lex.l
diff -u src/games/atc/lex.l:1.7 src/games/atc/lex.l:1.8
--- src/games/atc/lex.l:1.7 Thu Aug 7 05:36:54 2003
+++ src/games/atc/lex.l Thu Oct 29 10:27:26 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: lex.l,v 1.7 2003/08/07 09:36:54 agc Exp $ */
+/* $NetBSD: lex.l,v 1.8 2009/10/29 14:27:26 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -47,7 +47,7 @@
#if 0
static char sccsid[] = "@(#)lex.l 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: lex.l,v 1.7 2003/08/07 09:36:54 agc Exp $");
+__RCSID("$NetBSD: lex.l,v 1.8 2009/10/29 14:27:26 christos Exp $");
#endif
#endif /* not lint */
@@ -58,6 +58,7 @@
extern int line;
%}
+%option nounput noinput
%%
[0-9]+ { yylval.ival = atoi(yytext); return(ConstOp); }
height { return(HeightOp); }
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Thu Oct 29 14:21:40 UTC 2009
Modified Files:
src/bin/sh: Makefile arith_lex.l
Log Message:
use flex options instead of #defines
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/bin/sh/Makefile
cvs rdiff -u -r1.14 -r1.15 src/bin/sh/arith_lex.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/Makefile
diff -u src/bin/sh/Makefile:1.85 src/bin/sh/Makefile:1.86
--- src/bin/sh/Makefile:1.85 Mon Apr 20 12:05:29 2009
+++ src/bin/sh/Makefile Thu Oct 29 10:21:40 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2009/04/20 16:05:29 drochner Exp $
+# $NetBSD: Makefile,v 1.86 2009/10/29 14:21:40 christos Exp $
# @(#)Makefile 8.4 (Berkeley) 5/5/95
.include
@@ -34,7 +34,7 @@
YFLAGS+=-l
.endif
-CPPFLAGS+=-DSHELL -I. -I${.CURDIR} -DYY_NO_INPUT
+CPPFLAGS+=-DSHELL -I. -I${.CURDIR}
#XXX: For testing only.
#CPPFLAGS+=-DDEBUG=1
#CFLAGS+=-funsigned-char
Index: src/bin/sh/arith_lex.l
diff -u src/bin/sh/arith_lex.l:1.14 src/bin/sh/arith_lex.l:1.15
--- src/bin/sh/arith_lex.l:1.14 Sun Mar 25 02:29:26 2007
+++ src/bin/sh/arith_lex.l Thu Oct 29 10:21:40 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: arith_lex.l,v 1.14 2007/03/25 06:29:26 apb Exp $ */
+/* $NetBSD: arith_lex.l,v 1.15 2009/10/29 14:21:40 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: arith_lex.l,v 1.14 2007/03/25 06:29:26 apb Exp $");
+__RCSID("$NetBSD: arith_lex.l,v 1.15 2009/10/29 14:21:40 christos Exp $");
#endif
#endif /* not lint */
@@ -53,9 +53,10 @@
#undef YY_INPUT
#define YY_INPUT(buf,result,max) \
result = (*buf = *arith_buf++) ? 1 : YY_NULL;
-#define YY_NO_UNPUT
%}
+%option nounput noinput
+
%%
[ \t\n] { ; }
0x[0-9a-fA-F]+ { yylval = strtoimax(yytext, 0, 0); return(ARITH_NUM); }
CVS commit: src/tools
Module Name:src
Committed By: christos
Date: Thu Oct 29 13:07:13 UTC 2009
Modified Files:
src/tools: Makefile
Log Message:
Give m4 its own .WAIT. Fixes build issue on NetBSD-5.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.128 src/tools/Makefile:1.129
--- src/tools/Makefile:1.128 Fri Oct 23 18:14:37 2009
+++ src/tools/Makefile Thu Oct 29 09:07:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2009/10/23 22:14:37 joerg Exp $
+# $NetBSD: Makefile,v 1.129 2009/10/29 13:07:12 christos Exp $
.include
@@ -37,7 +37,8 @@
binstall .WAIT mktemp .WAIT sed .WAIT \
cap_mkdb crunchgen ctags genassym gencat hexdump join \
${LINT_BITS} \
- lorder m4 makewhatis mkdep mtree rpcgen tsort uudecode \
+ lorder makewhatis mkdep mtree rpcgen tsort uudecode \
+ m4 .WAIT \
texinfo .WAIT \
yacc .WAIT \
awk .WAIT \
CVS commit: src/external/bsd/flex/bin
Module Name:src
Committed By: christos
Date: Thu Oct 29 13:03:09 UTC 2009
Modified Files:
src/external/bsd/flex/bin: Makefile
Log Message:
oops forgot to remove the PKG m4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.3 src/external/bsd/flex/bin/Makefile:1.4
--- src/external/bsd/flex/bin/Makefile:1.3 Mon Oct 26 14:32:39 2009
+++ src/external/bsd/flex/bin/Makefile Thu Oct 29 09:03:09 2009
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.3 2009/10/26 18:32:39 christos Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/29 13:03:09 christos Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -47,8 +47,6 @@
INCSDIR=/usr/include/g++
LDADD+=-lm
DPADD+=${LIBM}
-# XXX: Fix m4.
-TOOL_M4=/usr/pkg/bin/gm4
MAN = flex.1
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: christos
Date: Thu Oct 29 12:55:52 UTC 2009
Modified Files:
src/external/bsd/byacc/dist: error.c
Log Message:
defs.h first.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/error.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/dist/error.c
diff -u src/external/bsd/byacc/dist/error.c:1.2 src/external/bsd/byacc/dist/error.c:1.3
--- src/external/bsd/byacc/dist/error.c:1.2 Wed Oct 28 20:56:19 2009
+++ src/external/bsd/byacc/dist/error.c Thu Oct 29 08:55:52 2009
@@ -1,10 +1,11 @@
-/* $NetBSD: error.c,v 1.2 2009/10/29 00:56:19 christos Exp $ */
+/* $NetBSD: error.c,v 1.3 2009/10/29 12:55:52 christos Exp $ */
/* Id: error.c,v 1.6 2008/11/24 21:30:35 tom Exp */
+#include "defs.h"
+
#include
-__RCSID("$NetBSD: error.c,v 1.2 2009/10/29 00:56:19 christos Exp $");
+__RCSID("$NetBSD: error.c,v 1.3 2009/10/29 12:55:52 christos Exp $");
-#include "defs.h"
/* routines for printing error messages */
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: tron
Date: Thu Oct 29 10:26:17 UTC 2009
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c
Log Message:
Make this build.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.3 Wed Oct 28 23:44:51 2009
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Thu Oct 29 10:26:17 2009
@@ -1067,6 +1067,7 @@
zfs_zinactive(znode_t *zp)
{
vnode_t *vp = ZTOV(zp);
+ zfsvfs_t *zfsvfs = zp->z_zfsvfs;
ASSERT(zp->z_dbuf && zp->z_phys);
@@ -1080,13 +1081,13 @@
*/
if (zp->z_unlinked) {
mutex_exit(&zp->z_lock);
- ZFS_OBJ_HOLD_EXIT(zfsvfs, z_id);
+ ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id);
zfs_rmnode(zp);
return;
}
mutex_exit(&zp->z_lock);
- ZFS_OBJ_HOLD_EXIT(zfsvfs, z_id);
+ ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id);
zfs_znode_free(zp);
}
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: yamt Date: Thu Oct 29 09:50:49 UTC 2009 Modified Files: src/sys/arch/x86/x86: vm_machdep.c Log Message: fix a typo in a comment. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/vm_machdep.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/arch/x86/x86/vm_machdep.c diff -u src/sys/arch/x86/x86/vm_machdep.c:1.3 src/sys/arch/x86/x86/vm_machdep.c:1.4 --- src/sys/arch/x86/x86/vm_machdep.c:1.3 Tue Oct 27 03:48:59 2009 +++ src/sys/arch/x86/x86/vm_machdep.c Thu Oct 29 09:50:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.3 2009/10/27 03:48:59 rmind Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.4 2009/10/29 09:50:49 yamt Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -80,7 +80,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.3 2009/10/27 03:48:59 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.4 2009/10/29 09:50:49 yamt Exp $"); #include "opt_mtrr.h" @@ -127,7 +127,7 @@ /* * cpu_lwp_fork: finish a new LWP (l2) operation. * - * First LWP (l1) is the process being forked. If it is &lwp, then we + * First LWP (l1) is the process being forked. If it is &lwp0, then we * are creating a kthread, where return path and argument are specified * with `func' and `arg'. *
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Thu Oct 29 08:53:32 UTC 2009 Modified Files: src/games/fortune/datfiles: fortunes2 Log Message: Another spelling mistake. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.37 src/games/fortune/datfiles/fortunes2:1.38 --- src/games/fortune/datfiles/fortunes2:1.37 Thu Oct 29 08:47:07 2009 +++ src/games/fortune/datfiles/fortunes2 Thu Oct 29 08:53:31 2009 @@ -37832,7 +37832,7 @@ Retirement means that when someone says "Have a nice day", you actually have a shot at it. % -Reunite Gondwondaland! +Reunite Gondwanaland! % Rev. Jim: What does an amber light mean? Bobby: Slow down.
