diff options
| -rw-r--r-- | plpnfsd/Makefile.am | 2 | ||||
| -rw-r--r-- | plpnfsd/main.cc | 2 | ||||
| -rw-r--r-- | plpnfsd/mount_aix.c | 5 | ||||
| -rw-r--r-- | plpnfsd/mp_inode.c | 8 | ||||
| -rw-r--r-- | plpnfsd/mp_main.c | 8 | ||||
| -rw-r--r-- | plpnfsd/mp_mount.c | 8 | ||||
| -rw-r--r-- | plpnfsd/mp_pfs_ops.c | 8 | ||||
| -rw-r--r-- | plpnfsd/mtab_aix.c | 145 | ||||
| -rw-r--r-- | plpnfsd/nfs_prot_svc.c | 3 | ||||
| -rw-r--r-- | plpnfsd/nfs_prot_xdr.c | 3 | ||||
| -rw-r--r-- | plpnfsd/rfsv_api.h | 2 |
11 files changed, 44 insertions, 150 deletions
diff --git a/plpnfsd/Makefile.am b/plpnfsd/Makefile.am index 7c519c1..1c6eb5e 100644 --- a/plpnfsd/Makefile.am +++ b/plpnfsd/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ +# INCLUDES=-I../lib sbin_PROGRAMS = plpnfsd diff --git a/plpnfsd/main.cc b/plpnfsd/main.cc index c63ec36..f982b4c 100644 --- a/plpnfsd/main.cc +++ b/plpnfsd/main.cc @@ -1,7 +1,9 @@ +// $Id$ // // PLP - An implementation of the PSION link protocol // // Copyright (C) 1999 Philip Proudman +// plptools extensions: Copyright (C) 1999 Fritz Elfert <felfert@to.com> // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/plpnfsd/mount_aix.c b/plpnfsd/mount_aix.c index 87d5ca3..b2d565d 100644 --- a/plpnfsd/mount_aix.c +++ b/plpnfsd/mount_aix.c @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -37,8 +38,6 @@ * * %W% (Berkeley) %G% * - * $Id$ - * */ diff --git a/plpnfsd/mp_inode.c b/plpnfsd/mp_inode.c index c355a3e..e52d5ae 100644 --- a/plpnfsd/mp_inode.c +++ b/plpnfsd/mp_inode.c @@ -1,3 +1,11 @@ +/* $Id$ + * + * Original version of this file from p3nfsd-5.4 by + * Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de) + * + * Modifications for plputils by Fritz Elfert <felfert@to.com> + * + */ #include <stdio.h> #include "nfs_prot.h" #include "mp.h" diff --git a/plpnfsd/mp_main.c b/plpnfsd/mp_main.c index d9fcaf7..23623c6 100644 --- a/plpnfsd/mp_main.c +++ b/plpnfsd/mp_main.c @@ -1,3 +1,11 @@ +/* $Id$ + * + * Original version of this file from p3nfsd-5.4 by + * Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de) + * + * Modifications for plputils by Fritz Elfert <felfert@to.com> + * + */ #include <OSdefs.h> #include <stdio.h> #include <signal.h> diff --git a/plpnfsd/mp_mount.c b/plpnfsd/mp_mount.c index ccce338..e607629 100644 --- a/plpnfsd/mp_mount.c +++ b/plpnfsd/mp_mount.c @@ -1,3 +1,11 @@ +/* $Id$ + * + * Original version of this file from p3nfsd-5.4 by + * Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de) + * + * Modifications for plputils by Fritz Elfert <felfert@to.com> + * + */ #if defined(__SVR4) || defined(__sgi) || defined(linux) #include <stdlib.h> #include <unistd.h> diff --git a/plpnfsd/mp_pfs_ops.c b/plpnfsd/mp_pfs_ops.c index e3212da..5bd0a55 100644 --- a/plpnfsd/mp_pfs_ops.c +++ b/plpnfsd/mp_pfs_ops.c @@ -1,3 +1,11 @@ +/* $Id$ + * + * Original version of this file from p3nfsd-5.4 by + * Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de) + * + * Modifications for plputils by Fritz Elfert <felfert@to.com> + * + */ #include "OSdefs.h" #include <stdio.h> #include <ctype.h> diff --git a/plpnfsd/mtab_aix.c b/plpnfsd/mtab_aix.c deleted file mode 100644 index 46ed3c6..0000000 --- a/plpnfsd/mtab_aix.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) 1990 Jan-Simon Pendry - * Copyright (c) 1990 Imperial College of Science, Technology & Medicine - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Jan-Simon Pendry at Imperial College, London. - * - * 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. - * - * %W% (Berkeley) %G% - * - * $Id$ - * - */ - - -#ifdef READ_MTAB_AIX3_STYLE - -#include <sys/mntctl.h> -#include <sys/vmount.h> - -static struct mntent *mnt_dup(mp) -struct vmount *mp; -{ - struct mntent *new_mp = ALLOC(mntent); - - char *ty; - char *fsname = strdup(vmt2dataptr(mp, VMT_OBJECT)); - new_mp->mnt_dir = strdup(vmt2dataptr(mp, VMT_STUB)); - new_mp->mnt_opts = strdup(vmt2dataptr(mp, VMT_ARGS)); - switch (mp->vmt_gfstype) { - case MNT_JFS: - ty = MTAB_TYPE_UFS; - new_mp->mnt_fsname = strdup(fsname); - break; - - case MNT_NFS: - ty = MTAB_TYPE_NFS; - new_mp->mnt_fsname = str3cat((char *) 0, - vmt2dataptr(mp, VMT_HOSTNAME), ":", fsname); - break; - - default: - ty = "unknown"; - new_mp->mnt_fsname = strdup(fsname); - break; - } - new_mp->mnt_type = strdup(ty); - new_mp->mnt_passno = mp->vmt_vfsnumber; - new_mp->mnt_freq = 0; - - free(fsname); - - return new_mp; -} - -/* - * Read a mount table into memory - */ -mntlist *read_mtab(fs) -char *fs; -{ - mntlist **mpp, *mhp; - - int i; - char *mntinfo = 0, *cp; - struct vmount *vp; - int ret; - - /* - * First figure out size of mount table - * and allocate space for a copy... - * Then get mount table for real. - */ - ret = mntctl(MCTL_QUERY, sizeof(i), &i); - if (ret == 0) { - mntinfo = xmalloc(i); - ret = mntctl(MCTL_QUERY, i, mntinfo); - } - - if (ret <= 0) { - plog(XLOG_ERROR, "mntctl: %m"); - goto out; - } -#ifdef DEBUG - /*dlog("mntctl returns %d structures", ret);*/ -#endif /* DEBUG */ - - mpp = &mhp; - for (i = 0, cp = mntinfo; i < ret; i++, cp += vp->vmt_length) { - vp = (struct vmount *) cp; - - /* - * Allocate a new slot - */ - *mpp = ALLOC(mntlist); - - /* - * Copy the data returned by mntctl - */ - (*mpp)->mnt = mnt_dup(vp); - - /* - * Move to next pointer - */ - mpp = &(*mpp)->mnext; - } - - *mpp = 0; - -out: - if (mntinfo) - free(mntinfo); - return mhp; -} - -#endif /* READ_MTAB_AIX3_STYLE */ diff --git a/plpnfsd/nfs_prot_svc.c b/plpnfsd/nfs_prot_svc.c index f373e74..4424b20 100644 --- a/plpnfsd/nfs_prot_svc.c +++ b/plpnfsd/nfs_prot_svc.c @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * Please do not edit this file. * It was generated using rpcgen. * And tuned by me (Rudi) diff --git a/plpnfsd/nfs_prot_xdr.c b/plpnfsd/nfs_prot_xdr.c index acef303..6eb7e6d 100644 --- a/plpnfsd/nfs_prot_xdr.c +++ b/plpnfsd/nfs_prot_xdr.c @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * Please do not edit this file. * It was generated using rpcgen. */ diff --git a/plpnfsd/rfsv_api.h b/plpnfsd/rfsv_api.h index f5377e3..b1993f9 100644 --- a/plpnfsd/rfsv_api.h +++ b/plpnfsd/rfsv_api.h @@ -2,6 +2,8 @@ * * C API for rfsv * + * Copyright (C) 1999 Fritz Elfert <felfert@to.com> + * */ #ifndef _rfsv_api_h_ #define _rfsv_api_h_ |