Sun Mar 11 14:59:41 2018 UTC ()

deal with cvs meta-data directories not called CVS.


(christos)

diff -r1.6 -r1.7 src/usr.bin/cvslatest/cvslatest.c

--- src/usr.bin/cvslatest/cvslatest.c 2017/09/24 09:43:27	1.6
+++ src/usr.bin/cvslatest/cvslatest.c 2018/03/11 14:59:41	1.7

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cvslatest.c,v 1.6 2017/09/24 09:43:27 joerg Exp $	*/
+/*	$NetBSD: cvslatest.c,v 1.7 2018/03/11 14:59:41 christos Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -28,40 +28,41 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef __linux__
 #define _GNU_SOURCE
 #endif
 #ifdef HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: cvslatest.c,v 1.6 2017/09/24 09:43:27 joerg Exp $");
+__RCSID("$NetBSD: cvslatest.c,v 1.7 2018/03/11 14:59:41 christos Exp $");
 /*
  * Find the latest timestamp in a set of CVS trees, by examining the
  * Entries files
  */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <err.h>
 #include <fts.h>
 #include <time.h>
 static int debug = 0;
 static int ignore = 0;
 struct latest {
 	time_t time;
 	char path[MAXPATHLEN];
 };
 static void
 @@ -164,47 +165,94 @@ cvsscan(char **pathv, const char *name,
+        }
         (void)fts_close(dh);
+}
 static __dead void
 usage(void)
+{
 	fprintf(stderr, "Usage: %s [-di] [-n <name>] <path> ...\n",
 	    getprogname());
 	exit(EXIT_FAILURE);
+}
 static int
 checkDir(char *path, size_t pathlen, const char *name)
+{
 	static const char *files[] = {
 		"Entries", "Root", "Repository",
 	};
 	size_t i;
 	for (i = 0; i < __arraycount(files); i++) {
 		snprintf(path, pathlen, "%s/%s", name, files[i]);
 		if (access(path, F_OK) == -1)
 			return 0;
+	}
 	return 1;
+}
 static const char *
 findCVSDir(char *path, size_t pathlen, const char *name)
+{
 	DIR *dirp;
 	struct dirent *dp;
 	const char *n;
 	if ((dirp = opendir(name)) == NULL)
 		err(EXIT_FAILURE, "Can't open `%s'", name);
 	while ((dp = readdir(dirp)) != NULL) {
 		n = dp->d_name;
 		if (n[0] == '.' && (n[1] == '\0' ||
 		    (n[1] == '.' && n[2] == '\0')))
 			continue;
 		if (checkDir(path, pathlen, n))
 			goto out;
+	}
 	n = "CVS";
 out:
 	closedir(dirp);
 	strlcpy(path, n, pathlen);
 	return path;
+}
 int
 main(int argc, char *argv[])
+{
 	struct latest lat;
-	const char *name = "CVS";
+	const char *name = NULL;
 	char path[MAXPATHLEN];
 	int c;
 	while ((c = getopt(argc, argv, "din:")) != -1)
 		switch (c) {
 		case 'i':
 			ignore++;
 			break;
 		case 'd':
 			debug++;
 			break;
 		case 'n':
 			name = optarg;
 			break;
 		default:
 			usage();
+		}
 	if (argc == optind)
 		usage();
 	// So that mktime behaves consistently
 	setenv("TZ", "UTC", 1);
 	if (name == NULL)
 		name = findCVSDir(path, sizeof(path), argv[optind]);
 	cvsscan(argv + optind, name, &lat);
 	if (debug)
 		printlat(&lat);
 	printf("%jd\n", (intmax_t)lat.time);
 	return 0;
+}