diff options
Diffstat (limited to 'usr.sbin/amd')
-rw-r--r-- | usr.sbin/amd/amd/afs_ops.c | 6 | ||||
-rw-r--r-- | usr.sbin/amd/amd/host_ops.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/info_hes.c | 6 | ||||
-rw-r--r-- | usr.sbin/amd/amd/info_passwd.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/map.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/mapc.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/misc_rpc.c | 58 | ||||
-rw-r--r-- | usr.sbin/amd/amd/nfs_ops.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/nfs_start.c | 6 | ||||
-rw-r--r-- | usr.sbin/amd/amd/nfs_subr.c | 8 | ||||
-rw-r--r-- | usr.sbin/amd/amd/restart.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/amd/rpc_fwd.c | 6 | ||||
-rw-r--r-- | usr.sbin/amd/amd/srvr_nfs.c | 6 | ||||
-rw-r--r-- | usr.sbin/amd/amd/umount_fs.c | 6 | ||||
-rw-r--r-- | usr.sbin/amd/amd/wire.c | 8 | ||||
-rw-r--r-- | usr.sbin/amd/amq/amq.c | 10 | ||||
-rw-r--r-- | usr.sbin/amd/config/Makefile.irix3 | 4 | ||||
-rw-r--r-- | usr.sbin/amd/config/mtab_file.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/config/os-convex.h | 14 | ||||
-rw-r--r-- | usr.sbin/amd/config/os-irix4.h | 4 | ||||
-rw-r--r-- | usr.sbin/amd/fsinfo/fsi_data.h | 4 | ||||
-rw-r--r-- | usr.sbin/amd/fsinfo/fsi_dict.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/fsinfo/fsi_util.c | 4 | ||||
-rw-r--r-- | usr.sbin/amd/fsinfo/wr_atab.c | 4 |
24 files changed, 93 insertions, 93 deletions
diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c index 6dfdc14..73f39a8 100644 --- a/usr.sbin/amd/amd/afs_ops.c +++ b/usr.sbin/amd/amd/afs_ops.c @@ -37,7 +37,7 @@ * * @(#)afs_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: afs_ops.c,v 5.2.2.4 1992/05/31 16:36:36 jsp Exp $ + * $Id: afs_ops.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ @@ -136,7 +136,7 @@ char *opts; /* * get fhandle of remote path for automount point */ - + fhp = root_fh(dir); if (!fhp) { plog(XLOG_FATAL, "Can't find root file handle for %s", dir); @@ -420,7 +420,7 @@ static void union_mounted(mf) mntfs *mf; { int i; - + afs_mkcacheref(mf); /* diff --git a/usr.sbin/amd/amd/host_ops.c b/usr.sbin/amd/amd/host_ops.c index ba0dedb..d290fb6 100644 --- a/usr.sbin/amd/amd/host_ops.c +++ b/usr.sbin/amd/amd/host_ops.c @@ -37,7 +37,7 @@ * * @(#)host_ops.c 8.1 (Berkeley) 6/6/93 * - * $Id: host_ops.c,v 5.2.2.2 1992/05/31 16:36:08 jsp Exp $ + * $Id: host_ops.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ @@ -98,7 +98,7 @@ am_opts *fo; if (!fo->opt_rfs) fo->opt_rfs = "/"; - + return (*nfs_ops.fs_match)(fo); } diff --git a/usr.sbin/amd/amd/info_hes.c b/usr.sbin/amd/amd/info_hes.c index 875cfe7..513eda7 100644 --- a/usr.sbin/amd/amd/info_hes.c +++ b/usr.sbin/amd/amd/info_hes.c @@ -37,7 +37,7 @@ * * @(#)info_hes.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_hes.c,v 5.2.2.1 1992/02/09 15:08:29 jsp beta $ + * $Id: info_hes.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ @@ -293,7 +293,7 @@ int anslen; sizeof(struct in_addr)); server.sin_family = AF_INET; server.sin_port = htons(NAMESERVER_PORT); - + if (connect(s, &server, sizeof(struct sockaddr)) < 0) { (void) close(s); @@ -482,7 +482,7 @@ char *name; { char *end_pos; short targ_len, cur_len; - + targ_len = strlen(hs_domain); cur_len = strlen(name); if (cur_len <= targ_len) diff --git a/usr.sbin/amd/amd/info_passwd.c b/usr.sbin/amd/amd/info_passwd.c index 3123e38..694dd53 100644 --- a/usr.sbin/amd/amd/info_passwd.c +++ b/usr.sbin/amd/amd/info_passwd.c @@ -37,7 +37,7 @@ * * @(#)info_passwd.c 8.1 (Berkeley) 6/6/93 * - * $Id: info_passwd.c,v 5.2.2.1 1992/02/09 15:08:33 jsp beta $ + * $Id: info_passwd.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ @@ -113,7 +113,7 @@ time_t *tp; *user++ = '\0'; /* * Find start of host "path". If no / then Invalid... - */ + */ p = strchr(dir+1, '/'); if (!p) goto enoent; diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c index 6f2acb3..21c8d31 100644 --- a/usr.sbin/amd/amd/map.c +++ b/usr.sbin/amd/amd/map.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: map.c,v 5.2.2.1 1992/02/09 15:08:36 jsp beta $ + * $Id: map.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ */ #ifndef lint @@ -122,7 +122,7 @@ int nsize; return 1; } - + /* * The root of the mount tree. */ diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c index 2155f19..1004644 100644 --- a/usr.sbin/amd/amd/mapc.c +++ b/usr.sbin/amd/amd/mapc.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mapc.c,v 5.2.2.1 1992/02/09 15:08:38 jsp beta $ + * $Id: mapc.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ */ #ifndef lint @@ -164,7 +164,7 @@ qelem map_list_head = { &map_list_head, &map_list_head }; /* * Configuration */ - + /* ROOT MAP */ static int root_init P((char*, time_t*)); diff --git a/usr.sbin/amd/amd/misc_rpc.c b/usr.sbin/amd/amd/misc_rpc.c index 0fb10c8..e982f78 100644 --- a/usr.sbin/amd/amd/misc_rpc.c +++ b/usr.sbin/amd/amd/misc_rpc.c @@ -37,7 +37,7 @@ * * @(#)misc_rpc.c 8.1 (Berkeley) 6/6/93 * - * $Id: misc_rpc.c,v 5.2.2.1 1992/02/09 15:08:40 jsp beta $ + * $Id: misc_rpc.c,v 1.1.1.1 1994/05/26 05:22:01 rgrimes Exp $ * */ @@ -172,23 +172,23 @@ AUTH *auth; * may copy or modify Sun RPC without charge, but are not authorized * to license or distribute it to anyone else except as part of a product or * program developed by the user. - * + * * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * + * * Sun RPC is provided with no support and without any obligation on the * part of Sun Microsystems, Inc. to assist in its use, correction, * modification or enhancement. - * + * * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * OR ANY PART THEREOF. - * + * * In no event will Sun Microsystems, Inc. be liable for any lost revenue * or profits or other special, indirect and consequential damages, even if * Sun has been advised of the possibility of such damages. - * + * * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 @@ -245,23 +245,23 @@ xdr_pointer(xdrs,objpp,obj_size,xdr_obj) * may copy or modify Sun RPC without charge, but are not authorized * to license or distribute it to anyone else except as part of a product or * program developed by the user. - * + * * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * + * * Sun RPC is provided with no support and without any obligation on the * part of Sun Microsystems, Inc. to assist in its use, correction, * modification or enhancement. - * + * * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * OR ANY PART THEREOF. - * + * * In no event will Sun Microsystems, Inc. be liable for any lost revenue * or profits or other special, indirect and consequential damages, even if * Sun has been advised of the possibility of such damages. - * + * * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 @@ -273,41 +273,41 @@ struct rpc_errtab { }; static struct rpc_errtab rpc_errlist[] = { - { RPC_SUCCESS, - "RPC: Success" }, - { RPC_CANTENCODEARGS, + { RPC_SUCCESS, + "RPC: Success" }, + { RPC_CANTENCODEARGS, "RPC: Can't encode arguments" }, - { RPC_CANTDECODERES, + { RPC_CANTDECODERES, "RPC: Can't decode result" }, - { RPC_CANTSEND, + { RPC_CANTSEND, "RPC: Unable to send" }, - { RPC_CANTRECV, + { RPC_CANTRECV, "RPC: Unable to receive" }, - { RPC_TIMEDOUT, + { RPC_TIMEDOUT, "RPC: Timed out" }, - { RPC_VERSMISMATCH, + { RPC_VERSMISMATCH, "RPC: Incompatible versions of RPC" }, - { RPC_AUTHERROR, + { RPC_AUTHERROR, "RPC: Authentication error" }, - { RPC_PROGUNAVAIL, + { RPC_PROGUNAVAIL, "RPC: Program unavailable" }, - { RPC_PROGVERSMISMATCH, + { RPC_PROGVERSMISMATCH, "RPC: Program/version mismatch" }, - { RPC_PROCUNAVAIL, + { RPC_PROCUNAVAIL, "RPC: Procedure unavailable" }, - { RPC_CANTDECODEARGS, + { RPC_CANTDECODEARGS, "RPC: Server can't decode arguments" }, - { RPC_SYSTEMERROR, + { RPC_SYSTEMERROR, "RPC: Remote system error" }, - { RPC_UNKNOWNHOST, + { RPC_UNKNOWNHOST, "RPC: Unknown host" }, /* { RPC_UNKNOWNPROTO, "RPC: Unknown protocol" },*/ - { RPC_PMAPFAILURE, + { RPC_PMAPFAILURE, "RPC: Port mapper failure" }, - { RPC_PROGNOTREGISTERED, + { RPC_PROGNOTREGISTERED, "RPC: Program not registered"}, - { RPC_FAILED, + { RPC_FAILED, "RPC: Failed (unspecified error)"} }; diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c index 15974b3..1d92974 100644 --- a/usr.sbin/amd/amd/nfs_ops.c +++ b/usr.sbin/amd/amd/nfs_ops.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: nfs_ops.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ + * $Id: nfs_ops.c,v 1.2 1995/02/13 01:56:22 wpaul Exp $ */ #ifndef lint @@ -448,7 +448,7 @@ mntfs *mf; if (!mf->mf_private) { int error; struct fhstatus fhs; - + char *colon = strchr(mf->mf_info, ':'); if (colon == 0) return ENOENT; diff --git a/usr.sbin/amd/amd/nfs_start.c b/usr.sbin/amd/amd/nfs_start.c index 13d36a1..aad227d 100644 --- a/usr.sbin/amd/amd/nfs_start.c +++ b/usr.sbin/amd/amd/nfs_start.c @@ -37,7 +37,7 @@ * * @(#)nfs_start.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_start.c,v 5.2.2.1 1992/02/09 15:08:51 jsp beta $ + * $Id: nfs_start.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ @@ -282,7 +282,7 @@ static serv_state run_rpc(P_void) if (readfds & (1 << fwd_sock)) { readfds &= ~(1 << fwd_sock); #endif - --nsel; + --nsel; do { fwd_reply(); } while (rpc_pending_now() > 0); @@ -345,7 +345,7 @@ int ppid; return 1; } - if ((nfsxprt = svcudp_create(so)) == NULL || + if ((nfsxprt = svcudp_create(so)) == NULL || (amqp = svcudp_create(so)) == NULL) { plog(XLOG_FATAL, "cannot create rpc/udp service"); return 2; diff --git a/usr.sbin/amd/amd/nfs_subr.c b/usr.sbin/amd/amd/nfs_subr.c index 297cf93..def2db1 100644 --- a/usr.sbin/amd/amd/nfs_subr.c +++ b/usr.sbin/amd/amd/nfs_subr.c @@ -37,7 +37,7 @@ * * @(#)nfs_subr.c 8.1 (Berkeley) 6/6/93 * - * $Id: nfs_subr.c,v 5.2.2.1 1992/02/09 15:08:53 jsp beta $ + * $Id: nfs_subr.c,v 1.1.1.1 1994/05/26 05:22:00 rgrimes Exp $ * */ @@ -88,7 +88,7 @@ struct attrstat **attrpp; } /*ARGSUSED*/ -voidp +voidp nfsproc_null_2(argp, rqstp) voidp argp; struct svc_req *rqstp; @@ -166,7 +166,7 @@ struct svc_req *rqstp; /*ARGSUSED*/ -voidp +voidp nfsproc_root_2(argp, rqstp) voidp argp; struct svc_req *rqstp; @@ -283,7 +283,7 @@ struct svc_req *rqstp; /*ARGSUSED*/ -voidp +voidp nfsproc_writecache_2(argp, rqstp) voidp argp; struct svc_req *rqstp; diff --git a/usr.sbin/amd/amd/restart.c b/usr.sbin/amd/amd/restart.c index 52a9c87..421c2a1 100644 --- a/usr.sbin/amd/amd/restart.c +++ b/usr.sbin/amd/amd/restart.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: restart.c,v 5.2.2.1 1992/02/09 15:08:59 jsp beta $ + * $Id: restart.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ @@ -122,7 +122,7 @@ void restart() mo.opt_rfs = strdup(cp+1); *cp = ':'; } else if (fs_ops->ffserver == find_nfs_srvr) { - /* + /* * Prototype 4.4 BSD used to end up here - * might as well keep the workaround for now */ diff --git a/usr.sbin/amd/amd/rpc_fwd.c b/usr.sbin/amd/amd/rpc_fwd.c index aaf1e0a..a2e49ef 100644 --- a/usr.sbin/amd/amd/rpc_fwd.c +++ b/usr.sbin/amd/amd/rpc_fwd.c @@ -37,7 +37,7 @@ * * @(#)rpc_fwd.c 8.1 (Berkeley) 6/6/93 * - * $Id: rpc_fwd.c,v 5.2.2.1 1992/02/09 15:09:01 jsp beta $ + * $Id: rpc_fwd.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ @@ -136,7 +136,7 @@ static rpc_forward *fwd_alloc() /* * Set the time to live field - * Timeout in 43 seconds + * Timeout in 43 seconds */ p->rf_ttl = now + 43; @@ -293,7 +293,7 @@ fwd_fun cb; * rest of "p" otherwise nasty things happen later... */ #ifdef DEBUG - { char dq[20]; + { char dq[20]; dlog("Sending packet id %#x to %s.%d", p->rf_xid, inet_dquad(dq, fwdto->sin_addr.s_addr), ntohs(fwdto->sin_port)); } #endif /* DEBUG */ diff --git a/usr.sbin/amd/amd/srvr_nfs.c b/usr.sbin/amd/amd/srvr_nfs.c index 4987c95..a025640 100644 --- a/usr.sbin/amd/amd/srvr_nfs.c +++ b/usr.sbin/amd/amd/srvr_nfs.c @@ -37,7 +37,7 @@ * * @(#)srvr_nfs.c 8.1 (Berkeley) 6/6/93 * - * $Id: srvr_nfs.c,v 5.2.2.1 1992/02/09 15:09:06 jsp beta $ + * $Id: srvr_nfs.c,v 1.1.1.1 1994/05/26 05:22:02 rgrimes Exp $ * */ @@ -245,7 +245,7 @@ static void nfs_keepalive P((fserver*)); static void recompute_portmap P((fserver *fs)); static void recompute_portmap(fs) fserver *fs; -{ +{ int error; if (nfs_auth) @@ -357,7 +357,7 @@ int done; if (np->np_mountd_inval) recompute_portmap(fs); -#ifdef DEBUG +#ifdef DEBUG found_map++; #endif /* DEBUG */ break; diff --git a/usr.sbin/amd/amd/umount_fs.c b/usr.sbin/amd/amd/umount_fs.c index 2c3e73d..66b413b 100644 --- a/usr.sbin/amd/amd/umount_fs.c +++ b/usr.sbin/amd/amd/umount_fs.c @@ -37,7 +37,7 @@ * * @(#)umount_fs.c 8.1 (Berkeley) 6/6/93 * - * $Id: umount_fs.c,v 5.2.2.1 1992/02/09 15:09:10 jsp beta $ + * $Id: umount_fs.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ @@ -189,7 +189,7 @@ char *fs_name; if (!error) { free_mntlist(mlist); mp = mlist = read_mtab(fs_name); - + /* * Search the mount table looking for * the correct (ie last) matching entry @@ -201,7 +201,7 @@ char *fs_name; mp_save = mp; mp = mp->mnext; } - + if (mp_save) { mnt_free(mp_save->mnt); mp_save->mnt = 0; diff --git a/usr.sbin/amd/amd/wire.c b/usr.sbin/amd/amd/wire.c index ea6d3da..f1103e8 100644 --- a/usr.sbin/amd/amd/wire.c +++ b/usr.sbin/amd/amd/wire.c @@ -37,7 +37,7 @@ * * @(#)wire.c 8.1 (Berkeley) 6/6/93 * - * $Id: wire.c,v 5.2.2.1 1992/02/09 15:09:15 jsp beta $ + * $Id: wire.c,v 1.1.1.1 1994/05/26 05:22:03 rgrimes Exp $ * */ @@ -185,9 +185,9 @@ char *getwire() * Figure out the subnet's network address */ subnet = address & netmask; - + #ifdef IN_CLASSA - subnet = ntohl(subnet); + subnet = ntohl(subnet); if (IN_CLASSA(subnet)) { mask = IN_CLASSA_NET; @@ -243,7 +243,7 @@ char *getwire() out: if (sk >= 0) - (void) close(sk); + (void) close(sk); if (netname) return netname; return strdup(NO_SUBNET); diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c index d3749bc..68363ed 100644 --- a/usr.sbin/amd/amq/amq.c +++ b/usr.sbin/amd/amq/amq.c @@ -37,7 +37,7 @@ * * @(#)amq.c 8.1 (Berkeley) 6/7/93 * - * $Id: amq.c,v 5.2.2.1 1992/02/09 15:09:16 jsp beta $ + * $Id: amq.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $ * */ @@ -54,7 +54,7 @@ char copyright[] = "\ #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: amq.c,v 5.2.2.1 1992/02/09 15:09:16 jsp beta $"; +static char rcsid[] = "$Id: amq.c,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $"; static char sccsid[] = "@(#)amq.c 8.1 (Berkeley) 6/7/93"; #endif /* not lint */ @@ -115,7 +115,7 @@ printf("%-*.*s %-*.*s %-*.*s %s\n\t%-5d %-7d %-6d %-7d %-7d %-6d %02d/%02d/%02d *mt->mt_directory ? mt->mt_directory : "/", /* XXX */ *twid, *twid, mt->mt_type, - *mwid, *mwid, + *mwid, *mwid, mt->mt_mountinfo, mt->mt_mountpoint, @@ -370,7 +370,7 @@ char *argv[]; if (unmount_flag) errs = 1; } - + if (errs) { show_usage: fprintf(stderr, "\ @@ -607,7 +607,7 @@ Usage: %s [-h host] [[-f] [-m] [-v] [-s]] | [[-u] directory ...]] |\n\ } /* - * udpresport creates a datagram socket and attempts to bind it to a + * udpresport creates a datagram socket and attempts to bind it to a * secure port. * returns: The bound socket, or -1 to indicate an error. */ diff --git a/usr.sbin/amd/config/Makefile.irix3 b/usr.sbin/amd/config/Makefile.irix3 index 165e0e4..9f208bb 100644 --- a/usr.sbin/amd/config/Makefile.irix3 +++ b/usr.sbin/amd/config/Makefile.irix3 @@ -1,13 +1,13 @@ # @(#)Makefile.irix3 8.1 (Berkeley) 6/6/93 # -# $Id: Makefile.irix3,v 5.2 1992/05/31 16:40:22 jsp Exp $ +# $Id: Makefile.irix3,v 1.1.1.1 1994/05/26 05:22:09 rgrimes Exp $ # # Extra Makefile definitions for IRIX # # For 3.3.x and earlier we might need to indicate the Sun and BSD include # paths. - + DEBUG = #-g -DDEBUG CCOPTS = -I/usr/include/sun -I/usr/include/bsd RESOLV = -lrpcsvc -lsun -lbsd diff --git a/usr.sbin/amd/config/mtab_file.c b/usr.sbin/amd/config/mtab_file.c index 8101f71..5a82cd7 100644 --- a/usr.sbin/amd/config/mtab_file.c +++ b/usr.sbin/amd/config/mtab_file.c @@ -37,7 +37,7 @@ * * @(#)mtab_file.c 8.1 (Berkeley) 6/6/93 * - * $Id: mtab_file.c,v 5.2.2.1 1992/02/09 15:10:42 jsp beta $ + * $Id: mtab_file.c,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * */ @@ -71,7 +71,7 @@ static FILE *mnt_file; * opening mtab may fail with ENFILE. So, go to sleep * for a second and try again. (Yes - this has happened to me.) * - * Note that this *may* block the automounter, oh well. + * Note that this *may* block the automounter, oh well. * If we get to this state then things are badly wrong anyway... * * Give the system 10 seconds to recover but then give up. diff --git a/usr.sbin/amd/config/os-convex.h b/usr.sbin/amd/config/os-convex.h index ade6c4c..2246555 100644 --- a/usr.sbin/amd/config/os-convex.h +++ b/usr.sbin/amd/config/os-convex.h @@ -37,7 +37,7 @@ * * @(#)os-convex.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-convex.h,v 5.2.2.1 1992/02/09 15:10:16 jsp beta $ + * $Id: os-convex.h,v 1.1.1.1 1994/05/26 05:22:07 rgrimes Exp $ * * Convex C220, version 7.1 definitions for Amd (automounter) * from Eitan Mizrotsky <eitan@shum.huji.ac.il> @@ -48,33 +48,33 @@ * Does the compiler grok void * */ #undef VOIDP - + /* * Which version of the Sun RPC library we are using * This is the implementation release number, not * the protocol revision number. */ #define RPC_3 - + /* * Which version of the NFS interface are we using. * This is the implementation release number, not * the protocol revision number. */ #define NFS_3 - + /* * Byte ordering */ #undef ARCH_ENDIAN #define ARCH_ENDIAN "big" - + /* * Name of filesystem types */ #define MOUNT_TYPE_UFS MOUNT_UFS #define MOUNT_TYPE_NFS MOUNT_NFS - - + + #define strrchr rindex #define strchr index diff --git a/usr.sbin/amd/config/os-irix4.h b/usr.sbin/amd/config/os-irix4.h index ee2f8cb..31cb6b1 100644 --- a/usr.sbin/amd/config/os-irix4.h +++ b/usr.sbin/amd/config/os-irix4.h @@ -37,7 +37,7 @@ * * @(#)os-irix4.h 8.1 (Berkeley) 6/6/93 * - * $Id: os-irix4.h,v 5.2 1992/05/31 16:40:22 jsp Exp $ + * $Id: os-irix4.h,v 1.1.1.1 1994/05/26 05:22:10 rgrimes Exp $ * * IRIX 4.0.X definitions for Amd (automounter) * Contributed by Scott R. Presnell <srp@cgl.ucsf.edu> @@ -144,7 +144,7 @@ /* * Under Irix, mount type "auto" is probed by statfs() in df. A statfs() of * a direct mount causes that mount to fire. So change the mount type in - * /etc/mtab to "ignore" to stop that (this is what SGI does for their + * /etc/mtab to "ignore" to stop that (this is what SGI does for their * automounter. Use the old FASCIST define for this. */ #define FASCIST_DF_COMMAND MNTTYPE_IGNORE diff --git a/usr.sbin/amd/fsinfo/fsi_data.h b/usr.sbin/amd/fsinfo/fsi_data.h index 3fc10c4..5ee39c2 100644 --- a/usr.sbin/amd/fsinfo/fsi_data.h +++ b/usr.sbin/amd/fsinfo/fsi_data.h @@ -37,7 +37,7 @@ * * @(#)fsi_data.h 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_data.h,v 5.2.2.1 1992/02/09 15:09:53 jsp beta $ + * $Id: fsi_data.h,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ @@ -84,7 +84,7 @@ struct auto_tree { char *t_defaults; qelem *t_mount; }; - + /* * A host */ diff --git a/usr.sbin/amd/fsinfo/fsi_dict.c b/usr.sbin/amd/fsinfo/fsi_dict.c index 5067e79..3aced3d 100644 --- a/usr.sbin/amd/fsinfo/fsi_dict.c +++ b/usr.sbin/amd/fsinfo/fsi_dict.c @@ -37,7 +37,7 @@ * * @(#)fsi_dict.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_dict.c,v 5.2.2.1 1992/02/09 15:09:43 jsp beta $ + * $Id: fsi_dict.c,v 1.1.1.1 1994/05/26 05:22:17 rgrimes Exp $ * */ @@ -51,7 +51,7 @@ static int dict_hash(k) char *k; { unsigned int h; - + for (h = 0; *k; h += *k++) ; return h % DICTHASH; diff --git a/usr.sbin/amd/fsinfo/fsi_util.c b/usr.sbin/amd/fsinfo/fsi_util.c index c0d8088..f6371ca 100644 --- a/usr.sbin/amd/fsinfo/fsi_util.c +++ b/usr.sbin/amd/fsinfo/fsi_util.c @@ -34,7 +34,7 @@ * * @(#)fsi_util.c 8.1 (Berkeley) 6/6/93 * - * $Id: fsi_util.c,v 5.2.2.1 1992/02/09 15:09:39 jsp beta $ + * $Id: fsi_util.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ @@ -72,7 +72,7 @@ char *s, *s1, *s2, *s3, *s4; fprintf(stderr, "%s:%d: ", l->i_file, l->i_line); fprintf(stderr, s, s1, s2, s3, s4); fputc('\n', stderr); - + } void fatal(s, s1, s2, s3, s4) diff --git a/usr.sbin/amd/fsinfo/wr_atab.c b/usr.sbin/amd/fsinfo/wr_atab.c index 3e07965..95e9426 100644 --- a/usr.sbin/amd/fsinfo/wr_atab.c +++ b/usr.sbin/amd/fsinfo/wr_atab.c @@ -37,7 +37,7 @@ * * @(#)wr_atab.c 8.1 (Berkeley) 6/6/93 * - * $Id: wr_atab.c,v 5.2.2.1 1992/02/09 15:09:44 jsp beta $ + * $Id: wr_atab.c,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ @@ -261,7 +261,7 @@ char *def; errors += pref_close(af); } } - + return errors; } |