[src/trunk]: src/usr.bin/infocmp _ti_database now includes the database exten...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a10ddbf3eaa8
branches:  trunk
changeset: 823957:a10ddbf3eaa8
user:      roy <roy%NetBSD.org@localhost>
date:      Tue May 16 09:21:54 2017 +0000

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

diffstat:

 usr.bin/infocmp/infocmp.c |  16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diffs (37 lines):

diff -r 3d4aa5a67af5 -r a10ddbf3eaa8 usr.bin/infocmp/infocmp.c
--- a/usr.bin/infocmp/infocmp.c Tue May 16 09:19:48 2017 +0000
+++ b/usr.bin/infocmp/infocmp.c Tue May 16 09:21:54 2017 +0000
@@ -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 @@
                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);