CVS commit: src/usr.sbin/mopd/mopcopy
Module Name:src
Committed By: martin
Date: Thu Oct 29 08:50:42 UTC 2020
Modified Files:
src/usr.sbin/mopd/mopcopy: mopcopy.c
Log Message:
Fix obvious copy
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/mopd/mopcopy/mopcopy.c
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/mopd/mopcopy/mopcopy.c
diff -u src/usr.sbin/mopd/mopcopy/mopcopy.c:1.8 src/usr.sbin/mopd/mopcopy/mopcopy.c:1.9
--- src/usr.sbin/mopd/mopcopy/mopcopy.c:1.8 Tue Oct 27 17:16:24 2020
+++ src/usr.sbin/mopd/mopcopy/mopcopy.c Thu Oct 29 08:50:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopcopy.c,v 1.8 2020/10/27 17:16:24 abs Exp $ */
+/* $NetBSD: mopcopy.c,v 1.9 2020/10/29 08:50:42 martin Exp $ */
/* mopcopy - Convert a Unix format kernel into something that
* can be transferred via MOP.
@@ -49,7 +49,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.8 2020/10/27 17:16:24 abs Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.9 2020/10/29 08:50:42 martin Exp $");
#endif
#include "os.h"
@@ -72,7 +72,7 @@ __RCSID("$NetBSD: mopcopy.c,v 1.8 2020/1
#define MID_VAX 150
#endif
#if !defined(MID_VAX1K)
-#define MID_VAX 140
+#define MID_VAX1K 140
#endif
#ifndef NOELF
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: abs
Date: Tue Oct 27 17:16:25 UTC 2020
Modified Files:
src/usr.sbin/mopd/common: file.c
src/usr.sbin/mopd/mopcopy: mopcopy.c
Log Message:
Update mopd for 4k VAX page size and support 1k page a.out binaries
>From dreamlayers
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/mopd/common/file.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mopd/mopcopy/mopcopy.c
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/mopd/common/file.c
diff -u src/usr.sbin/mopd/common/file.c:1.16 src/usr.sbin/mopd/common/file.c:1.17
--- src/usr.sbin/mopd/common/file.c:1.16 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/file.c Tue Oct 27 17:16:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.16 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: file.c,v 1.17 2020/10/27 17:16:24 abs Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: file.c,v 1.16 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: file.c,v 1.17 2020/10/27 17:16:24 abs Exp $");
#endif
#include "os.h"
@@ -46,7 +46,10 @@ __RCSID("$NetBSD: file.c,v 1.16 2016/06/
# include
# endif
# if !defined(MID_VAX)
-# define MID_VAX 140
+# define MID_VAX 150
+# endif
+# if !defined(MID_VAX1K)
+# define MID_VAX1K 140
# endif
#endif /* NOAOUT */
@@ -328,6 +331,11 @@ getMID(int old_mid, int new_mid)
mid = MID_VAX;
break;
#endif
+#ifdef MID_VAX1K
+ case MID_VAX1K:
+ mid = MID_VAX1K;
+ break;
+#endif
#ifdef MID_ALPHA
case MID_ALPHA:
mid = MID_ALPHA;
@@ -356,8 +364,8 @@ getCLBYTES(int mid)
int clbytes;
switch (mid) {
-#ifdef MID_VAX
- case MID_VAX:
+#ifdef MID_VAX1K
+ case MID_VAX1K:
clbytes = 1024;
break;
#endif
@@ -379,8 +387,12 @@ getCLBYTES(int mid)
#ifdef MID_ARM6
case MID_ARM6:
#endif
+#ifdef MID_VAX
+ case MID_VAX:
+#endif
#if defined(MID_I386) || defined(MID_M68K4K) || defined(MID_NS32532) || \
-defined(MID_PMAX) || defined(MID_MIPS) || defined(MID_ARM6)
+defined(MID_PMAX) || defined(MID_MIPS) || defined(MID_ARM6) || \
+defined(MID_VAX)
clbytes = 4096;
break;
#endif
@@ -697,6 +709,9 @@ GetAOutFileInfo(struct dllist *dl)
#ifdef MID_VAX
case MID_VAX:
#endif
+#ifdef MID_VAX1K
+ case MID_VAX1K:
+#endif
#ifdef MID_ALPHA
case MID_ALPHA:
#endif
@@ -766,6 +781,11 @@ GetAOutFileInfo(struct dllist *dl)
printf("vax");
break;
#endif
+#ifdef MID_VAX1K
+ case MID_VAX1K:
+ printf("vax 1k");
+ break;
+#endif
#ifdef MID_ALPHA
case MID_ALPHA:
printf("alpha");
Index: src/usr.sbin/mopd/mopcopy/mopcopy.c
diff -u src/usr.sbin/mopd/mopcopy/mopcopy.c:1.7 src/usr.sbin/mopd/mopcopy/mopcopy.c:1.8
--- src/usr.sbin/mopd/mopcopy/mopcopy.c:1.7 Fri Dec 27 09:41:52 2019
+++ src/usr.sbin/mopd/mopcopy/mopcopy.c Tue Oct 27 17:16:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopcopy.c,v 1.7 2019/12/27 09:41:52 msaitoh Exp $ */
+/* $NetBSD: mopcopy.c,v 1.8 2020/10/27 17:16:24 abs Exp $ */
/* mopcopy - Convert a Unix format kernel into something that
* can be transferred via MOP.
@@ -49,7 +49,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.7 2019/12/27 09:41:52 msaitoh Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.8 2020/10/27 17:16:24 abs Exp $");
#endif
#include "os.h"
@@ -69,6 +69,9 @@ __RCSID("$NetBSD: mopcopy.c,v 1.7 2019/1
#define NOAOUT
#endif
#if !defined(MID_VAX)
+#define MID_VAX 150
+#endif
+#if !defined(MID_VAX1K)
#define MID_VAX 140
#endif
@@ -125,7 +128,7 @@ main(int argc, char **argv)
#ifndef NOAOUT
case IMAGE_TYPE_AOUT:
- if (dl.a_mid != MID_VAX)
+ if (dl.a_mid != MID_VAX && dl.a_mid != MID_VAX1K)
printf("WARNING: `%s' is not a VAX image (mid=%d)\n",
argv[1], dl.a_mid);
i = dl.a_text + dl.a_text_fill + dl.a_data + dl.a_data_fill +
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: abs
Date: Tue Oct 27 17:07:14 UTC 2020
Modified Files:
src/usr.sbin/mopd/common: pf-linux2.c
Log Message:
Fix Linux pfInit() parameter order for mopd
>From dreamlayers
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mopd/common/pf-linux2.c
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/mopd/common/pf-linux2.c
diff -u src/usr.sbin/mopd/common/pf-linux2.c:1.1 src/usr.sbin/mopd/common/pf-linux2.c:1.2
--- src/usr.sbin/mopd/common/pf-linux2.c:1.1 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/pf-linux2.c Tue Oct 27 17:07:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pf-linux2.c,v 1.1 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: pf-linux2.c,v 1.2 2020/10/27 17:07:14 abs Exp $ */
/*
* General Purpose AppleTalk Packet Filter Interface
@@ -23,7 +23,7 @@
*/
#include "port.h"
-__RCSID("$NetBSD: pf-linux2.c,v 1.1 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: pf-linux2.c,v 1.2 2020/10/27 17:07:14 abs Exp $");
/*
* include header files
@@ -86,7 +86,7 @@ static int setup_pf(int, int, u_short);
int
-pfInit(char *interface, u_short protocol, int typ, int mode)
+pfInit(char *interface, int mode, u_short protocol, int typ)
{
int s;
int ioarg;
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:57:56 UTC 2020
Modified Files:
src/usr.sbin/mopd/mopchk: mopchk.c
src/usr.sbin/mopd/mopd: mopd.c
src/usr.sbin/mopd/mopprobe: mopprobe.c
src/usr.sbin/mopd/moptrace: moptrace.c
Log Message:
loop.c owns iflist
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/mopd/mopchk/mopchk.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mopd/mopd/mopd.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/mopprobe/mopprobe.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/moptrace/moptrace.c
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/mopd/mopchk/mopchk.c
diff -u src/usr.sbin/mopd/mopchk/mopchk.c:1.14 src/usr.sbin/mopd/mopchk/mopchk.c:1.15
--- src/usr.sbin/mopd/mopchk/mopchk.c:1.14 Wed Jun 8 01:15:26 2016
+++ src/usr.sbin/mopd/mopchk/mopchk.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopchk.c,v 1.14 2016/06/08 01:15:26 christos Exp $ */
+/* $NetBSD: mopchk.c,v 1.15 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopchk.c,v 1.14 2016/06/08 01:15:26 christos Exp $");
+__RCSID("$NetBSD: mopchk.c,v 1.15 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: mopchk.c,v 1.14 2016/0
* The list of all interfaces that are being listened to. rarp_loop()
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/mopd/mopd.c
diff -u src/usr.sbin/mopd/mopd/mopd.c:1.15 src/usr.sbin/mopd/mopd/mopd.c:1.16
--- src/usr.sbin/mopd/mopd/mopd.c:1.15 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/mopd/mopd.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopd.c,v 1.15 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: mopd.c,v 1.16 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopd.c,v 1.15 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: mopd.c,v 1.16 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: mopd.c,v 1.15 2016/06/
* The list of all interfaces that are being listened to.
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/mopprobe/mopprobe.c
diff -u src/usr.sbin/mopd/mopprobe/mopprobe.c:1.13 src/usr.sbin/mopd/mopprobe/mopprobe.c:1.14
--- src/usr.sbin/mopd/mopprobe/mopprobe.c:1.13 Wed Jun 8 01:17:54 2016
+++ src/usr.sbin/mopd/mopprobe/mopprobe.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopprobe.c,v 1.13 2016/06/08 01:17:54 christos Exp $ */
+/* $NetBSD: mopprobe.c,v 1.14 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopprobe.c,v 1.13 2016/06/08 01:17:54 christos Exp $");
+__RCSID("$NetBSD: mopprobe.c,v 1.14 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: mopprobe.c,v 1.13 2016
* The list of all interfaces that are being listened to. rarp_loop()
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/moptrace/moptrace.c
diff -u src/usr.sbin/mopd/moptrace/moptrace.c:1.12 src/usr.sbin/mopd/moptrace/moptrace.c:1.13
--- src/usr.sbin/mopd/moptrace/moptrace.c:1.12 Wed Jun 8 01:19:05 2016
+++ src/usr.sbin/mopd/moptrace/moptrace.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: moptrace.c,v 1.12 2016/06/08 01:19:05 christos Exp $ */
+/* $NetBSD: moptrace.c,v 1.13 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: moptrace.c,v 1.12 2016/06/08 01:19:05 christos Exp $");
+__RCSID("$NetBSD: moptrace.c,v 1.13 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: moptrace.c,v 1.12 2016
* The list of all interfaces that are being listened to.
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:55:29 UTC 2020
Modified Files:
src/usr.sbin/mopd/common: loop-bsd.c loop-linux2.c
Log Message:
Let loop.c own iflist
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/common/loop-bsd.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mopd/common/loop-linux2.c
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/mopd/common/loop-bsd.c
diff -u src/usr.sbin/mopd/common/loop-bsd.c:1.12 src/usr.sbin/mopd/common/loop-bsd.c:1.13
--- src/usr.sbin/mopd/common/loop-bsd.c:1.12 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/loop-bsd.c Wed Apr 22 23:55:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: loop-bsd.c,v 1.12 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: loop-bsd.c,v 1.13 2020/04/22 23:55:29 joerg Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: loop-bsd.c,v 1.12 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: loop-bsd.c,v 1.13 2020/04/22 23:55:29 joerg Exp $");
#endif
#include
@@ -87,7 +87,7 @@ mopReadDL(void)
* The list of all interfaces that are being listened to. loop()
* "polls" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/common/loop-linux2.c
diff -u src/usr.sbin/mopd/common/loop-linux2.c:1.2 src/usr.sbin/mopd/common/loop-linux2.c:1.3
--- src/usr.sbin/mopd/common/loop-linux2.c:1.2 Sat Dec 7 04:55:01 2019
+++ src/usr.sbin/mopd/common/loop-linux2.c Wed Apr 22 23:55:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: loop-linux2.c,v 1.2 2019/12/07 04:55:01 christos Exp $ */
+/* $NetBSD: loop-linux2.c,v 1.3 2020/04/22 23:55:29 joerg Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: loop-linux2.c,v 1.2 2019/12/07 04:55:01 christos Exp $");
+__RCSID("$NetBSD: loop-linux2.c,v 1.3 2020/04/22 23:55:29 joerg Exp $");
#endif
#include
@@ -82,7 +82,7 @@ mopReadDL(void)
* The list of all interfaces that are being listened to. loop()
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
void mopProcess(struct if_info *, u_char *);
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: christos
Date: Sat Dec 7 04:55:01 UTC 2019
Modified Files:
src/usr.sbin/mopd/common: loop-linux2.c
Log Message:
Drop the advertising clause to match the other files.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mopd/common/loop-linux2.c
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/mopd/common/loop-linux2.c
diff -u src/usr.sbin/mopd/common/loop-linux2.c:1.1 src/usr.sbin/mopd/common/loop-linux2.c:1.2
--- src/usr.sbin/mopd/common/loop-linux2.c:1.1 Tue Jun 7 21:11:49 2016
+++ src/usr.sbin/mopd/common/loop-linux2.c Fri Dec 6 23:55:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: loop-linux2.c,v 1.1 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: loop-linux2.c,v 1.2 2019/12/07 04:55:01 christos Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -11,11 +11,6 @@
* 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 Mats O Jansson.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -31,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: loop-linux2.c,v 1.1 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: loop-linux2.c,v 1.2 2019/12/07 04:55:01 christos Exp $");
#endif
#include
CVS commit: src/usr.sbin/mopd/common
Module Name:src Committed By: christos Date: Wed Jun 8 02:58:19 UTC 2016 Removed Files: src/usr.sbin/mopd/common: version.c Log Message: delete generated file To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/usr.sbin/mopd/common/version.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/mopd/moptrace
Module Name:src
Committed By: christos
Date: Wed Jun 8 01:19:05 UTC 2016
Modified Files:
src/usr.sbin/mopd/moptrace: moptrace.c
Added Files:
src/usr.sbin/mopd/moptrace: Makefile.linux
Log Message:
Port to linux
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/mopd/moptrace/Makefile.linux
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/moptrace/moptrace.c
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/mopd/moptrace/moptrace.c
diff -u src/usr.sbin/mopd/moptrace/moptrace.c:1.11 src/usr.sbin/mopd/moptrace/moptrace.c:1.12
--- src/usr.sbin/mopd/moptrace/moptrace.c:1.11 Tue Aug 30 15:49:11 2011
+++ src/usr.sbin/mopd/moptrace/moptrace.c Tue Jun 7 21:19:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: moptrace.c,v 1.11 2011/08/30 19:49:11 joerg Exp $ */
+/* $NetBSD: moptrace.c,v 1.12 2016/06/08 01:19:05 christos Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,9 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: moptrace.c,v 1.11 2011/08/30 19:49:11 joerg Exp $");
+__RCSID("$NetBSD: moptrace.c,v 1.12 2016/06/08 01:19:05 christos Exp $");
#endif
/*
Added files:
Index: src/usr.sbin/mopd/moptrace/Makefile.linux
diff -u /dev/null src/usr.sbin/mopd/moptrace/Makefile.linux:1.1
--- /dev/null Tue Jun 7 21:19:05 2016
+++ src/usr.sbin/mopd/moptrace/Makefile.linux Tue Jun 7 21:19:05 2016
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.linux,v 1.1 2016/06/08 01:19:05 christos Exp $
+SRCS=moptrace.c
+OBJS=${SRCS:.c=.o}
+
+LDLIBS+=../common/libcommon.a
+CFLAGS+=-I../common
+
+moptrace: ${OBJS}
+
+clean:
+ rm -f ${OBJS} moptrace
CVS commit: src/usr.sbin/mopd/mopprobe
Module Name:src
Committed By: christos
Date: Wed Jun 8 01:17:54 UTC 2016
Modified Files:
src/usr.sbin/mopd/mopprobe: mopprobe.c
Added Files:
src/usr.sbin/mopd/mopprobe: Makefile.linux
Log Message:
port to linux
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/mopd/mopprobe/Makefile.linux
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/mopprobe/mopprobe.c
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/mopd/mopprobe/mopprobe.c
diff -u src/usr.sbin/mopd/mopprobe/mopprobe.c:1.12 src/usr.sbin/mopd/mopprobe/mopprobe.c:1.13
--- src/usr.sbin/mopd/mopprobe/mopprobe.c:1.12 Sat Oct 19 13:16:37 2013
+++ src/usr.sbin/mopd/mopprobe/mopprobe.c Tue Jun 7 21:17:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mopprobe.c,v 1.12 2013/10/19 17:16:37 christos Exp $ */
+/* $NetBSD: mopprobe.c,v 1.13 2016/06/08 01:17:54 christos Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,9 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopprobe.c,v 1.12 2013/10/19 17:16:37 christos Exp $");
+__RCSID("$NetBSD: mopprobe.c,v 1.13 2016/06/08 01:17:54 christos Exp $");
#endif
/*
Added files:
Index: src/usr.sbin/mopd/mopprobe/Makefile.linux
diff -u /dev/null src/usr.sbin/mopd/mopprobe/Makefile.linux:1.1
--- /dev/null Tue Jun 7 21:17:54 2016
+++ src/usr.sbin/mopd/mopprobe/Makefile.linux Tue Jun 7 21:17:54 2016
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.linux,v 1.1 2016/06/08 01:17:54 christos Exp $
+SRCS=mopprobe.c
+OBJS=${SRCS:.c=.o}
+
+LDLIBS+=../common/libcommon.a
+CFLAGS+=-I../common
+
+mopprobe: ${OBJS}
+
+clean:
+ rm -f ${OBJS} mopprobe
CVS commit: src/usr.sbin/mopd/mopcopy
Module Name:src
Committed By: christos
Date: Wed Jun 8 01:16:35 UTC 2016
Modified Files:
src/usr.sbin/mopd/mopcopy: mopcopy.c
Added Files:
src/usr.sbin/mopd/mopcopy: Makefile.linux
Log Message:
Port to linux
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/mopd/mopcopy/Makefile.linux
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/mopd/mopcopy/mopcopy.c
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/mopd/mopcopy/mopcopy.c
diff -u src/usr.sbin/mopd/mopcopy/mopcopy.c:1.5 src/usr.sbin/mopd/mopcopy/mopcopy.c:1.6
--- src/usr.sbin/mopd/mopcopy/mopcopy.c:1.5 Tue Aug 30 15:49:11 2011
+++ src/usr.sbin/mopd/mopcopy/mopcopy.c Tue Jun 7 21:16:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mopcopy.c,v 1.5 2011/08/30 19:49:11 joerg Exp $ */
+/* $NetBSD: mopcopy.c,v 1.6 2016/06/08 01:16:35 christos Exp $ */
/* mopcopy - Convert a Unix format kernel into something that
* can be transfered via MOP.
@@ -47,9 +47,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.5 2011/08/30 19:49:11 joerg Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.6 2016/06/08 01:16:35 christos Exp $");
#endif
#include "os.h"
Added files:
Index: src/usr.sbin/mopd/mopcopy/Makefile.linux
diff -u /dev/null src/usr.sbin/mopd/mopcopy/Makefile.linux:1.1
--- /dev/null Tue Jun 7 21:16:35 2016
+++ src/usr.sbin/mopd/mopcopy/Makefile.linux Tue Jun 7 21:16:35 2016
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.linux,v 1.1 2016/06/08 01:16:35 christos Exp $
+SRCS=mopcopy.c
+OBJS=${SRCS:.c=.o}
+
+LDLIBS+=../common/libcommon.a
+CFLAGS+=-I../common -DNOAOUT
+
+mopcopy: ${OBJS}
+
+clean:
+ rm -f ${OBJS} mopcopy
CVS commit: src/usr.sbin/mopd/mopchk
Module Name:src
Committed By: christos
Date: Wed Jun 8 01:15:26 UTC 2016
Modified Files:
src/usr.sbin/mopd/mopchk: mopchk.c
Added Files:
src/usr.sbin/mopd/mopchk: Makefile.linux
Log Message:
compile on linux
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/mopd/mopchk/Makefile.linux
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/mopchk/mopchk.c
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/mopd/mopchk/mopchk.c
diff -u src/usr.sbin/mopd/mopchk/mopchk.c:1.13 src/usr.sbin/mopd/mopchk/mopchk.c:1.14
--- src/usr.sbin/mopd/mopchk/mopchk.c:1.13 Tue Aug 30 15:49:11 2011
+++ src/usr.sbin/mopd/mopchk/mopchk.c Tue Jun 7 21:15:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mopchk.c,v 1.13 2011/08/30 19:49:11 joerg Exp $ */
+/* $NetBSD: mopchk.c,v 1.14 2016/06/08 01:15:26 christos Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -24,9 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopchk.c,v 1.13 2011/08/30 19:49:11 joerg Exp $");
+__RCSID("$NetBSD: mopchk.c,v 1.14 2016/06/08 01:15:26 christos Exp $");
#endif
/*
Added files:
Index: src/usr.sbin/mopd/mopchk/Makefile.linux
diff -u /dev/null src/usr.sbin/mopd/mopchk/Makefile.linux:1.1
--- /dev/null Tue Jun 7 21:15:26 2016
+++ src/usr.sbin/mopd/mopchk/Makefile.linux Tue Jun 7 21:15:26 2016
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.linux,v 1.1 2016/06/08 01:15:26 christos Exp $
+SRCS=mopchk.c
+OBJS=${SRCS:.c=.o}
+
+LDLIBS+=../common/libcommon.a
+CFLAGS+=-I../common
+
+mopchk: ${OBJS}
+
+clean:
+ rm -f ${OBJS} mopchk
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: christos
Date: Wed Jun 8 01:13:14 UTC 2016
Added Files:
src/usr.sbin/mopd/common: port.h
Log Message:
portability macros.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/mopd/common/port.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/usr.sbin/mopd/common/port.h
diff -u /dev/null src/usr.sbin/mopd/common/port.h:1.1
--- /dev/null Tue Jun 7 21:13:14 2016
+++ src/usr.sbin/mopd/common/port.h Tue Jun 7 21:13:14 2016
@@ -0,0 +1,76 @@
+/* $NetBSD: port.h,v 1.1 2016/06/08 01:13:14 christos Exp $ */
+
+/*-
+ * Copyright (c) 2016 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 THE FOUNDATION OR CONTRIBUTORS
+ * 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
+
+#ifndef __dead
+#define __dead __attribute__((__noreturn__))
+#endif
+
+#ifndef __RCSID
+#define __RCSID(a)
+#endif
+
+#ifndef __USE
+#define __USE(a) ((void)&(a))
+#endif
+
+#ifndef __printflike
+#define __printflike(f, a) __attribute__((__format__(__printf__, f, a)))
+#endif
+
+#ifdef __NetBSD__
+# include
+#else
+# define pidfile(a)
+#endif
+
+#ifdef __linux__
+#include
+#include
+#include
+
+extern char *__progname;
+static inline const char *
+getprogname(void) {
+ return __progname;
+}
+
+static inline char *
+strlcpy(char *d, const char *s, size_t l)
+{
+ if (l == 0)
+ return NULL;
+ strncpy(d, s, l);
+ d[l - 1] = '\0';
+ return d;
+}
+#endif
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: christos
Date: Wed Jun 8 01:11:49 UTC 2016
Modified Files:
src/usr.sbin/mopd/common: cmp.c device.c dl.c file.c get.c log.c
loop-bsd.c mopdef.c nma.c os.h pf.c print.c put.c rc.c
src/usr.sbin/mopd/mopd: mopd.c process.c
Added Files:
src/usr.sbin/mopd/common: Makefile.linux loop-linux2.c pf-linux2.c
version.c
src/usr.sbin/mopd/mopd: Makefile.linux
Log Message:
Quick+Dirty port to linux
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/mopd/common/Makefile.linux \
src/usr.sbin/mopd/common/loop-linux2.c \
src/usr.sbin/mopd/common/pf-linux2.c src/usr.sbin/mopd/common/version.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/mopd/common/cmp.c \
src/usr.sbin/mopd/common/mopdef.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/common/device.c \
src/usr.sbin/mopd/common/pf.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/mopd/common/dl.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mopd/common/file.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/mopd/common/get.c \
src/usr.sbin/mopd/common/nma.c src/usr.sbin/mopd/common/os.h
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/mopd/common/log.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/common/loop-bsd.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mopd/common/print.c \
src/usr.sbin/mopd/common/put.c src/usr.sbin/mopd/common/rc.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/mopd/mopd/Makefile.linux
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/mopd/mopd/mopd.c
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/mopd/mopd/process.c
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/mopd/common/cmp.c
diff -u src/usr.sbin/mopd/common/cmp.c:1.5 src/usr.sbin/mopd/common/cmp.c:1.6
--- src/usr.sbin/mopd/common/cmp.c:1.5 Tue Nov 17 13:58:07 2009
+++ src/usr.sbin/mopd/common/cmp.c Tue Jun 7 21:11:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.5 2009/11/17 18:58:07 drochner Exp $ */
+/* $NetBSD: cmp.c,v 1.6 2016/06/08 01:11:49 christos Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,9 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: cmp.c,v 1.5 2009/11/17 18:58:07 drochner Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.6 2016/06/08 01:11:49 christos Exp $");
#endif
#include "os.h"
Index: src/usr.sbin/mopd/common/mopdef.c
diff -u src/usr.sbin/mopd/common/mopdef.c:1.5 src/usr.sbin/mopd/common/mopdef.c:1.6
--- src/usr.sbin/mopd/common/mopdef.c:1.5 Tue Aug 30 15:49:10 2011
+++ src/usr.sbin/mopd/common/mopdef.c Tue Jun 7 21:11:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mopdef.c,v 1.5 2011/08/30 19:49:10 joerg Exp $ */
+/* $NetBSD: mopdef.c,v 1.6 2016/06/08 01:11:49 christos Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson. All rights reserved.
@@ -24,9 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopdef.c,v 1.5 2011/08/30 19:49:10 joerg Exp $");
+__RCSID("$NetBSD: mopdef.c,v 1.6 2016/06/08 01:11:49 christos Exp $");
#endif
#define MOPDEF_SURPESS_EXTERN
Index: src/usr.sbin/mopd/common/device.c
diff -u src/usr.sbin/mopd/common/device.c:1.12 src/usr.sbin/mopd/common/device.c:1.13
--- src/usr.sbin/mopd/common/device.c:1.12 Tue Aug 30 15:49:10 2011
+++ src/usr.sbin/mopd/common/device.c Tue Jun 7 21:11:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: device.c,v 1.12 2011/08/30 19:49:10 joerg Exp $ */
+/* $NetBSD: device.c,v 1.13 2016/06/08 01:11:49 christos Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,9 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: device.c,v 1.12 2011/08/30 19:49:10 joerg Exp $");
+__RCSID("$NetBSD: device.c,v 1.13 2016/06/08 01:11:49 christos Exp $");
#endif
#include "os.h"
@@ -40,7 +40,6 @@ struct if_info *iflist; /* Interface Li
void deviceOpen(const char *, u_short, int);
-#ifdef DEV_NEW_CONF
/*
* Return ethernet address for interface
*/
@@ -48,6 +47,20 @@ void deviceOpen(const char *, u_short, i
void
deviceEthAddr(const char *ifname, u_char *eaddr)
{
+#ifndef AF_LINK
+ int fd;
+ struct ifreq ifr;
+
+ /* Use datagram socket to get Ethernet address. */
+ if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+ mopLogErr("deviceEthAddr: socket");
+
+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+ if (ioctl(fd, SIOCGIFHWADDR, ) == -1)
+ mopLogErr("deviceEthAddr: SIOGIFHWADDR");
+ memcpy(eaddr, ifr.ifr_hwaddr.sa_data, 6);
+ close(fd);
+#else
struct sockaddr_dl *sdl;
struct ifaddrs *ifap, *ifa;
@@ -68,8 +81,8 @@ deviceEthAddr(const char *ifname, u_char
freeifaddrs(ifap);
mopLogErrX("deviceEthAddr: Never saw interface `%s'!", ifname);
+#endif
}
-#endif /* DEV_NEW_CONF */
void
deviceOpen(const
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: dholland
Date: Sun Jul 27 04:38:03 UTC 2014
Modified Files:
src/usr.sbin/mopd/common: Makefile log.c
Log Message:
Fix broken snprintf usage; noted in PR 47976 from Henning Petersen.
As a bonus, this removes the nonliteral format arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/mopd/common/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mopd/common/log.c
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/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.19 src/usr.sbin/mopd/common/Makefile:1.20
--- src/usr.sbin/mopd/common/Makefile:1.19 Fri Aug 10 12:10:29 2012
+++ src/usr.sbin/mopd/common/Makefile Sun Jul 27 04:38:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/08/10 12:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2014/07/27 04:38:03 dholland Exp $
LIBISPRIVATE= yes
@@ -21,4 +21,3 @@ version.c: VERSION
.include bsd.lib.mk
COPTS.print.c+= -Wno-pointer-sign
-COPTS.log.c+= -Wno-format-nonliteral
Index: src/usr.sbin/mopd/common/log.c
diff -u src/usr.sbin/mopd/common/log.c:1.2 src/usr.sbin/mopd/common/log.c:1.3
--- src/usr.sbin/mopd/common/log.c:1.2 Mon Apr 28 20:24:17 2008
+++ src/usr.sbin/mopd/common/log.c Sun Jul 27 04:38:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.2 2008/04/28 20:24:17 martin Exp $ */
+/* $NetBSD: log.c,v 1.3 2014/07/27 04:38:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: log.c,v 1.2 2008/04/28 20:24:17 martin Exp $);
+__RCSID($NetBSD: log.c,v 1.3 2014/07/27 04:38:03 dholland Exp $);
#endif
#include err.h
@@ -47,13 +47,15 @@ mopLogErr(const char *fmt, ...)
{
va_list ap;
char buf[1024];
+ int error;
va_start(ap, fmt);
if (mopInteractive)
verr(1, fmt, ap);
else {
- snprintf(buf, sizeof(buf), %s: %%m, buf);
- vsyslog(LOG_ERR, buf, ap);
+ error = errno;
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ syslog(LOG_ERR, %s: %s, buf, strerror(error));
}
va_end(ap);
exit(1);
@@ -64,13 +66,15 @@ mopLogWarn(const char *fmt, ...)
{
va_list ap;
char buf[1024];
+ int error;
va_start(ap, fmt);
if (mopInteractive)
vwarn(fmt, ap);
else {
- snprintf(buf, sizeof(buf), %s: %%m, buf);
- vsyslog(LOG_WARNING, buf, ap);
+ error = errno;
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ syslog(LOG_WARNING, %s: %s, buf, strerror(error));
}
va_end(ap);
}
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: joerg
Date: Fri May 30 02:16:10 UTC 2014
Modified Files:
src/usr.sbin/mopd: Makefile.inc
Log Message:
No need for libkvm here.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/Makefile.inc
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/mopd/Makefile.inc
diff -u src/usr.sbin/mopd/Makefile.inc:1.10 src/usr.sbin/mopd/Makefile.inc:1.11
--- src/usr.sbin/mopd/Makefile.inc:1.10 Mon May 28 12:06:37 2007
+++ src/usr.sbin/mopd/Makefile.inc Fri May 30 02:16:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2007/05/28 12:06:37 tls Exp $
+# $NetBSD: Makefile.inc,v 1.11 2014/05/30 02:16:10 joerg Exp $
.include bsd.own.mk
@@ -6,8 +6,8 @@ USE_FORT?=yes # network server
LIBCOMMON != cd ${.CURDIR}/../common ${PRINTOBJDIR}
CPPFLAGS+=-I${.CURDIR}/../common
-DPADD+= ${LIBKVM} ${LIBCOMMON}/libcommon.a
-LDADD+= -lkvm -L${LIBCOMMON} -lcommon
+DPADD+= ${LIBCOMMON}/libcommon.a
+LDADD+= -L${LIBCOMMON} -lcommon
.if exists(${.CURDIR}/../../Makefile.inc)
.include ${.CURDIR}/../../Makefile.inc
CVS commit: src/usr.sbin/mopd/common
Module Name:src Committed By: nakayama Date: Wed Aug 31 13:09:10 UTC 2011 Modified Files: src/usr.sbin/mopd/common: file.c Log Message: Fix build on mips (NOAOUT case). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/mopd/common/file.c 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/mopd/common/file.c diff -u src/usr.sbin/mopd/common/file.c:1.14 src/usr.sbin/mopd/common/file.c:1.15 --- src/usr.sbin/mopd/common/file.c:1.14 Tue Aug 30 19:49:10 2011 +++ src/usr.sbin/mopd/common/file.c Wed Aug 31 13:09:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.14 2011/08/30 19:49:10 joerg Exp $ */ +/* $NetBSD: file.c,v 1.15 2011/08/31 13:09:10 nakayama Exp $ */ /* * Copyright (c) 1995-96 Mats O Jansson. All rights reserved. @@ -26,7 +26,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: file.c,v 1.14 2011/08/30 19:49:10 joerg Exp $); +__RCSID($NetBSD: file.c,v 1.15 2011/08/31 13:09:10 nakayama Exp $); #endif #include os.h @@ -58,8 +58,10 @@ # endif #endif /* NOELF */ +#ifndef NOAOUT static int getCLBYTES(int); static int getMID(int, int); +#endif const char * FileTypeName(mopd_imagetype type)
CVS commit: src/usr.sbin/mopd
Module Name:src Committed By: joerg Date: Tue Aug 30 19:49:11 UTC 2011 Modified Files: src/usr.sbin/mopd/common: cmp.h common.h device.c device.h dl.h file.c get.h log.h loop-bsd.c mopdef.c nma.c nma.h pf.h print.h put.h rc.h src/usr.sbin/mopd/mopchk: mopchk.c src/usr.sbin/mopd/mopcopy: mopcopy.c src/usr.sbin/mopd/mopd: mopd.c process.h src/usr.sbin/mopd/mopprobe: mopprobe.c src/usr.sbin/mopd/moptrace: moptrace.c Log Message: ANSIfy + __printflike + __dead To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/mopd/common/cmp.h \ src/usr.sbin/mopd/common/device.h src/usr.sbin/mopd/common/dl.h \ src/usr.sbin/mopd/common/nma.h src/usr.sbin/mopd/common/pf.h \ src/usr.sbin/mopd/common/print.h src/usr.sbin/mopd/common/put.h \ src/usr.sbin/mopd/common/rc.h cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/mopd/common/common.h cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/common/device.c cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/common/file.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/mopd/common/get.h \ src/usr.sbin/mopd/common/nma.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mopd/common/log.h cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/common/loop-bsd.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mopd/common/mopdef.c cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/mopchk/mopchk.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mopd/mopcopy/mopcopy.c cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/mopd/mopd.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/mopd/mopd/process.h cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/mopprobe/mopprobe.c cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/moptrace/moptrace.c 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/mopd/common/cmp.h diff -u src/usr.sbin/mopd/common/cmp.h:1.6 src/usr.sbin/mopd/common/cmp.h:1.7 --- src/usr.sbin/mopd/common/cmp.h:1.6 Tue Nov 17 18:58:07 2009 +++ src/usr.sbin/mopd/common/cmp.h Tue Aug 30 19:49:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cmp.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ */ +/* $NetBSD: cmp.h,v 1.7 2011/08/30 19:49:10 joerg Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $NetBSD: cmp.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ + * $NetBSD: cmp.h,v 1.7 2011/08/30 19:49:10 joerg Exp $ * */ @@ -31,7 +31,7 @@ #define _CMP_H_ __BEGIN_DECLS -int mopCmpEAddr __P((const u_char *, const u_char *)); +int mopCmpEAddr(const u_char *, const u_char *); __END_DECLS #endif /* _CMP_H_ */ Index: src/usr.sbin/mopd/common/device.h diff -u src/usr.sbin/mopd/common/device.h:1.6 src/usr.sbin/mopd/common/device.h:1.7 --- src/usr.sbin/mopd/common/device.h:1.6 Tue Nov 17 18:58:07 2009 +++ src/usr.sbin/mopd/common/device.h Tue Aug 30 19:49:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: device.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ */ +/* $NetBSD: device.h,v 1.7 2011/08/30 19:49:10 joerg Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $NetBSD: device.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ + * $NetBSD: device.h,v 1.7 2011/08/30 19:49:10 joerg Exp $ * */ @@ -32,17 +32,17 @@ __BEGIN_DECLS #ifdef DEV_NEW_CONF -void deviceEthAddr __P((const char *, u_char *)); +void deviceEthAddr(const char *, u_char *); #endif -void deviceInitOne __P((const char *)); -void deviceInitAll __P((void)); +void deviceInitOne(const char *); +void deviceInitAll(void); /* from loop-bsd.c */ -void Loop __P((void)); -int mopOpenDL __P((struct if_info *, int)); -int mopOpenRC __P((struct if_info *, int)); -void mopReadDL __P((void)); -void mopReadRC __P((void)); +__dead void Loop(void); +int mopOpenDL(struct if_info *, int); +int mopOpenRC(struct if_info *, int); +void mopReadDL(void); +void mopReadRC(void); __END_DECLS #endif /* _DEVICE_H_ */ Index: src/usr.sbin/mopd/common/dl.h diff -u src/usr.sbin/mopd/common/dl.h:1.6 src/usr.sbin/mopd/common/dl.h:1.7 --- src/usr.sbin/mopd/common/dl.h:1.6 Tue Nov 17 18:58:07 2009 +++ src/usr.sbin/mopd/common/dl.h Tue Aug 30 19:49:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dl.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ */ +/* $NetBSD: dl.h,v 1.7 2011/08/30 19:49:10 joerg Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $NetBSD: dl.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ + * $NetBSD: dl.h,v 1.7 2011/08/30 19:49:10 joerg Exp $ * */ @@ -31,7 +31,7 @@ #define _DL_H_
CVS commit: src/usr.sbin/mopd/common
Module Name:src Committed By: joerg Date: Thu Aug 25 16:47:20 UTC 2011 Modified Files: src/usr.sbin/mopd/common: Makefile Log Message: Use of non-literal format strings To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/mopd/common/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/mopd/common/Makefile diff -u src/usr.sbin/mopd/common/Makefile:1.17 src/usr.sbin/mopd/common/Makefile:1.18 --- src/usr.sbin/mopd/common/Makefile:1.17 Tue Aug 16 16:45:20 2011 +++ src/usr.sbin/mopd/common/Makefile Thu Aug 25 16:47:20 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2011/08/16 16:45:20 christos Exp $ +# $NetBSD: Makefile,v 1.18 2011/08/25 16:47:20 joerg Exp $ LIBISPRIVATE= yes @@ -23,3 +23,5 @@ .if defined(HAVE_GCC) || defined(HAVE_PCC) COPTS.print.c+= -Wno-pointer-sign .endif + +COPTS.log.c+= -Wno-format-nonliteral
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: christos
Date: Tue Aug 16 16:45:20 UTC 2011
Modified Files:
src/usr.sbin/mopd/common: Makefile file.c
Log Message:
gcc-4.5 is picky about potential negative indexes. appease it.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/mopd/common/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/common/file.c
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/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.16 src/usr.sbin/mopd/common/Makefile:1.17
--- src/usr.sbin/mopd/common/Makefile:1.16 Tue Jun 21 22:49:45 2011
+++ src/usr.sbin/mopd/common/Makefile Tue Aug 16 12:45:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/06/22 02:49:45 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2011/08/16 16:45:20 christos Exp $
LIBISPRIVATE= yes
@@ -23,8 +23,3 @@
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.print.c+= -Wno-pointer-sign
.endif
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.file.c+= -Wno-error
-.endif
Index: src/usr.sbin/mopd/common/file.c
diff -u src/usr.sbin/mopd/common/file.c:1.12 src/usr.sbin/mopd/common/file.c:1.13
--- src/usr.sbin/mopd/common/file.c:1.12 Mon Oct 19 20:51:13 2009
+++ src/usr.sbin/mopd/common/file.c Tue Aug 16 12:45:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.12 2009/10/20 00:51:13 snj Exp $ */
+/* $NetBSD: file.c,v 1.13 2011/08/16 16:45:20 christos Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: file.c,v 1.12 2009/10/20 00:51:13 snj Exp $);
+__RCSID($NetBSD: file.c,v 1.13 2011/08/16 16:45:20 christos Exp $);
#endif
#include os.h
@@ -115,7 +115,10 @@
int i;
for (i = 0; i cnt; i++) {
- ret = ret*256 + buf[idx+cnt-1-i];
+ int j = idx + cnt - 1 - i;
+ if (j 0)
+ abort();
+ ret = ret * 256 + buf[j];
}
return(ret);
@@ -130,7 +133,10 @@
int i;
for (i = 0; i cnt; i++) {
- ret = ret*256 + buf[idx+i];
+ int j = idx + i;
+ if (j 0)
+ abort();
+ ret = ret * 256 + buf[j];
}
return(ret);
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: drochner
Date: Tue Nov 17 18:58:07 UTC 2009
Modified Files:
src/usr.sbin/mopd/common: cmp.c cmp.h common.h device.c device.h dl.c
dl.h get.c get.h pf.c pf.h print.c print.h put.c put.h rc.c rc.h
src/usr.sbin/mopd/mopd: mopd.c process.c process.h
Log Message:
ANSIfy, sprinkle const
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mopd/common/cmp.c \
src/usr.sbin/mopd/common/get.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/mopd/common/cmp.h \
src/usr.sbin/mopd/common/device.h src/usr.sbin/mopd/common/dl.h \
src/usr.sbin/mopd/common/get.c src/usr.sbin/mopd/common/pf.h \
src/usr.sbin/mopd/common/print.c src/usr.sbin/mopd/common/print.h \
src/usr.sbin/mopd/common/put.c src/usr.sbin/mopd/common/put.h \
src/usr.sbin/mopd/common/rc.c src/usr.sbin/mopd/common/rc.h
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mopd/common/common.h
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/mopd/common/device.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/mopd/common/dl.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/common/pf.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/mopd/mopd.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/mopd/mopd/process.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/mopd/mopd/process.h
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/mopd/common/cmp.c
diff -u src/usr.sbin/mopd/common/cmp.c:1.4 src/usr.sbin/mopd/common/cmp.c:1.5
--- src/usr.sbin/mopd/common/cmp.c:1.4 Tue Oct 20 00:51:13 2009
+++ src/usr.sbin/mopd/common/cmp.c Tue Nov 17 18:58:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj Exp $ */
+/* $NetBSD: cmp.c,v 1.5 2009/11/17 18:58:07 drochner Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,15 +26,14 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj Exp $);
+__RCSID($NetBSD: cmp.c,v 1.5 2009/11/17 18:58:07 drochner Exp $);
#endif
#include os.h
#include cmp.h
int
-mopCmpEAddr(addr1, addr2)
- u_char *addr1, *addr2;
+mopCmpEAddr(const u_char *addr1, const u_char *addr2)
{
-return(memcmp((char *)addr1, (char *)addr2, 6));
+return(memcmp(addr1, addr2, 6));
}
Index: src/usr.sbin/mopd/common/get.h
diff -u src/usr.sbin/mopd/common/get.h:1.4 src/usr.sbin/mopd/common/get.h:1.5
--- src/usr.sbin/mopd/common/get.h:1.4 Tue Oct 20 00:51:13 2009
+++ src/usr.sbin/mopd/common/get.h Tue Nov 17 18:58:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: get.h,v 1.4 2009/10/20 00:51:13 snj Exp $ */
+/* $NetBSD: get.h,v 1.5 2009/11/17 18:58:07 drochner Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: get.h,v 1.4 2009/10/20 00:51:13 snj Exp $
+ * $NetBSD: get.h,v 1.5 2009/11/17 18:58:07 drochner Exp $
*
*/
@@ -31,14 +31,14 @@
#define _GET_H_
__BEGIN_DECLS
-u_char mopGetChar __P((u_char *, int *));
-u_short mopGetShort __P((u_char *, int *));
-u_int32_t mopGetLong __P((u_char *, int *));
-void mopGetMulti __P((u_char *, int *, u_char *, int));
-int mopGetTrans __P((u_char *, int));
-void mopGetHeader __P((u_char *, int *, u_char **, u_char **,
+u_char mopGetChar __P((const u_char *, int *));
+u_short mopGetShort __P((const u_char *, int *));
+u_int32_t mopGetLong __P((const u_char *, int *));
+void mopGetMulti __P((const u_char *, int *, u_char *, int));
+int mopGetTrans __P((const u_char *, int));
+void mopGetHeader __P((const u_char *, int *, const u_char **, const u_char **,
u_short *, int *, int));
-u_short mopGetLength __P((u_char *, int));
+u_short mopGetLength __P((const u_char *, int));
__END_DECLS
#endif /* _GET_H_ */
Index: src/usr.sbin/mopd/common/cmp.h
diff -u src/usr.sbin/mopd/common/cmp.h:1.5 src/usr.sbin/mopd/common/cmp.h:1.6
--- src/usr.sbin/mopd/common/cmp.h:1.5 Tue Oct 20 00:51:13 2009
+++ src/usr.sbin/mopd/common/cmp.h Tue Nov 17 18:58:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj Exp $ */
+/* $NetBSD: cmp.h,v 1.6 2009/11/17 18:58:07 drochner Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj Exp $
+ * $NetBSD: cmp.h,v 1.6 2009/11/17 18:58:07 drochner Exp $
*
*/
@@ -31,7 +31,7 @@
#define _CMP_H_
__BEGIN_DECLS
-int mopCmpEAddr __P((u_char *, u_char *));
+int mopCmpEAddr __P((const u_char *, const u_char *));
__END_DECLS
#endif /* _CMP_H_ */
Index: src/usr.sbin/mopd/common/device.h
diff -u src/usr.sbin/mopd/common/device.h:1.5 src/usr.sbin/mopd/common/device.h:1.6
---
CVS commit: src/usr.sbin/mopd
Module Name:src Committed By: joerg Date: Sun Oct 4 20:53:24 UTC 2009 Modified Files: src/usr.sbin/mopd/mopd: mopd.8 src/usr.sbin/mopd/moptrace: moptrace.1 Log Message: Fix markup. Handle the DECnet documentation like a journal. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/mopd/mopd.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/mopd/moptrace/moptrace.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.sbin/mopd/mopd/mopd.8 diff -u src/usr.sbin/mopd/mopd/mopd.8:1.12 src/usr.sbin/mopd/mopd/mopd.8:1.13 --- src/usr.sbin/mopd/mopd/mopd.8:1.12 Wed Mar 11 13:59:48 2009 +++ src/usr.sbin/mopd/mopd/mopd.8 Sun Oct 4 20:53:23 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: mopd.8,v 1.12 2009/03/11 13:59:48 joerg Exp $ +.\ $NetBSD: mopd.8,v 1.13 2009/10/04 20:53:23 joerg Exp $ .\ .\ Copyright (c) 1993-96 Mats O Jansson. All rights reserved. .\ @@ -120,12 +120,12 @@ .Xr moptrace 1 , .Xr bpf 4 .Rs -DECnet Digital Network Architecture Phase IV, +.%J DECnet Digital Network Architecture Phase IV .%R Maintenance Operations Functional Specification V3.0.0 .%N AA-X436A-TK .Re .Rs -DECnet Digital Network Architecture, +.%J DECnet Digital Network Architecture .%R Maintenance Operations Protocol Functional Specification V4.0.0 .%N EK-DNA11-FS-001 .Re Index: src/usr.sbin/mopd/moptrace/moptrace.1 diff -u src/usr.sbin/mopd/moptrace/moptrace.1:1.9 src/usr.sbin/mopd/moptrace/moptrace.1:1.10 --- src/usr.sbin/mopd/moptrace/moptrace.1:1.9 Wed Mar 11 13:59:48 2009 +++ src/usr.sbin/mopd/moptrace/moptrace.1 Sun Oct 4 20:53:23 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: moptrace.1,v 1.9 2009/03/11 13:59:48 joerg Exp $ +.\ $NetBSD: moptrace.1,v 1.10 2009/10/04 20:53:23 joerg Exp $ .\ .\ Copyright (c) 1993-95 Mats O Jansson. All rights reserved. .\ @@ -27,7 +27,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.\ @(#) $NetBSD: moptrace.1,v 1.9 2009/03/11 13:59:48 joerg Exp $ +.\ @(#) $NetBSD: moptrace.1,v 1.10 2009/10/04 20:53:23 joerg Exp $ .\ .Dd October 2, 1995 .Dt MOPTRACE 1 @@ -71,12 +71,12 @@ .Xr mopprobe 1 , .Xr mopd 8 .Rs -DECnet Digital Network Architecture Phase IV, +.%J DECnet Digital Network Architecture Phase IV .%R Maintenance Operations Functional Specification V3.0.0 .%N AA-X436A-TK .Re .Rs -DECnet Digital Network Architecture, +.%J DECnet Digital Network Architecture .%R Maintenance Operations Protocol Functional Specification V4.0.0 .%N EK-DNA11-FS-001 .Re
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: he
Date: Thu Aug 20 21:59:13 UTC 2009
Modified Files:
src/usr.sbin/mopd/common: Makefile
Log Message:
Define NOAOUT if we're building for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/common/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/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.13 src/usr.sbin/mopd/common/Makefile:1.14
--- src/usr.sbin/mopd/common/Makefile:1.13 Sat Oct 25 22:27:39 2008
+++ src/usr.sbin/mopd/common/Makefile Thu Aug 20 21:59:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/10/25 22:27:39 apb Exp $
+# $NetBSD: Makefile,v 1.14 2009/08/20 21:59:12 he Exp $
LIBISPRIVATE= yes
@@ -7,6 +7,12 @@
print.c put.c rc.c version.c
CLEANFILES= version.c
+.include bsd.own.mk
+
+.if ${MACHINE_CPU} == mips
+CFLAGS+= -DNOAOUT
+.endif
+
version.c: VERSION
${_MKTARGET_CREATE}
rm -f version.c; \
