Module Name: src Committed By: martin Date: Thu Jun 20 18:20:56 UTC 2024
Modified Files: src/usr.sbin/envstat [netbsd-10]: prog_ops.h src/usr.sbin/powerd [netbsd-10]: prog_ops.h src/usr.sbin/traceroute [netbsd-10]: prog_ops.h Log Message: Pull up following revision(s) (requested by rin in ticket #710): usr.sbin/traceroute/prog_ops.h: revision 1.3 usr.sbin/powerd/prog_ops.h: revision 1.2 usr.sbin/envstat/prog_ops.h: revision 1.3 envstat(8), powerd(8), traceroute(8): Add support to CRUNCHOPS Now, all rump-fied programs can be built as crunched binaries. Thanks ozaki-r@ for discussion. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.56.1 src/usr.sbin/envstat/prog_ops.h cvs rdiff -u -r1.1 -r1.1.56.1 src/usr.sbin/powerd/prog_ops.h cvs rdiff -u -r1.2 -r1.2.8.1 src/usr.sbin/traceroute/prog_ops.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/envstat/prog_ops.h diff -u src/usr.sbin/envstat/prog_ops.h:1.2 src/usr.sbin/envstat/prog_ops.h:1.2.56.1 --- src/usr.sbin/envstat/prog_ops.h:1.2 Wed Dec 15 15:07:54 2010 +++ src/usr.sbin/envstat/prog_ops.h Thu Jun 20 18:20:56 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: prog_ops.h,v 1.2 2010/12/15 15:07:54 pooka Exp $ */ +/* $NetBSD: prog_ops.h,v 1.2.56.1 2024/06/20 18:20:56 martin Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,6 +31,8 @@ #include <sys/types.h> +#ifndef CRUNCHOPS + struct prog_ops { int (*op_init)(void); @@ -43,4 +45,12 @@ extern const struct prog_ops prog_ops; #define prog_open prog_ops.op_open #define prog_close prog_ops.op_close +#else + +#define prog_init ((int (*)(void))NULL) +#define prog_open open +#define prog_close close + +#endif /* CRUNCHOPS */ + #endif /* _PROG_OPS_H_ */ Index: src/usr.sbin/powerd/prog_ops.h diff -u src/usr.sbin/powerd/prog_ops.h:1.1 src/usr.sbin/powerd/prog_ops.h:1.1.56.1 --- src/usr.sbin/powerd/prog_ops.h:1.1 Sun Dec 19 22:52:08 2010 +++ src/usr.sbin/powerd/prog_ops.h Thu Jun 20 18:20:56 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: prog_ops.h,v 1.1 2010/12/19 22:52:08 pgoyette Exp $ */ +/* $NetBSD: prog_ops.h,v 1.1.56.1 2024/06/20 18:20:56 martin Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -33,6 +33,8 @@ #include <sys/event.h> #include <sys/time.h> +#ifndef CRUNCHOPS + struct prog_ops { int (*op_init)(void); @@ -56,4 +58,17 @@ extern const struct prog_ops prog_ops; #define prog_fcntl prog_ops.op_fcntl #define prog_kqueue prog_ops.op_kqueue +#else + +#define prog_init ((int (*)(void))NULL) +#define prog_open open +#define prog_close close +#define prog_read read +#define prog_kevent kevent +#define prog_ioctl ioctl +#define prog_fcntl fcntl +#define prog_kqueue kqueue + +#endif /* CRUNCHOPS */ + #endif /* _PROG_OPS_H_ */ Index: src/usr.sbin/traceroute/prog_ops.h diff -u src/usr.sbin/traceroute/prog_ops.h:1.2 src/usr.sbin/traceroute/prog_ops.h:1.2.8.1 --- src/usr.sbin/traceroute/prog_ops.h:1.2 Sun Aug 18 04:12:07 2019 +++ src/usr.sbin/traceroute/prog_ops.h Thu Jun 20 18:20:56 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: prog_ops.h,v 1.2 2019/08/18 04:12:07 kamil Exp $ */ +/* $NetBSD: prog_ops.h,v 1.2.8.1 2024/06/20 18:20:56 martin Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -34,6 +34,8 @@ #include <poll.h> #include <ifaddrs.h> +#ifndef CRUNCHOPS + struct prog_ops { int (*op_init)(void); @@ -75,4 +77,21 @@ extern const struct prog_ops prog_ops; #define prog_sysctl prog_ops.op_sysctl #define prog_getifaddrs prog_ops.op_getifaddrs +#else + +#define prog_init ((int (*)(void))NULL) +#define prog_socket socket +#define prog_setsockopt setsockopt +#define prog_shutdown shutdown +#define prog_poll poll +#define prog_recvfrom recvfrom +#define prog_sendto sendto +#define prog_close close +#define prog_connect connect +#define prog_getsockname getsockname +#define prog_sysctl sysctl +#define prog_getifaddrs getifaddrs + +#endif /* CRUNCHOPS */ + #endif /* _PROG_OPS_H_ */