Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin Remove userland part of ndis
details: https://anonhg.NetBSD.org/src/rev/79340b10b59e
branches: trunk
changeset: 834721:79340b10b59e
user: martin <martin%NetBSD.org@localhost>
date: Sat Aug 25 11:06:00 2018 +0000
description:
Remove userland part of ndis
diffstat:
usr.sbin/Makefile | 4 +-
usr.sbin/ndiscvt/Makefile | 22 -
usr.sbin/ndiscvt/inf-parse.y | 115 ------
usr.sbin/ndiscvt/inf-token.l | 206 -----------
usr.sbin/ndiscvt/inf.c | 748 -------------------------------------------
usr.sbin/ndiscvt/inf.h | 61 ---
usr.sbin/ndiscvt/ndiscvt.8 | 294 ----------------
usr.sbin/ndiscvt/ndiscvt.c | 462 --------------------------
8 files changed, 2 insertions(+), 1910 deletions(-)
diffs (truncated from 1954 to 300 lines):
diff -r 30b2722e7d95 -r 79340b10b59e usr.sbin/Makefile
--- a/usr.sbin/Makefile Sat Aug 25 09:54:37 2018 +0000
+++ b/usr.sbin/Makefile Sat Aug 25 11:06:00 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.276 2018/01/09 03:31:13 christos Exp $
+# $NetBSD: Makefile,v 1.277 2018/08/25 11:06:00 martin Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
lastlogin ldpd link lmcconfig lockstat lpr \
mailwrapper makefs map-mbone mdconfig memswitch mlxctl mmcformat \
mopd mountd moused mrinfo mrouted mscdlabel mtrace mtree \
- ndbootd ndiscvt netgroup_mkdb nfsd \
+ ndbootd netgroup_mkdb nfsd \
ofctl \
paxctl pcictl perfused psrset pstat pwd_mkdb postinstall \
powerd puffs \
diff -r 30b2722e7d95 -r 79340b10b59e usr.sbin/ndiscvt/Makefile
--- a/usr.sbin/ndiscvt/Makefile Sat Aug 25 09:54:37 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2009/04/22 15:23:06 lukem Exp $
-# $FreeBSD: src/usr.sbin/ndiscvt/Makefile,v 1.5 2004/02/23 20:21:21 johan Exp $
-
-.PATH: ${.CURDIR}/../../sys/compat/ndis
-
-.if ${MACHINE_ARCH} == "i386"
-PROG= ndiscvt
-.endif
-
-MAN= ndiscvt.8
-MANSUBDIR= /i386
-SRCS= ndiscvt.c
-SRCS+= subr_pe.c
-SRCS+= inf.c inf-token.l inf-parse.y
-
-CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys
-
-YHEADER=yes
-YPREFIX=ndiscvt_
-LPREFIX=${YPREFIX}
-
-.include <bsd.prog.mk>
diff -r 30b2722e7d95 -r 79340b10b59e usr.sbin/ndiscvt/inf-parse.y
--- a/usr.sbin/ndiscvt/inf-parse.y Sat Aug 25 09:54:37 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-%{
-/*
- * Copyright (c) 2003
- * Bill Paul <wpaul%windriver.com@localhost>. All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf-parse.y,v 1.2 2004/01/02 04:31:06 wpaul Exp $");
-#endif
-#ifdef __NetBSD__
-__RCSID("$NetBSD: inf-parse.y,v 1.6 2006/04/19 20:38:49 martin Exp $");
-#endif
-
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include "inf.h"
-
-extern int yyparse(void);
-extern int yylex(void);
-extern void yyerror(const char *);
-%}
-
-%token EQUALS COMMA EOL
-%token <str> SECTION
-%token <str> STRING
-%token <str> WORD
-
-%union {
- char *str;
-}
-
-%%
-
-inf_file
- : inf_list
- |
- ;
-
-inf_list
- : inf
- | inf_list inf
- ;
-
-inf
- : SECTION EOL
- { section_add($1); }
- | WORD EQUALS assign EOL
- { assign_add($1); }
- | WORD COMMA regkey EOL
- { regkey_add($1); }
- | WORD EOL
- { define_add($1); }
- | EOL
- ;
-
-assign
- : WORD
- { push_word($1); }
- | STRING
- { push_word($1); }
- | WORD COMMA assign
- { push_word($1); }
- | STRING COMMA assign
- { push_word($1); }
- | COMMA assign
- { push_word(NULL); }
- |
- ;
-
-regkey
- : WORD
- { push_word($1); }
- | STRING
- { push_word($1); }
- | WORD COMMA regkey
- { push_word($1); }
- | STRING COMMA regkey
- { push_word($1); }
- | COMMA regkey
- { push_word(NULL); }
- | COMMA
- { push_word(NULL); }
- ;
-%%
diff -r 30b2722e7d95 -r 79340b10b59e usr.sbin/ndiscvt/inf-token.l
--- a/usr.sbin/ndiscvt/inf-token.l Sat Aug 25 09:54:37 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-%{
-/*
- * Copyright (c) 2003
- * Bill Paul <wpaul%windriver.com@localhost>. All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf-token.l,v 1.3 2004/01/11 21:10:35 mdodd Exp $");
-#endif
-#ifdef __NetBSD__
-__RCSID("$NetBSD: inf-token.l,v 1.10 2011/11/25 13:18:22 joerg Exp $");
-#endif
-
-#include <regex.h>
-#include <ctype.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "inf-parse.h"
-
-int lineno = 1;
-
-int input_is_unicode = 0;
-#define IS_UNICODE 1
-#define ISNT_UNICODE 2
-static size_t opt_unicode_input(char *buf, size_t max_size);
-
-#define YY_INPUT(buf, result, max_size) \
- result = opt_unicode_input(buf, max_size)
-
-int yylex(void);
-__dead void ndiscvt_error(const char *);
-int ndiscvt_wrap(void);
-
-static void
-update_lineno(const char *cp)
-{
- while (*cp)
- if (*cp++ == '\n')
- lineno++;
-}
-
-%}
-
-%option nounput noinput
-
-%%
-
-[ \t]+ ;
-\n { lineno++; return EOL; }
-\r ;
-;.*$ ;
-\/\/.*$ ;
-= { return EQUALS; }
-, { return COMMA; }
-\"(\\\"|[^"]|\"\")*\" {
- int len = strlen(yytext) - 2;
- int blen = len + 1;
- char *walker;
- int i;
- update_lineno(yytext);
- ndiscvt_lval.str = (char *)malloc(blen);
- if (ndiscvt_lval.str == NULL)
- goto out;
- walker = ndiscvt_lval.str;
- for (i = 1; i <= len; i++) {
- if (yytext[i] == '\"') {
- switch (yytext[i + 1]) {
- case '\"':
- i++;
- break;
- default:
- break;
- }
- }
- if (yytext[i] == '\\') {
- switch (yytext[i + 1]) {
- case '\n':
- i += 2;
- while(isspace(
- (unsigned char)yytext[i]))
- i++;
- break;
- case '\"':
- i++;
- break;
- case '(':
- i++;
- break;
- default:
- break;
- }
- }
- *walker++ = yytext[i];
- }
- *walker++ = '\0';
- out:;
- return STRING;
- }
-\[[a-zA-Z0-9%&\{\}\-\.\/_\\\*\ ]+\] {
- int len = strlen(yytext);
- yytext[len-1] = '\0';
- ndiscvt_lval.str = strdup(yytext+1);
- return SECTION;
Home |
Main Index |
Thread Index |
Old Index