diff options
Diffstat (limited to 'contrib/amd/include/am_utils.h')
| -rw-r--r-- | contrib/amd/include/am_utils.h | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/contrib/amd/include/am_utils.h b/contrib/amd/include/am_utils.h index 24741b8394f88..f4e0ccfcddbfb 100644 --- a/contrib/amd/include/am_utils.h +++ b/contrib/amd/include/am_utils.h @@ -17,7 +17,7 @@ * 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 acknowledgment: + * 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 @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_utils.h,v 1.2 1998/12/27 06:25:23 ezk Exp $ + * $Id: am_utils.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $ * */ @@ -158,7 +158,7 @@ extern int umount_fs(char *fs_name, const char *mnttabname); */ #define FSF_VALID 0x0001 /* Valid information available */ #define FSF_DOWN 0x0002 /* This fileserver is thought to be down */ -#define FSF_ERROR 0x0004 /* Permanent error has occurred */ +#define FSF_ERROR 0x0004 /* Permanent error has occured */ #define FSF_WANT 0x0008 /* Want a wakeup call */ #define FSF_PINGING 0x0010 /* Already doing pings */ #define FSRV_ISDOWN(fs) (((fs)->fs_flags & (FSF_DOWN|FSF_VALID)) == (FSF_DOWN|FSF_VALID)) @@ -425,7 +425,7 @@ typedef struct am_stats am_stats; struct amd_stats { int d_drops; /* Dropped requests */ int d_stale; /* Stale NFS handles */ - int d_mok; /* Successful mounts */ + int d_mok; /* Succesful mounts */ int d_merr; /* Failed mounts */ int d_uerr; /* Failed unmounts */ }; @@ -495,7 +495,7 @@ extern char version[]; /* Version info */ /* * Global variables. */ -extern AUTH *nfs_auth; /* Dummy authorization for remote servers */ +extern AUTH *nfs_auth; /* Dummy uthorisation for remote servers */ extern FILE *logfp; /* Log file */ extern am_node **exported_ap; /* List of nodes */ extern am_node *root_node; /* Node for "root" */ @@ -503,22 +503,8 @@ extern char *PrimNetName; /* Name of primary connected network */ extern char *PrimNetNum; /* Name of primary connected network */ extern char *SubsNetName; /* Name of subsidiary connected network */ extern char *SubsNetNum; /* Name of subsidiary connected network */ - -#if 0 -extern char *progname; /* "amd" */ -#endif -extern void am_set_progname(char *pn); /* "amd" */ -extern const char * am_get_progname(void); /* "amd" */ -extern void am_set_hostname(char *hn); -extern const char * am_get_hostname(void); -extern pid_t am_set_mypid(void); -extern pid_t am_mypid; - -#if 0 +extern char *progname; /* "amd"|"mmd" */ extern char hostname[]; /* "kiska" */ -extern pid_t mypid; /* Current process id */ -#endif - extern int first_free_map; /* First free node */ extern int foreground; /* Foreground process */ extern int immediate_abort; /* Should close-down unmounts be retried */ @@ -527,6 +513,7 @@ extern int orig_umask; /* umask() on startup */ extern int task_notify_todo; /* Task notifier needs running */ extern int xlog_level; /* Logging level */ extern int xlog_level_init; +extern pid_t mypid; /* Current process id */ extern serv_state amd_state; /* Should we go now */ extern struct in_addr myipaddr; /* (An) IP address of this host */ extern struct opt_tab xlog_opt[]; @@ -578,7 +565,6 @@ extern int make_nfs_auth(void); extern int make_rpc_packet(char *, int, u_long, struct rpc_msg *, voidp, XDRPROC_T_TYPE, AUTH *); extern int mapc_keyiter(mnt_map *, void(*)(char *, voidp), voidp); extern int mapc_search(mnt_map *, char *, char **); -extern int mapc_type_exists(const char *type); extern int mkdirs(char *, int); extern int mount_auto_node(char *, voidp); extern int mount_automounter(int); @@ -590,7 +576,7 @@ extern int pickup_rpc_reply(voidp, int, voidp, XDRPROC_T_TYPE); extern int root_keyiter(void(*)(char *, voidp), voidp); extern int softclock(void); extern int switch_option(char *); -extern int switch_to_logfile(char *logfile, int orig_umask); +extern int switch_to_logfile(char *); extern int timeout(u_int, void (*fn)(voidp), voidp); extern int valid_key(char *); extern mnt_map *mapc_find(char *, char *, const char *); @@ -865,7 +851,7 @@ extern int amfs_link_fmount(mntfs *mf); #endif /* HAVE_AM_FS_LINK */ /* - * Symbolic-link file system, which also checks that the target of + * Symbolic-link file syste, which also checks that the target of * the symlink exists. * A "filesystem" which is just a symbol link. */ @@ -959,7 +945,7 @@ extern void print_nfs_args(const nfs_args_t *nap, u_long nfs_version); #endif /* not DEBUG */ extern int debug_flags; /* Debug options */ -extern int debug_option (char *opt); +extern int debug_option (char *); extern struct opt_tab dbg_opt[]; extern void dplog(char *fmt, ...); |