CVS commit: src/distrib/utils/tls

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri May 20 02:12:39 UTC 2011

Modified Files:
        src/distrib/utils/tls: tls.c

Log Message:
a little better.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/tls/tls.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/distrib/utils/tls/tls.c
diff -u src/distrib/utils/tls/tls.c:1.5 src/distrib/utils/tls/tls.c:1.6
--- src/distrib/utils/tls/tls.c:1.5	Thu May 19 18:14:15 2011
+++ src/distrib/utils/tls/tls.c	Thu May 19 22:12:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls.c,v 1.5 2011/05/19 22:14:15 tsutsui Exp $	*/
+/*	$NetBSD: tls.c,v 1.6 2011/05/20 02:12:39 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -26,19 +26,20 @@
  */
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 
 #include <dirent.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <time.h>
 #include <unistd.h>
 
-int iflag;
+static int iflag;
 
-int main(int, char *[]);
-void show_long(char *fname);
+static void show_long(const char *);
 
 int
 main(int argc, char *argv[])
@@ -48,28 +49,25 @@
 
 	/* If given an arg, just cd there first. */
 	if (argc > 1) {
-		if (chdir(argv[1])) {
-			perror(argv[1]);
-			exit(1);
-		}
+		if (chdir(argv[1]))
+			err(1, "chdir `%s'", argv[1]);
 	}
 	if (argc > 2)
 		fprintf(stderr, "extra args ignored\n");
 
 	dfp = opendir(".");
-	if (dfp == NULL) {
+	if (dfp == NULL)
 		err(EXIT_FAILURE, "opendir");
-	}
 
 	while ((d = readdir(dfp)) != NULL)
 		show_long(d->d_name);
 
 	closedir(dfp);
-	exit(EXIT_SUCCESS);
+	return EXIT_SUCCESS;
 }
 
 /* XXX - This is system dependent... */
-const char ifmt_name[16] = {
+static const char ifmt_name[16] = {
 	'?',	/* 0: nothing */
 	'P',	/* 1: fifo (pipe) */
 	'C',	/* 2: chr device */
@@ -88,8 +86,8 @@
 	'?' 	/* F: ? */
 };
 
-void
-show_long(char *fname)
+static void
+show_long(const char *fname)
 {
 	struct stat st;
 	int ifmt;
@@ -97,7 +95,7 @@
 	char *date;
 
 	if (lstat(fname, &st)) {
-		perror(fname);
+		warn("lstat `%s'", fname);
 		return;
 	}
 	ifmt = (st.st_mode >> 12) & 15;
@@ -138,12 +136,12 @@
 	printf("%s", fname);
 
 	if (ifmt_c == 'L') {
-		char linkto[256];
+		char linkto[MAXPATHLEN];
 		int n;
 
 		n = readlink(fname, linkto, sizeof(linkto)-1);
 		if (n < 0) {
-			perror(fname);
+			warn("readlink `%s'", fname);
 			return;
 		}
 		linkto[n] = '\0';