From dshaw Thu Jul 24 16:44:22 1997 Subject: Rdist 6.1.3. on BSD/OS 3.0 To: mcooper@usc.edu Date: Thu, 24 Jul 1997 16:44:22 -0400 (EDT) Organization: Computer Science Department, The Johns Hopkins University X-PGP-Fingerprint: D79D345/1048/93 5A E2 39 4A 2A 45 A3 ED 46 9F F1 26 45 37 DF X-URL: http://www.jabberwocky.com/ X-Mailer: ELM [version 2.4ME+ PL15 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Length: 8403 Status: RO Hiya, I just downloaded your new rdist, and it's quite wonderful. :) Attached below are the diffs and os/mf files for BSDI 3.0. Incidentally, there seems to be an error in the BSDI 2.1 os file - you need to add a: #define _PATH_SENDMAIL "/usr/sbin/sendmail" David -- David Shaw | dshaw@cs.jhu.edu | WWW http://www.cs.jhu.edu/~dshaw/ +---------------------------------------------------------------------------+ "There are two major products that come out of Berkeley: LSD and UNIX. We don't believe this to be a coincidence." - Jeremy S. Anderson *** os-type.orig Thu Jul 24 15:13:58 1997 --- os-type Thu Jul 24 15:14:18 1997 *************** *** 97,102 **** --- 97,103 ---- "osf1"*) OS="${osname}";; "bsd/386"*) OS=bsdi;; "bsd/os2"*) OS=bsdi2;; + "bsd/os3"*) OS=bsdi3;; "aix"*) osmajver="`${uname} -v`" OS="${osname}${osmajver}" -=-=-=-=-=-=-=-=-=-=-=-= *** filesys-os.c.orig Thu Jul 24 15:28:18 1997 --- filesys-os.c Thu Jul 24 15:34:18 1997 *************** *** 179,194 **** --- 179,204 ---- if (mnt->f_flags & M_RDONLY) mntstruct.me_flags |= MEFLAG_READONLY; #endif + #ifdef BSDI3 + if(!strcmp(((struct statfs*)mnt)->f_fstypename, "nfs")) { + #else switch ((ulong)((struct statfs*)mnt)->f_type) { case MOUNT_NFS: + #endif (void) sprintf(remote_dev, "%s", mnt->f_mntfromname); mntstruct.me_path = remote_dev; mntstruct.me_type = METYPE_NFS; + #ifdef BSDI3 + } else { + #else break; default: + #endif mntstruct.me_path = mnt->f_mntonname; mntstruct.me_type = METYPE_OTHER; + #ifndef BSDI3 break; + #endif } mnt++; -=-=-=-=-=-=-=-=-=-=-=-= /* * Copyright (c) 1993 Michael A. Cooper * Copyright (c) 1993 Regents of the University of California. * 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 the University of * California, Berkeley and its contributors. * 4. 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 BY THE REGENTS 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 REGENTS 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. */ /* * $Id: os-TEMPLATE.h,v 1.16 1996/01/29 22:13:26 mcooper Exp $ */ /* * BDSI3 os-*.h file */ /* * Define the following name for use in #ifdef's. * The value should be all upper-case with no periods (.). */ #if !defined(BSDI3) #define BSDI3 #endif /* * Set process args to messages that show up when running ps(1) * * Under some OS's, the SETARGS code will cause ": is not an identifier" * errors for "special" commands. */ #define SETARGS /* * Define the type of directory routines your system has. */ #define DIR_TYPE DIR_DIRENT /* * Determine what routines we have to get filesystem info. */ #define FSI_TYPE FSI_GETFSSTAT /* * Type of non-blocking I/O. */ #define NBIO_TYPE NBIO_FCNTL /* * Type of wait() function to use. */ #define WAIT_TYPE WAIT_WAIT3 /* * Type of argument passed to wait() (above). */ #define WAIT_ARG_TYPE int /* * Select the type of executable file format. */ #define EXE_TYPE EXE_AOUT /* * Select the type of statfs() system call (if any). */ #define STATFS_TYPE STATFS_BSD /* * Type of arg functions we have. */ #define ARG_TYPE ARG_VARARGS /* * UID argument type for chown() */ typedef uid_t CHOWN_UID_T; /* * GID argument type for chown() */ typedef gid_t CHOWN_GID_T; /* * Our types, usually these are uid_t and gid_t. */ typedef long UID_T; /* Must be signed */ typedef long GID_T; /* Must be signed */ /* * Generic pointer, used by memcpy, malloc, etc. Usually char or void. */ typedef void POINTER; /* * Type of set file time function available */ #define SETFTIME_TYPE SETFTIME_UTIMES /* * Type of set line buffering function available */ #define SETBUF_TYPE SETLINEBUF /* * Types for write(2). See your write(2) man page for details */ /*#define WRITE_RETURN_T ssize_t /* Type of return value */ /*#define WRITE_AMT_T size_t /* Type for amount to write */ /* * Things we have */ #define HAVE_FCHOWN /* Have fchown() */ #define HAVE_FCHMOD /* Have fchmod() */ #define HAVE_SELECT /* Have select() */ /*#define HAVE_SAVED_IDS /* Have POSIX style saved [ug]id's */ #define POSIX_SIGNALS /* Have POSIX signals */ /* * Things we need */ /*#define NEED_UNISTD_H /* Need */ /* * Path to the remote shell command. * Define this only if the pathname is different than * that which appears in "include/paths.h". */ #define _PATH_REMSH "/usr/bin/rsh" /**/ /* * Do we have the ftruncate() function? */ #define HAVE_FTRUNCATE /* * Path to the old rdist */ #define _PATH_OLDRDIST "/usr/bin/rdist" /* * Sendmail on modern BSD... */ #define _PATH_SENDMAIL "/usr/sbin/sendmail" -=-=-=-=-=-=-=-=-=-=-=-= # # Copyright (c) 1993 Michael A. Cooper # Copyright (c) 1993 Regents of the University of California. # 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 the University of # California, Berkeley and its contributors. # 4. 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 BY THE REGENTS 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 REGENTS 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. # # $Id: mf.TEMPLATE,v 6.3 1993/07/15 19:58:48 mcooper Exp mcooper $ # # # bsdi3 Makefile # # # Functions that are missing in this OS are contained in the # files specified in ${MISSINGOBJS}. # #MISSINGOBJS = $(O)strerror.o $(O)strcasecmp.o # # System libraries that we need to load. # LIB_SYS = -lcompat # # System dependent options for compiling # CFLAGS_OS = -DBSDI3 CC=shlicc2 -=-=-=-=-=-=-=-=-=-=-=-=