diff --git a/usr.sbin/sup/lib/Makefile b/usr.sbin/sup/lib/Makefile index 7ddc65d02d2e..b3fba0205ccb 100644 --- a/usr.sbin/sup/lib/Makefile +++ b/usr.sbin/sup/lib/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1995/12/26 05:15:17 peter Exp $ LIB= sup SRCS= scm.c scmio.c stree.c log.c supmsg.c netcrypt.c atoo.c errmsg.c \ @@ -11,4 +11,6 @@ NOPROFILE= netcrypt.c: netcryptvoid.c ln -s ${.CURDIR}/netcryptvoid.c netcrypt.c +install: + .include diff --git a/usr.sbin/sup/lib/libc.h b/usr.sbin/sup/lib/libc.h index 03d7d0509243..0e59542a4e68 100644 --- a/usr.sbin/sup/lib/libc.h +++ b/usr.sbin/sup/lib/libc.h @@ -26,6 +26,9 @@ ********************************************************************** * HISTORY * $Log: libc.h,v $ + * Revision 1.2 1995/12/26 05:02:45 peter + * Apply ports/net/sup/patches/patch-aa... + * * Revision 1.1.1.1 1995/12/26 04:54:47 peter * Import the unmodified version of the sup that we are using. * The heritage of this version is not clear. It appears to be NetBSD @@ -94,10 +97,6 @@ #include #endif /* _TYPES_ */ -#ifndef _SYSENT_H_ -#include -#endif /* _SYSENT_H_ */ - #ifndef FILE #include #endif /* FILE */ diff --git a/usr.sbin/sup/lib/sys/viceioctl.h b/usr.sbin/sup/lib/sys/viceioctl.h deleted file mode 100644 index 0731b524906a..000000000000 --- a/usr.sbin/sup/lib/sys/viceioctl.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 1991 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the rights - * to redistribute these changes. - */ -/* - * Mach Operating System - * Copyright (c) 1989 Carnegie-Mellon University - * Copyright (c) 1988 Carnegie-Mellon University - * Copyright (c) 1987 Carnegie-Mellon University - * All rights reserved. The CMU software License Agreement specifies - * the terms and conditions for use and redistribution. - */ -/* - * Revision 2.4 90/08/30 11:51:12 bohman - */ -/* - * ITC Remote file system - vice ioctl interface module - */ - -/* - * TODO: Find /usr/local/include/viceioctl.h. - */ - -#ifndef _SYS_VICEIOCTL_H_ -#define _SYS_VICEIOCTL_H_ - -#include -#include - -struct ViceIoctl { - caddr_t in, out; /* Data to be transferred in, or out */ - short in_size; /* Size of input buffer <= 2K */ - short out_size; /* Maximum size of output buffer, <= 2K */ -}; - -/* The 2K limits above are a consequence of the size of the kernel buffer - used to buffer requests from the user to venus--2*MAXPATHLEN. - The buffer pointers may be null, or the counts may be 0 if there - are no input or output parameters - */ - -#ifdef __STDC__ -#define _VICEIOCTL(id) ((unsigned int ) _IOW('V', id, struct ViceIoctl)) -#else -#define _VICEIOCTL(id) ((unsigned int ) _IOW(V, id, struct ViceIoctl)) -#endif -/* Use this macro to define up to 256 vice ioctl's. These ioctl's - all potentially have in/out parameters--this depends upon the - values in the ViceIoctl structure. This structure is itself passed - into the kernel by the normal ioctl parameter passing mechanism. - */ - -#define _VALIDVICEIOCTL(com) (com >= _VICEIOCTL(0) && com <= _VICEIOCTL(255)) - -#endif _SYS_VICEIOCTL_H_ diff --git a/usr.sbin/sup/lib/sysent.h b/usr.sbin/sup/lib/sysent.h deleted file mode 100644 index b5839da54310..000000000000 --- a/usr.sbin/sup/lib/sysent.h +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright (c) 1991 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the rights - * to redistribute these changes. - */ -/* - ********************************************************************** - * HISTORY - * $Log: sysent.h,v $ - * Revision 1.1.1.1 1993/08/21 00:46:35 jkh - * Current sup with compression support. - * - * Revision 1.1.1.1 1993/05/21 14:52:19 cgd - * initial import of CMU's SUP to NetBSD - * - * Revision 2.4 89/12/05 16:02:00 mrt - * Removed include of sys/features.h as it is no longer - * exported or needed. - * [89/12/05 mrt] - * - * Revision 2.3 89/01/20 15:44:24 gm0w - * Added externs to the non-STDC case for functions that do not - * have int return values. - * [88/12/17 gm0w] - * - * Revision 2.2 88/12/14 23:35:52 mja - * Created. - * [88/01/06 jjk] - * - ********************************************************************** - */ - -#ifndef _SYSENT_H_ -#define _SYSENT_H_ 1 - -#if defined(__STDC__) -#if 0 -#include -#include -extern int access(const char *, int); -extern int acct(const char *); -extern int brk(void *); -extern int sbrk(int); -extern int chdir(const char *); -extern int chmod(const char *, int); -extern int fchmod(int, int); -extern int chown(const char *, int, int); -extern int fchown(int, int, int); -extern int chroot(const char *); -extern int close(int); -extern int creat(const char *, int); -extern int dup(int); -extern int dup2(int, int); -extern int execve(const char *, const char **, const char **); -extern void _exit(int); -extern int fcntl(int, int, int); -extern int flock(int, int); -extern int fork(void); -extern int fsync(int); -extern int getdtablesize(void); -extern gid_t getgid(void); -extern gid_t getegid(void); -extern int getgroups(int, int *); -extern long gethostid(void); -extern int sethostid(long); -extern int gethostname(char *, int); -extern int sethostname(const char *, int); -extern int getpagesize(void); -extern int getpgrp(int); -extern int getpid(void); -extern int getppid(void); -extern uid_t getuid(void); -extern uid_t geteuid(void); -extern int ioctl(int, unsigned long, void *); -extern int kill(int, int); -extern int killpg(int, int); -extern int link(const char *, const char *); -extern off_t lseek(int, off_t, int); -extern int mkdir(const char *, int); -extern int mknod(const char *, int, int); -extern int mount(const char *, const char *, int); -extern int umount(const char *); -extern int open(const char *, int, int); -extern int pipe(int *); -extern int profil(void *, int, int, int); -extern int ptrace(int, int, int *, int); -extern int quota(int, int, int, void *); -extern int read(int, void *, int); -extern int readlink(const char *, void *, int); -extern int reboot(int); -extern int rename(const char *, const char *); -extern int rmdir(const char *); -extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); -extern int setgroups(int, int *); -extern int setpgrp(int, int); -extern int setquota(const char *, const char *); -extern int setregid(gid_t, gid_t); -extern int setreuid(uid_t, uid_t); -extern int swapon(const char *); -extern int symlink(const char *, const char *); -extern void sync(void); -extern int syscall(int, ...); -extern int truncate(const char *, off_t); -extern int ftruncate(int, off_t); -extern int umask(int); -extern int unlink(const char *); -extern int vfork(void); -extern void vhangup(void); -extern int write(int, void *, int); - -#ifndef _VICEIOCTL -#include -#endif /* not _VICEIOCTL */ -extern int icreate(int, int, int, int, int, int); -extern int iinc(int, int, long); -extern int idec(int, int, long); -extern int iopen(int, int, int); -extern int iread(int, int, int, int, void *, int); -extern int iwrite(int, int, int, int, void *, int); -extern int pioctl(const char *, unsigned long, struct ViceIoctl *, int); -extern int setpag(void); -#endif -#else defined(__STDC__) -extern gid_t getgid(); -extern gid_t getegid(); -extern long gethostid(); -extern uid_t getuid(); -extern uid_t geteuid(); -extern off_t lseek(); -#endif /* __STDC__ */ -#endif /* not _SYSENT_H_ */ diff --git a/usr.sbin/sup/lib/time.h b/usr.sbin/sup/lib/time.h deleted file mode 100644 index 0b4ea542613a..000000000000 --- a/usr.sbin/sup/lib/time.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 1991 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the rights - * to redistribute these changes. - */ -/* - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted provided - * that: (1) source distributions retain this entire copyright notice and - * comment, and (2) distributions including binaries display the following - * acknowledgement: ``This product includes software developed by the - * University of California, Berkeley and its contributors'' in the - * documentation or other materials provided with the distribution and in - * all advertising materials mentioning features or use of this software. - * 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. - * - * @(#)time.h 5.6 (Berkeley) 6/23/90 - */ -/* - * HISTORY - * 20-Sep-90 Mary Thompson (mrt) at Carnegie-Mellon University - * Taken from 4.3-reno-source to get the new copyright, but - * removed the features that Mach is not supporting yet. - * - */ - -#ifndef _TIME_H_ -#define _TIME_H_ 1 - -struct tm { - int tm_sec; /* seconds after the minute [0-60] */ - int tm_min; /* minutes after the hour [0-59] */ - int tm_hour; /* hours since midnight [0-23] */ - int tm_mday; /* day of the month [1-31] */ - int tm_mon; /* months since January [0-11] */ - int tm_year; /* years since 1900 */ - int tm_wday; /* days since Sunday [0-6] */ - int tm_yday; /* days since January 1 [0-365] */ - int tm_isdst; /* Daylight Savings Time flag */ - long tm_gmtoff; /* offset from CUT in seconds */ - char *tm_zone; /* timezone abbreviation */ -}; - -#if __STDC__ || c_plusplus -extern struct tm *gmtime(const time_t *); -extern struct tm *localtime(const time_t *); -extern time_t mktime(const struct tm *); -extern time_t time(time_t *); -extern double difftime(const time_t, const time_t); -extern char *asctime(const struct tm *); -extern char *ctime(const time_t *); -extern char *timezone(int , int); -extern void tzset(void); -extern void tzsetwall(void); -#else -extern struct tm *gmtime(); -extern struct tm *localtime(); -extern time_t mktime(); -extern time_t time(); -extern double difftime(); -extern char *asctime(); -extern char *ctime(); -extern char *timezone(); -extern void tzset(); -extern void tzsetwall(); -#endif - -#endif /* _TIME_H */ diff --git a/usr.sbin/sup/lib/vprintf.c b/usr.sbin/sup/lib/vprintf.c deleted file mode 100644 index 2c1a309702a7..000000000000 --- a/usr.sbin/sup/lib/vprintf.c +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (c) 1991 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the rights - * to redistribute these changes. - */ -/* - * varargs versions of printf routines - * - ********************************************************************** - * HISTORY - * $Log: vprintf.c,v $ - * Revision 1.1.1.1 1995/12/26 04:54:47 peter - * Import the unmodified version of the sup that we are using. - * The heritage of this version is not clear. It appears to be NetBSD - * derived from some time ago. - * - * Revision 1.1.1.1 1993/08/21 00:46:35 jkh - * Current sup with compression support. - * - * Revision 1.1.1.1 1993/05/21 14:52:19 cgd - * initial import of CMU's SUP to NetBSD - * - * Revision 2.5 89/09/08 18:15:55 mbj - * Use _doprnt() for the Multimax (an "old" architecture). - * [89/09/08 mbj] - * - * Revision 2.4 89/08/03 14:40:10 mja - * Add vsnprintf() routine. - * [89/07/12 mja] - * - * Terminate vsprintf() string with null byte. - * [89/04/21 mja] - * - * Change to use new hidden name for _doprnt on MIPS. - * [89/04/18 mja] - * - * Revision 2.3 89/06/10 14:13:43 gm0w - * Added putc of NULL byte to vsprintf. - * [89/06/10 gm0w] - * - * Revision 2.2 88/12/13 13:53:17 gm0w - * From Brad White. - * [88/12/13 gm0w] - ************************************************************ - */ - -#include -#include - -#ifdef DOPRINT_VA -/* - * system provides _doprnt_va routine - */ -#define _doprnt _doprnt_va -#else -/* - * system provides _doprnt routine - */ -#define _doprnt_va _doprnt -#endif - - -#ifdef NEED_VPRINTF -int -vprintf(fmt, args) - char *fmt; - va_list args; -{ - _doprnt(fmt, args, stdout); - return (ferror(stdout) ? EOF : 0); -} - -int -vfprintf(f, fmt, args) - FILE *f; - char *fmt; - va_list args; -{ - _doprnt(fmt, args, f); - return (ferror(f) ? EOF : 0); -} - -int -vsprintf(s, fmt, args) - char *s, *fmt; - va_list args; -{ - FILE fakebuf; - - fakebuf._flag = _IOSTRG+_IOWRT; /* no _IOWRT: avoid stdio bug */ - fakebuf._ptr = s; - fakebuf._cnt = 32767; - _doprnt(fmt, args, &fakebuf); - putc('\0', &fakebuf); - return (strlen(s)); -} -#endif /* NEED_VPRINTF */ - -#if defined(NEED_VSNPRINTF) || defined(NEED_VPRINTF) -int -vsnprintf(s, n, fmt, args) - char *s, *fmt; - va_list args; -{ - FILE fakebuf; - -#ifdef __hpux - fakebuf._flag = _IODUMMY+_IOWRT;/* no _IOWRT: avoid stdio bug */ - fakebuf._base = fakebuf._ptr = s; - fakebuf._cnt = n-1; - fakebuf.__fileL = fakebuf.__fileH = 0xff; -#else - fakebuf._flag = _IOSTRG+_IOWRT; /* no _IOWRT: avoid stdio bug */ - fakebuf._ptr = s; - fakebuf._cnt = n-1; -#endif - _doprnt(fmt, args, &fakebuf); - fakebuf._cnt++; - putc('\0', &fakebuf); - if (fakebuf._cnt<0) - fakebuf._cnt = 0; - return (n-fakebuf._cnt-1); -} -#endif /* NEED_VPRINTF || NEED_VSNPRINTF */