6271123 gcc and cmd/fs.d (top level) don't get along

8 files changed, 179 insertions, 162 deletions

diff --git a/usr/src/cmd/fs.d/df.c b/usr/src/cmd/fs.d/df.c
index 6852626a68..2650f41811 100644
--- a/usr/src/cmd/fs.d/df.c
+++ b/usr/src/cmd/fs.d/df.c
@@ -234,7 +234,7 @@ static int		scale;
 
 static void usage(void);
 static void do_devnm(int, char **);
-static void do_df(int, char **);
+static void do_df(int, char **)	__NORETURN;
 static void parse_options(int, char **);
 static char *basename(char *);
 
@@ -251,7 +251,7 @@ static void (*_zfs_close)(zfs_handle_t *);
 static uint64_t (*_zfs_prop_get_int)(zfs_handle_t *, zfs_prop_t);
 static void (*_zfs_set_error_handler)(void (*)(const char *, va_list));
 
-void
+int
 main(int argc, char *argv[])
 {
 	void *hdl;
@@ -351,7 +351,7 @@ errmsg(int flags, char *fmt, ...)
 
 
 static void
-usage()
+usage(void)
 {
 #ifdef  XPG4
 	errmsg(ERR_NONAME,
@@ -395,6 +395,7 @@ xmalloc(size_t size)
 		return (p);
 	errmsg(ERR_FATAL, "out of memory");
 	/* NOTREACHED */
+	return (NULL);
 }
 
 
@@ -410,6 +411,7 @@ xrealloc(void *ptr, size_t size)
 		return (p);
 	errmsg(ERR_FATAL, "out of memory");
 	/* NOTREACHED */
+	return (NULL);
 }
 
 
@@ -432,7 +434,7 @@ xfopen(char *file)
  * remote_fstypes array.
  */
 static void
-init_remote_fs()
+init_remote_fs(void)
 {
 	FILE	*fp;
 	char	line_buf[LINEBUF_SIZE];
@@ -533,7 +535,7 @@ mtab_error(char *mtab_file, int status)
  * We keep the table in memory for faster lookups.
  */
 static void
-mtab_read_file()
+mtab_read_file(void)
 {
 	char		*mtab_file = MOUNT_TAB;
 	FILE		*fp;
@@ -1030,7 +1032,7 @@ prune_list(struct df_request request_list[],
  * Options are checked in order of their precedence.
  */
 static void
-print_header()
+print_header(void)
 {
 	if (use_scaling) { /* this comes from the -h option */
 		int arg = 'h';
@@ -1517,7 +1519,7 @@ static char	*total_str;
 static char	*kilobytes_str;
 
 static void
-strings_init()
+strings_init(void)
 {
 	total_str = TRANSLATE("total");
 #ifdef	_iBCS2
@@ -1898,7 +1900,7 @@ create_request_list(
  * the SVR4 df.
  */
 static struct df_output *
-select_output()
+select_output(void)
 {
 	static struct df_output dfo;
 
diff --git a/usr/src/cmd/fs.d/ff.c b/usr/src/cmd/fs.d/ff.c
index c317d50321..df6fcb8ba8 100644
--- a/usr/src/cmd/fs.d/ff.c
+++ b/usr/src/cmd/fs.d/ff.c
@@ -24,7 +24,7 @@
 
 
 /*
- * Copyright 1996-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -69,13 +69,16 @@ struct commands {
 	};
 struct 	commands *c_ptr;
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+static void usage(char *cmd, char *usg);
+static void exec_specific(void);
+static void lookup(void);
+
+int
+main(int argc, char *argv[])
 {
 	FILE *fp;
 	struct vfstab	vfsbuf;
-	register char *ptr;
+	char *ptr;
 	int	i;
 	int	verbose = 0;		/* set if -V is specified */
 	int	F_flg = 0;
@@ -238,12 +241,12 @@ char	*argv[];
 		if (!F_flg)
 			fstype = NULL;
 	}
-	exit(0);
+	return (0);
 }
 
 /* see if all numbers */
-numbers(yp)
-	char	*yp;
+int
+numbers(char *yp)
 {
 	if (yp == NULL)
 		return (0);
@@ -254,9 +257,8 @@ numbers(yp)
 	return (1);
 }
 
-
-usage(cmd, usg)
-char *cmd, *usg;
+static void
+usage(char *cmd, char *usg)
 {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr, "%s %s\n", cmd, usg);
@@ -272,7 +274,8 @@ char *cmd, *usg;
  *	special, fstype
  */
 
-lookup()
+static void
+lookup(void)
 {
 	FILE	*fd;
 	int	ret;
@@ -317,7 +320,9 @@ lookup()
 		break;
 	}
 }
-exec_specific()
+
+static void
+exec_specific(void)
 {
 int status, pid, ret;
 
diff --git a/usr/src/cmd/fs.d/fsck.c b/usr/src/cmd/fs.d/fsck.c
index 42a9b94358..3eda1bdcff 100644
--- a/usr/src/cmd/fs.d/fsck.c
+++ b/usr/src/cmd/fs.d/fsck.c
@@ -107,6 +107,15 @@ static struct devlist {
  */
 static struct vfstab	vfsave = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 
+static void usage(void);
+static void fsck_dopreen(struct devlist **devp, int ndevs);
+static void waiter(struct devlist **blp, struct devlist **badlist);
+static void print_badlist(struct devlist *lp);
+static void startdisk(struct devlist *dp);
+static void do_exec(char *fstype, char *nargv[]);
+static void prnt_cmd(FILE *fd, char *fstype);
+static void vfserror(int flag);
+
 static int
 vfdup(struct vfstab *vp)
 {
@@ -204,9 +213,8 @@ mygetvfsany(FILE *fp, struct vfstab *vp, struct vfstab *vrefp)
 	return (vfdup(vp));
 }
 
-main(argc, argv)
-	int	argc;
-	char	*argv[];
+int
+main(int argc, char *argv[])
 {
 	int	cc, ret, other_than_ufs = 0;
 	int	questflg = 0, Fflg = 0, Vflg = 0, sanity = 0;
@@ -538,17 +546,15 @@ try_again:
 			fsck_dopreen(&devs, preencnt);
 		}
 	}
-	exit(exitstat);
+	return (exitstat);
 }
 
-static
-fsck_dopreen(devp, ndevs)
-	struct devlist **devp;
-	int ndevs;
+static void
+fsck_dopreen(struct devlist **devp, int ndevs)
 {
 	char name[1024];
 	int rc;
-	register int i;
+	int i;
 	struct devlist *bl, *bdp;
 	struct devlist *badlist;
 
@@ -591,9 +597,8 @@ fsck_dopreen(devp, ndevs)
 		print_badlist(badlist);
 }
 
-static
-startdisk(dp)
-	struct devlist *dp;
+static void
+startdisk(struct devlist *dp)
 {
 	pid_t pid;
 
@@ -609,14 +614,12 @@ startdisk(dp)
 	}
 }
 
-static
-waiter(blp, badlist)
-	struct devlist **blp;
-	struct devlist **badlist;
+static void
+waiter(struct devlist **blp, struct devlist **badlist)
 {
 	pid_t curpid;
 	int status;
-	register struct devlist *bdp, *pbdp;
+	struct devlist *bdp, *pbdp;
 
 	curpid = wait(&status);
 	if (curpid == -1) {
@@ -654,9 +657,8 @@ waiter(blp, badlist)
 	}
 }
 
-static
-print_badlist(lp)
-	struct devlist *lp;
+static void
+print_badlist(struct devlist *lp)
 {
 	int x, len;
 
@@ -681,8 +683,7 @@ gettext("\nTHE FOLLOWING FILE SYSTEM(S) HAD AN UNEXPECTED INCONSISTENCY:"));
  */
 static
 struct devlist *
-newdev(vfsp)
-	struct vfstab *vfsp;
+newdev(struct vfstab *vfsp)
 {
 	struct devlist *dp;
 	extern char *strdup();
@@ -708,11 +709,9 @@ newdev(vfsp)
  */
 static
 struct devlist *
-getdev(name, list)
-	char *name;
-	struct devlist **list;
+getdev(char *name, struct devlist **list)
 {
-	register struct devlist *p, *lp;
+	struct devlist *p, *lp;
 
 	for (lp = NULL, p = *list; p != NULL; lp = p, p = p->nxt) {
 		if (strcmp(p->name, name) == 0)
@@ -729,8 +728,8 @@ getdev(name, list)
 }
 
 /* see if all numbers */
-numbers(yp)
-	char	*yp;
+int
+numbers(char *yp)
 {
 	if (yp == NULL)
 		return (0);
@@ -741,10 +740,8 @@ numbers(yp)
 	return (1);
 }
 
-execute(fsckdev, fstype, Vflg, fd)
-	char	*fsckdev, *fstype;
-	int	Vflg;
-	FILE	*fd;
+int
+execute(char *fsckdev, char *fstype, int Vflg, FILE *fd)
 {
 	int	st;
 	pid_t	fk;
@@ -810,8 +807,8 @@ execute(fsckdev, fstype, Vflg, fd)
 	return (status);
 }
 
-do_exec(fstype, nargv)
-	char	*fstype, *nargv[];
+static void
+do_exec(char *fstype, char *nargv[])
 {
 	char	full_path[PATH_MAX];
 	char	*vfs_path = VFS_PATH;
@@ -865,9 +862,8 @@ do_exec(fstype, nargv)
 	exit(1);
 }
 
-prnt_cmd(fd, fstype)
-	FILE	*fd;
-	char	*fstype;
+static void
+prnt_cmd(FILE *fd, char *fstype)
 {
 	char	**argp;
 
@@ -877,8 +873,8 @@ prnt_cmd(fd, fstype)
 	fprintf(fd, "\n");
 }
 
-vfserror(flag)
-	int	flag;
+static void
+vfserror(int flag)
 {
 	switch (flag) {
 	case VFS_TOOLONG:
@@ -907,8 +903,8 @@ int
 getopt(int argc, char * const *argv, const char *opts)
 {
 	static int sp = 1;
-	register int c;
-	register char *cp;
+	int c;
+	char *cp;
 
 	if (sp == 1)
 		if (optind >= argc ||
@@ -966,9 +962,8 @@ getopt(int argc, char * const *argv, const char *opts)
 	return (c);
 }
 
-isoptarg(cc, arg)
-	int	cc;
-	char	*arg;
+int
+isoptarg(int cc, char *arg)
 {
 	if (cc == 's' || cc == 'S') {
 		while (*arg >= '0' && *arg <= '9')
@@ -984,7 +979,8 @@ isoptarg(cc, arg)
 	return (0);
 }
 
-usage()
+static void
+usage(void)
 {
 	fprintf(stderr,
 		gettext("Usage:\n%s [-F FSType] [-V] [-m] [special ...]\n"
diff --git a/usr/src/cmd/fs.d/mount.c b/usr/src/cmd/fs.d/mount.c
index 2b16cd8082..f0c9e9c760 100644
--- a/usr/src/cmd/fs.d/mount.c
+++ b/usr/src/cmd/fs.d/mount.c
@@ -24,7 +24,7 @@
 
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -217,10 +217,8 @@ static int	ignore(char *);
  * -V will print the built command on the stdout.
  * It isn't passed either.
  */
-void
-main(argc, argv)
-	int	argc;
-	char	*argv[];
+int
+main(int argc, char *argv[])
 {
 	char	*special,		/* argument of special/resource */
 		*mountp,		/* argument of mount directory */
@@ -538,11 +536,11 @@ out:
 	newargv[ii] = NULL;
 
 	doexec(fstype, newargv);
-	exit(0);
+	return (0);
 }
 
 void
-usage()
+usage(void)
 {
 	fprintf(stderr,	gettext("Usage:\n%s [-v | -p]\n"), myname);
 	fprintf(stderr, gettext(
@@ -592,8 +590,7 @@ elide_dev(char *mntopts)
 }
 
 void
-print_mnttab(vflg, pflg)
-	int	vflg, pflg;
+print_mnttab(int vflg, int pflg)
 {
 	FILE	*fd;
 	FILE	*rfp;			/* this will be NULL if fopen fails */
@@ -645,9 +642,7 @@ print_mnttab(vflg, pflg)
 }
 
 char	*
-flags(mntopts, flag)
-	char	*mntopts;
-	int	flag;
+flags(char *mntopts, int flag)
 {
 	char	opts[sizeof (mntflags)];
 	char	*value;
@@ -729,9 +724,7 @@ flags(mntopts, flag)
 }
 
 char	*
-remote(fstype, rfp)
-	char	*fstype;
-	FILE	*rfp;
+remote(char *fstype, FILE *rfp)
 {
 	char	buf[BUFSIZ];
 	char	*fs;
@@ -779,8 +772,7 @@ gettext("%s: Warning: Line for \"%s\" in vfstab has too many entries\n"),
 }
 
 void
-mnterror(flag)
-	int	flag;
+mnterror(int flag)
 {
 	switch (flag) {
 	case MNT_TOOLONG:
@@ -803,8 +795,7 @@ mnterror(flag)
 }
 
 void
-doexec(fstype, newargv)
-	char	*fstype, *newargv[];
+doexec(char *fstype, char *newargv[])
 {
 	char	full_path[PATH_MAX];
 	char	alter_path[PATH_MAX];
@@ -870,8 +861,7 @@ char *mntopts[] = { MNTOPT_IGNORE, NULL };
  * Return 1 if "ignore" appears in the options string
  */
 int
-ignore(opts)
-	char *opts;
+ignore(char *opts)
 {
 	char *value;
 	char *saveptr, *my_opts;
@@ -1184,7 +1174,7 @@ make_vfsarray(char **mntlist, int count)
  * Sets exitcode to non-zero if any errors occurred.
  */
 void
-do_mounts()
+do_mounts(void)
 {
 	int 		i, isave, cnt;
 	vfsent_t 	*vp, *vpprev, **vl;
@@ -1400,7 +1390,7 @@ doio(vfsent_t *vp)
  * Returns 1 if a child died with an error.
  */
 int
-dowait()
+dowait(void)
 {
 	int child, wstat;
 
@@ -1553,6 +1543,7 @@ mlevelcmp(const void *a, const void *b)
 }
 
 /* sort by vfstab order.  0..N */
+static int
 mordercmp(const void *a, const void *b)
 {
 	vfsent_t *a1, *b1;
@@ -1623,7 +1614,7 @@ check_fields(char *fstype, char *mountp)
 }
 
 void
-nomem()
+nomem(void)
 {
 	fprintf(stderr, gettext("%s: Out of memory\n"), myname);
 	while (nrun > 0 && (dowait() != -1))
diff --git a/usr/src/cmd/fs.d/preenlib.c b/usr/src/cmd/fs.d/preenlib.c
index 95c5a25dce..cb474b261d 100644
--- a/usr/src/cmd/fs.d/preenlib.c
+++ b/usr/src/cmd/fs.d/preenlib.c
@@ -21,8 +21,8 @@
  */
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 /*
- * Copyright (c) 1992,1996, by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 /*
@@ -40,7 +40,7 @@
 /*
  * data structures for parallelization
  */
-static struct driver {
+struct driver {
 	char 	*name;			/* driver name (from DKIOCINFO) */
 	uint_t	mapsize;		/* size of `busymap' */
 	uint_t	*busymap;		/* bitmask of active units */
@@ -48,14 +48,14 @@ static struct driver {
 	void	*data;			/* driver private data */
 };
 
-static struct onedev {
+struct onedev {
 	int	drvid;			/* index in driver array */
 	uint_t	mapsize;		/* size of `unitmap' */
 	uint_t	*unitmap;		/* unit #'s (from DKIOCINFO) */
 	struct onedev *nxtdev;
 };
 
-static struct rawdev {
+struct rawdev {
 	char	*devname;		/* name passed to preen_addev */
 	struct	onedev *alldevs;	/* info about each component device */
 	struct rawdev *nxtrd;		/* next entry in list */
@@ -101,6 +101,7 @@ static void	notbusy(struct rawdev *);
 /*
  * add the given device to the list of devices to be checked
  */
+int
 preen_addev(char *devnm)
 {
 	struct rawdev *rdp;
@@ -139,6 +140,7 @@ preen_addev(char *devnm)
 	return (0);
 }
 
+int
 preen_subdev(char *name, struct dk_cinfo *dkiop, void *dp)
 {
 	char modname[255];
@@ -167,10 +169,11 @@ preen_subdev(char *name, struct dk_cinfo *dkiop, void *dp)
  * select a device from the "unchecked" list, and add it to the
  * active list.
  */
+int
 preen_getdev(char *devnm)
 {
 	struct rawdev *rdp;
-	register struct onedev *dp;
+	struct onedev *dp;
 
 	if (unchecked == NULL)
 		return (0);
@@ -190,9 +193,10 @@ preen_getdev(char *devnm)
 	}
 }
 
+int
 preen_releasedev(char *name)
 {
-	register struct rawdev *dp, *ldp;
+	struct rawdev *dp, *ldp;
 
 	for (ldp = NULL, dp = active; dp != NULL; ldp = dp, dp = dp->nxtrd) {
 		if (strcmp(dp->devname, name) == 0)
@@ -219,9 +223,9 @@ static
 struct rawdev *
 get_runnable(struct rawdev **devlist)
 {
-	register struct rawdev *last, *rdp;
-	register struct onedev *devp;
-	register struct driver *drvp;
+	struct rawdev *last, *rdp;
+	struct onedev *devp;
+	struct driver *drvp;
 	int rc = 1;
 
 	for (last = NULL, rdp = *devlist; rdp; last = rdp, rdp = rdp->nxtrd) {
@@ -264,9 +268,9 @@ preen_addunit(
 	void	*datap,		/* driver private data */
 	uint_t	unit)		/* unit number */
 {
-	register int drvid;
-	register struct driver *dp;
-	register struct onedev *devp;
+	int drvid;
+	struct driver *dp;
+	struct onedev *devp;
 	struct rawdev *rdp = (struct rawdev *)cookie;
 
 	/*
@@ -318,7 +322,7 @@ static
 int
 alloc_driver(char *name, int (*cf)(), void *datap)
 {
-	register struct driver *dp;
+	struct driver *dp;
 	extern char *strdup();
 
 	if (ndrivers == ndalloc) {
@@ -351,7 +355,7 @@ static
 struct onedev *
 alloc_dev(int did)
 {
-	register struct onedev *devp;
+	struct onedev *devp;
 
 	devp = (struct onedev *)malloc(sizeof (struct onedev));
 	if (devp == NULL) {
@@ -388,10 +392,10 @@ addunit(struct onedev *devp, uint_t unit)
 	devp->unitmap[unit / WORDSIZE] |= (1 << (unit % WORDSIZE));
 }
 
-static
+static int
 chooseone(int devmapsize, ulong_t *devmap, int drvmapsize, ulong_t *drvmap)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < min(devmapsize, drvmapsize); i++) {
 		if (devmap[i] & drvmap[i])
@@ -410,7 +414,7 @@ makebusy(struct onedev *dev)
 {
 	struct driver *drvp = &dlist[dev->drvid];
 	int newsize = dev->mapsize;
-	register int i;
+	int i;
 
 	if (drvp->mapsize < newsize) {
 		drvp->busymap = drvp->mapsize ?
@@ -440,7 +444,7 @@ notbusy(struct rawdev *rd)
 {
 	struct onedev *devp;
 	struct driver *drvp;
-	register int i;
+	int i;
 
 	for (devp = rd->alldevs; devp; devp = devp->nxtdev) {
 		drvp = &dlist[devp->drvid];
diff --git a/usr/src/cmd/fs.d/switchout.c b/usr/src/cmd/fs.d/switchout.c
index 2870df7b6b..fc9915bdd9 100644
--- a/usr/src/cmd/fs.d/switchout.c
+++ b/usr/src/cmd/fs.d/switchout.c
@@ -113,11 +113,13 @@ struct commands {
 };
 struct 	commands *c_ptr;
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+static void usage(char *cmd, char **usg);
+static void lookup(void);
+
+int
+main(int argc, char *argv[])
 {
-	register char *ptr;
+	char 	*ptr;
 	char	full_path[PATH_MAX];
 	char	*vfs_path = VFS_PATH;
 	char	*alt_path = ALT_PATH;
@@ -332,12 +334,11 @@ char	*argv[];
 	(void) fprintf(stderr,
 	    gettext("%s: Operation not applicable for FSType %s \n"),
 	    cbasename, fstype);
-	exit(2);
+	return (2);
 }
 
-usage(cmd, usg)
-char *cmd;
-char **usg;
+static void
+usage(char *cmd, char **usg)
 {
 	int i;
 	(void) fprintf(stderr, gettext("Usage:\n"));
@@ -356,7 +357,8 @@ char **usg;
  *	special, fstype
  */
 
-lookup()
+static void
+lookup(void)
 {
 	FILE	*fd;
 	int	ret;
@@ -401,10 +403,7 @@ lookup()
 }
 
 void
-stat_snap(cmd, mountpoint, opts)
-char *cmd;
-char *mountpoint;
-char *opts;
+stat_snap(char *cmd, char *mountpoint, char *opts)
 {
 	int fd; /* check mount point if given */
 	int en;
diff --git a/usr/src/cmd/fs.d/umount.c b/usr/src/cmd/fs.d/umount.c
index 91fb049dab..0139e68205 100644
--- a/usr/src/cmd/fs.d/umount.c
+++ b/usr/src/cmd/fs.d/umount.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -151,9 +151,8 @@ static mountent_t	*getmntall();
 static mountent_t 	*new_mountent(struct mnttab *);
 static mountent_t	*getmntlast(mountent_t *, char *, char *);
 
-main(argc, argv)
-	int	argc;
-	char	**argv;
+int
+main(int argc, char **argv)
 {
 	int 	cc;
 	struct mnttab  mget;
@@ -334,7 +333,7 @@ main(argc, argv)
 	else
 		doexec(&mget);
 
-	exit(0);
+	return (0);
 }
 
 void
@@ -466,8 +465,7 @@ doexec(struct mnttab *ment)
 }
 
 void
-rpterr(sp)
-	char	*sp;
+rpterr(char *sp)
 {
 	switch (errno) {
 	case EPERM:
@@ -502,7 +500,7 @@ rpterr(sp)
 }
 
 void
-usage()
+usage(void)
 {
 	fprintf(stderr, gettext(
 "Usage:\n%s [-f] [-V] [-o specific_options] {special | mount-point}\n"),
@@ -513,8 +511,7 @@ usage()
 }
 
 void
-mnterror(flag)
-	int	flag;
+mnterror(int flag)
 {
 	switch (flag) {
 	case MNT_TOOLONG:
@@ -744,7 +741,7 @@ make_mntarray(char **mntlist, int count)
  * Returns NULL if none are found.
  */
 mountent_t *
-getmntall()
+getmntall(void)
 {
 	FILE		*fp;
 	mountent_t	*mtail;
@@ -892,7 +889,7 @@ cleanup(int asig)
  * Sets the global exitcode if an error occurred.
  */
 int
-dowait()
+dowait(void)
 {
 	int		wstat, child, ret;
 	mountent_t 	*mp, *prevp;
@@ -1056,7 +1053,7 @@ doio(mountent_t *mp)
 }
 
 void
-nomem()
+nomem(void)
 {
 	fprintf(stderr, gettext("%s: out of memory\n"), myname);
 	/*
diff --git a/usr/src/cmd/fs.d/volcopy.c b/usr/src/cmd/fs.d/volcopy.c
index 6b62a5c530..a243526492 100644
--- a/usr/src/cmd/fs.d/volcopy.c
+++ b/usr/src/cmd/fs.d/volcopy.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -45,10 +45,10 @@ static int perr(const char *fmt, ...);
 
 #define	VFS_PATH	"/usr/lib/fs"
 
-#define	EQ(X,Y,Z)	!strncmp(X,Y,Z)
+#define	EQ(X, Y, Z)	!strncmp(X, Y, Z)
 #define	NEWARG()\
 	(nargv[nargc++] = &argv[1][0],\
-	 nargc == ARGV_MAX ? perr("volcopy:  too many arguments.\n") : 1)
+		nargc == ARGV_MAX ? perr("volcopy:  too many arguments.\n") : 1)
 
 extern char	*default_fstype();
 
@@ -57,19 +57,20 @@ int	nargc = 2;
 
 char	vfstab[] = VFSTAB;
 
-main(argc, argv)
-	int	argc;
-	char	**argv;
+static void doexec(char *fstype, char *nargv[]);
+
+int
+main(int argc, char **argv)
 {
-	register char	cc;
-	register int	ii, Vflg = 0, Fflg = 0;
-	register char	*fstype = NULL;
-	register FILE	*fd;
+	char	cc;
+	int	ii, Vflg = 0, Fflg = 0;
+	char	*fstype = NULL;
+	FILE	*fd;
 	struct vfstab	vget, vref;
 
-	(void) setlocale(LC_ALL,"");
+	(void) setlocale(LC_ALL, "");
 #if !defined(TEXT_DOMAIN)
-#define TEXT_DOMAIN "SYS_TEST"
+#define	TEXT_DOMAIN	"SYS_TEST"
 #endif
 	(void) textdomain(TEXT_DOMAIN);
 
@@ -123,18 +124,25 @@ main(argc, argv)
 			Vflg++;
 		} else if (EQ(argv[1], "-F", 2)) {
 			if (Fflg)
-				perr("volcopy: More than one FSType specified.\nUsage:\nvolcopy [-F FSType] [-V] [current_options] [-o specific_options] operands\n");
+				perr("volcopy: More than one"
+					"FSType specified.\n"
+					"Usage:\nvolcopy [-F FSType] [-V]"
+					" [current_options] [-o "
+					"specific_options] operands\n");
 			Fflg++;
 			if (argv[1][2] == '\0') {
 				++argv;
 				--argc;
 				if (argc == 1)
-					perr("Usage:\nvolcopy [-F FSType] [-V] [current_options] [-o specific_options] operands\n");
+					perr("Usage:\nvolcopy [-F FSType] [-V]"
+						" [current_options] [-o "
+						"specific_options] operands\n");
 				fstype = &argv[1][0];
 			} else
 				fstype = &argv[1][2];
 			if (strlen(fstype) > FSTYPE_MAX)
-				perr("volcopy: FSType %s exceeds %d characters\n", fstype, FSTYPE_MAX);
+				perr("volcopy: FSType %s exceeds %d"
+					" characters\n", fstype, FSTYPE_MAX);
 		} else if (EQ(argv[1], "-o", 2)) {
 			NEWARG();
 			if (argv[1][2] == '\0') {
@@ -143,25 +151,35 @@ main(argc, argv)
 				NEWARG();
 			}
 			if (Fflg && strlen(fstype) > FSTYPE_MAX)
-				perr("volcopy: FSType %s exceeds %d characters.\nUsage:\nvolcopy [-F FSType] [-V] [current_options] [-o specific_options] operands\n",fstype, FSTYPE_MAX);
+				perr("volcopy: FSType %s exceeds %d "
+					"characters.\nUsage:\nvolcopy "
+					"[-F FSType] [-V] [current_options] "
+					"[-o specific_options] "
+					"operands\n", fstype, FSTYPE_MAX);
 		} else if (EQ(argv[1], "-nosh", 5)) { /* 3b15 only */
 			NEWARG();
-		} else if (EQ(argv[1], "-?", 2)) { 
+		} else if (EQ(argv[1], "-?", 2)) {
 			if (Fflg) {
 				nargv[2] = "-?";
 				doexec(fstype, nargv);
-			}
-			else {
-				perr("Usage:\nvolcopy [-F FSType] [-V] [current_options] [-o specific_options] operands\n");
+			} else {
+				perr("Usage:\nvolcopy [-F FSType] [-V] "
+					"[current_options] [-o "
+					"specific_options] operands\n");
 		}
 		} else
-			perr("<%s> invalid option\nUsage:\nvolcopy [-F FSType] [-V] [current_options] [-o specific_options] operands\n",argv[1]);
+			perr("<%s> invalid option\nUsage:\n"
+				"volcopy [-F FSType] [-V] "
+				"[current_options] [-o "
+				"specific_options] operands\n", argv[1]);
 		++argv;
 		--argc;
 	} /* argv[1][0] == '-' */
 
 	if (argc != 6) /* if mandatory fields not present */
-		perr("Usage:\nvolcopy [-F FSType] [-V] [current_options] [-o specific_options] operands\n");
+		perr("Usage:\nvolcopy [-F FSType] [-V] "
+			"[current_options] [-o "
+			"specific_options] operands\n");
 
 	if (nargc + 5 >= ARGV_MAX)
 		perr("volcopy: too many arguments.\n");
@@ -193,7 +211,8 @@ main(argc, argv)
 			fstype = vget.vfs_fstype;
 			break;
 		case VFS_TOOLONG:
-			perr("volcopy: line in vfstab exceeds %d characters\n", VFS_LINE_MAX-2);
+			perr("volcopy: line in vfstab exceeds "
+				"%d characters\n", VFS_LINE_MAX-2);
 			break;
 		case VFS_TOOFEW:
 			perr("volcopy: line in vfstab has too few entries\n");
@@ -201,6 +220,8 @@ main(argc, argv)
 		case VFS_TOOMANY:
 			perr("volcopy: line in vfstab has too many entries\n");
 			break;
+		default:
+			break;
 		}
 	}
 
@@ -213,10 +234,11 @@ main(argc, argv)
 	}
 
 	doexec(fstype, nargv);
+	return (0);
 }
 
-doexec(fstype, nargv)
-	char	*fstype, *nargv[];
+static void
+doexec(char *fstype, char *nargv[])
 {
 	char	full_path[PATH_MAX];
 	char	*vfs_path = VFS_PATH;
@@ -230,7 +252,8 @@ doexec(fstype, nargv)
 	/* Try to exec the fstype dependent portion of the mount. */
 	execv(full_path, &nargv[1]);
 	if (errno == EACCES) {
-		perr("volcopy: cannot execute %s - permission denied\n", full_path);
+		perr("volcopy: cannot execute %s"
+			" - permission denied\n", full_path);
 		exit(1);
 	}
 	if (errno == ENOEXEC) {
@@ -252,7 +275,7 @@ perr(const char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	(void)vfprintf(stderr, gettext(fmt), ap);
+	(void) vfprintf(stderr, gettext(fmt), ap);
 	va_end(ap);
 	exit(1);
 	return (0);