From 6e21d0e99052f9aa63f868f8cca92af2bf9df8c4 Mon Sep 17 00:00:00 2001 From: Jason Downs Date: Sat, 16 Nov 1996 21:53:13 +0000 Subject: Fix more libss stuff. --- include/Makefile | 4 +-- kerberosIV/include/Makefile | 4 +-- kerberosIV/include/ss/Makefile | 15 ---------- kerberosIV/include/ss/ss.h | 65 ------------------------------------------ lib/libss/Makefile | 20 ++++++------- lib/libss/ss.h | 65 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 79 insertions(+), 94 deletions(-) delete mode 100644 kerberosIV/include/ss/Makefile delete mode 100644 kerberosIV/include/ss/ss.h create mode 100644 lib/libss/ss.h diff --git a/include/Makefile b/include/Makefile index 2cc2ebfcf7a..13efc7a5c48 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 1996/11/15 09:25:19 downsj Exp $ +# $OpenBSD: Makefile,v 1.31 1996/11/16 21:53:10 downsj Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -44,7 +44,7 @@ NOOBJ= noobj .include SYS_INCLUDE?= copies .if defined(KERBEROS) -RDIRS+= ../kerberosIV/include ../kerberosIV/kadm ../kerberosIV/krb ../kerberosIV/ss +RDIRS+= ../kerberosIV/include ../kerberosIV/kadm ../kerberosIV/krb .endif includes: diff --git a/kerberosIV/include/Makefile b/kerberosIV/include/Makefile index 0edee405865..6f9af9462f2 100644 --- a/kerberosIV/include/Makefile +++ b/kerberosIV/include/Makefile @@ -1,5 +1,5 @@ -# $Id: Makefile,v 1.1 1995/12/14 06:52:34 tholo Exp $ +# $Id: Makefile,v 1.2 1996/11/16 21:52:36 downsj Exp $ -SUBDIR= kerberosIV ss +SUBDIR= kerberosIV .include diff --git a/kerberosIV/include/ss/Makefile b/kerberosIV/include/ss/Makefile deleted file mode 100644 index 16b8d24aed2..00000000000 --- a/kerberosIV/include/ss/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $Id: Makefile,v 1.3 1996/07/31 18:27:35 deraadt Exp $ - -FILES= ss.h -NOOBJ= noobj - -all include clean cleandir depend lint tags: - -includes: - @echo installing ${FILES} - @-for i in ${FILES}; do \ - cmp -s $$i ${DESTDIR}/usr/include/ss/$$i || \ - install -c -m 444 $$i ${DESTDIR}/usr/include/ss/$$i; \ - done - -.include diff --git a/kerberosIV/include/ss/ss.h b/kerberosIV/include/ss/ss.h deleted file mode 100644 index 97521c9c1c8..00000000000 --- a/kerberosIV/include/ss/ss.h +++ /dev/null @@ -1,65 +0,0 @@ -/* $Id: ss.h,v 1.1 1995/12/14 06:52:35 tholo Exp $ */ - -/*- - * Copyright 1987, 1988 by the Student Information Processing Board - * of the Massachusetts Institute of Technology - * - * Permission to use, copy, modify, and distribute this software - * and its documentation for any purpose and without fee is - * hereby granted, provided that the above copyright notice - * appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, - * and that the names of M.I.T. and the M.I.T. S.I.P.B. not be - * used in advertising or publicity pertaining to distribution - * of the software without specific, written prior permission. - * M.I.T. and the M.I.T. S.I.P.B. make no representations about - * the suitability of this software for any purpose. It is - * provided "as is" without express or implied warranty. - */ - -#ifndef _SS_H -#define _SS_H - -#include - -#ifndef NO_SS_ERR_H -#include -#endif - -typedef const struct _ss_request_entry { - const char * const *command_names; /* whatever */ - void (* const function) __P((int, const char * const *, int, void *)); - const char * const info_string; /* NULL */ - int flags; /* 0 */ -} ss_request_entry; - -typedef const struct _ss_request_table { - int version; - ss_request_entry *requests; -} ss_request_table; - -#define SS_RQT_TBL_V2 2 - -typedef struct _ss_rp_options { /* DEFAULT VALUES */ - int version; /* SS_RP_V1 */ - void (*unknown) __P((int, const char * const *, int, void *)); /* call for unknown command */ - int allow_suspend; - int catch_int; -} ss_rp_options; - -#define SS_RP_V1 1 - -#define SS_OPT_DONT_LIST 0x0001 -#define SS_OPT_DONT_SUMMARIZE 0x0002 - -void ss_help __P((int, const char * const *, int, void *)); -char *ss_current_request(); -char *ss_name(); -void ss_error __P((int, long, char const *, ...)); -void ss_perror __P((int, long, char const *)); -int ss_create_invocation __P((char *, char *, char *, ss_request_table *, int *)); -int ss_listen(int); -void ss_abort_subsystem(); - -extern ss_request_table ss_std_requests; -#endif /* _SS_H */ diff --git a/lib/libss/Makefile b/lib/libss/Makefile index 8af91083a49..69af3eb9695 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 1996/11/15 09:25:23 downsj Exp $ +# $OpenBSD: Makefile,v 1.2 1996/11/16 21:53:11 downsj Exp $ LIB= ss +HDRS= ss.h ss_err.h SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ listen.c pager.c parse.c prompt.c request_tbl.c requests.c \ std_rqs.c @@ -18,15 +19,14 @@ std_rqs.c: ${.CURDIR}/std_rqs.ct mk_cmds std_rqs.ct -test -h std_rqs.ct && rm std_rqs.ct -includes: ss_err.h - -cd ${.OBJDIR}; \ - if [ -f ss_err.h ]; then \ - cmp -s ss_err.h ${DESTDIR}/usr/include/ss/ss_err.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \ - ${DESTDIR}/usr/include/ss; \ - else \ - true; \ - fi +includes: + @cd ${.CURDIR}; for i in $(HDRS); do \ + j="cmp -s $$i ${DESTDIR}/usr/include/ss/$$i || \ + install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \ + ${DESTDIR}/usr/include/ss"; \ + echo $$j; \ + eval "$$j"; \ + done beforedepend: test -h ss || ln -s . ss diff --git a/lib/libss/ss.h b/lib/libss/ss.h new file mode 100644 index 00000000000..0afcef2e83e --- /dev/null +++ b/lib/libss/ss.h @@ -0,0 +1,65 @@ +/* $OpenBSD: ss.h,v 1.1 1996/11/16 21:53:12 downsj Exp $ */ + +/*- + * Copyright 1987, 1988 by the Student Information Processing Board + * of the Massachusetts Institute of Technology + * + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is + * hereby granted, provided that the above copyright notice + * appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, + * and that the names of M.I.T. and the M.I.T. S.I.P.B. not be + * used in advertising or publicity pertaining to distribution + * of the software without specific, written prior permission. + * M.I.T. and the M.I.T. S.I.P.B. make no representations about + * the suitability of this software for any purpose. It is + * provided "as is" without express or implied warranty. + */ + +#ifndef _SS_H +#define _SS_H + +#include + +#ifndef NO_SS_ERR_H +#include +#endif + +typedef const struct _ss_request_entry { + const char * const *command_names; /* whatever */ + void (* const function) __P((int, const char * const *, int, void *)); + const char * const info_string; /* NULL */ + int flags; /* 0 */ +} ss_request_entry; + +typedef const struct _ss_request_table { + int version; + ss_request_entry *requests; +} ss_request_table; + +#define SS_RQT_TBL_V2 2 + +typedef struct _ss_rp_options { /* DEFAULT VALUES */ + int version; /* SS_RP_V1 */ + void (*unknown) __P((int, const char * const *, int, void *)); /* call for unknown command */ + int allow_suspend; + int catch_int; +} ss_rp_options; + +#define SS_RP_V1 1 + +#define SS_OPT_DONT_LIST 0x0001 +#define SS_OPT_DONT_SUMMARIZE 0x0002 + +void ss_help __P((int, const char * const *, int, void *)); +char *ss_current_request(); +char *ss_name(); +void ss_error __P((int, long, char const *, ...)); +void ss_perror __P((int, long, char const *)); +int ss_create_invocation __P((char *, char *, char *, ss_request_table *, int *)); +int ss_listen(int); +void ss_abort_subsystem(); + +extern ss_request_table ss_std_requests; +#endif /* _SS_H */ -- cgit v1.2.3