CVS commit: src/usr.bin/infocmp

[Roy Marples]

Module Name:    src
Committed By:   roy
Date:           Tue May 16 09:21:54 UTC 2017

Modified Files:
        src/usr.bin/infocmp: infocmp.c

Log Message:
_ti_database now includes the database extension so don't duplicate it.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/infocmp/infocmp.c

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


Modified files:

Index: src/usr.bin/infocmp/infocmp.c
diff -u src/usr.bin/infocmp/infocmp.c:1.11 src/usr.bin/infocmp/infocmp.c:1.12
--- src/usr.bin/infocmp/infocmp.c:1.11	Wed Mar 16 21:01:28 2016
+++ src/usr.bin/infocmp/infocmp.c	Tue May 16 09:21:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: infocmp.c,v 1.11 2016/03/16 21:01:28 christos Exp $ */
+/* $NetBSD: infocmp.c,v 1.12 2017/05/16 09:21:54 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: infocmp.c,v 1.11 2016/03/16 21:01:28 christos Exp $");
+__RCSID("$NetBSD: infocmp.c,v 1.12 2017/05/16 09:21:54 roy Exp $");
 
 #include <sys/ioctl.h>
 
@@ -712,14 +712,10 @@ main(int argc, char **argv)
 		use_terms(t, argc - optind, argv + optind);
 
 	if ((optind + 1 != argc && nflag == 0) || uflag != 0) {
-		if (uflag == 0) {
-			printf("# Reconstructed from ");
-			if (_ti_database == NULL)
-				printf("internal database\n");
-			else
-				printf("%s%s\n", _ti_database,
-				    *_ti_database == '/' ? ".cdb" : "");
-		}
+		if (uflag == 0)
+			printf("# Reconstructed from %s\n",
+			     _ti_database == NULL ?
+			     "internal database" : _ti_database);
 		printf("%s", t->name);
 		if (t->_alias != NULL && *t->_alias != '\0')
 			printf("|%s", t->_alias);