 @@ -1,14 +1,14 @@
-/* $NetBSD: ln.c,v 1.34 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: ln.c,v 1.35 2011/08/29 14:38:30 joerg Exp $ */
 /*
  * Copyright (c) 1987, 1993, 1994
  *	The 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.
 @@ -29,54 +29,53 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #else
-__RCSID("$NetBSD: ln.c,v 1.34 2008/07/20 00:52:40 lukem Exp $");
+__RCSID("$NetBSD: ln.c,v 1.35 2011/08/29 14:38:30 joerg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-int	fflag;				/* Unlink existing files. */
+static int	fflag;				/* Unlink existing files. */
-int	hflag;				/* Check new name for symlink first. */
+static int	hflag;				/* Check new name for symlink first. */
-int	iflag;				/* Interactive mode. */
+static int	iflag;				/* Interactive mode. */
-int	sflag;				/* Symbolic, not hard, link. */
+static int	sflag;				/* Symbolic, not hard, link. */
-int	vflag;                          /* Verbose output */
+static int	vflag;                          /* Verbose output */
 					/* System link call. */
-int (*linkf)(const char *, const char *);
+static int (*linkf)(const char *, const char *);
-char   linkch;
+static char   linkch;
-int	linkit(const char *, const char *, int);
+static int	linkit(const char *, const char *, int);
-void	usage(void);
+__dead static void	usage(void);
 int	main(int, char *[]);
 int
 main(int argc, char *argv[])
+{
 	struct stat sb;
 	int ch, exitval;
 	char *sourcedir;
 	setprogname(argv[0]);
 	(void)setlocale(LC_ALL, "");
 	while ((ch = getopt(argc, argv, "fhinsv")) != -1)
 		switch (ch) {
 @@ -140,27 +139,27 @@ main(int argc, char *argv[])
 		err(EXIT_FAILURE, "%s", sourcedir);
 		/* NOTREACHED */
+	}
 	if (!S_ISDIR(sb.st_mode)) {
 		usage();
 		/* NOTREACHED */
+	}
 	for (exitval = 0; *argv != sourcedir; ++argv)
 		exitval |= linkit(*argv, sourcedir, 1);
 	exit(exitval);
 	/* NOTREACHED */
+}
-int
+static int
 linkit(const char *target, const char *source, int isdir)
+{
 	struct stat sb;
 	const char *p;
 	char path[MAXPATHLEN];
 	int ch, exists, first;
 	if (!sflag) {
 		/* If target doesn't exist, quit now. */
 		if (stat(target, &sb)) {
 			warn("%s", target);
 			return (1);
+		}
 @@ -209,23 +208,23 @@ linkit(const char *target, const char *s
+	}
 	/* Attempt the link. */
 	if ((*linkf)(target, source)) {
 		warn("%s", source);
 		return (1);
+	}
 	if (vflag)
 		(void)printf("%s %c> %s\n", source, linkch, target);
 	return (0);
+}
-void
+static void
 usage(void)
+{
 	(void)fprintf(stderr,
 	    "usage:\t%s [-fhinsv] file1 file2\n\t%s [-fhinsv] file ... directory\n",
 	    getprogname(), getprogname());
 	exit(1);
 	/* NOTREACHED */
+}