[src/trunk]: src/usr.sbin/pkg_install/info show_file: don't append '\n' if fo...

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

details:   https://anonhg.NetBSD.org/src/rev/a59335acb001
branches:  trunk
changeset: 534199:a59335acb001
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sat Jul 20 04:59:47 2002 +0000

description:
show_file: don't append '\n' if fopen failed.

diffstat:

 usr.sbin/pkg_install/info/show.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 62d1dd2211ca -r a59335acb001 usr.sbin/pkg_install/info/show.c
--- a/usr.sbin/pkg_install/info/show.c  Sat Jul 20 03:58:24 2002 +0000
+++ b/usr.sbin/pkg_install/info/show.c  Sat Jul 20 04:59:47 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: show.c,v 1.24 2002/07/19 19:18:26 yamt Exp $   */
+/*     $NetBSD: show.c,v 1.25 2002/07/20 04:59:47 yamt Exp $   */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: show.c,v 1.11 1997/10/08 07:47:38 charnier Exp";
 #else
-__RCSID("$NetBSD: show.c,v 1.24 2002/07/19 19:18:26 yamt Exp $");
+__RCSID("$NetBSD: show.c,v 1.25 2002/07/20 04:59:47 yamt Exp $");
 #endif
 #endif
 
@@ -104,7 +104,6 @@
        FILE   *fp;
        char    line[1024];
        int     n;
-       int     have_nl = 0;
 
        if (!Quiet) {
                printf("%s%s", InfoPrefix, title);
@@ -112,14 +111,15 @@
        if ((fp = fopen(fname, "r")) == (FILE *) NULL) {
                printf("ERROR: show_file: Can't open '%s' for reading!\n", fname);
        } else {
+               int append_nl = 0;
                while ((n = fread(line, 1, sizeof(line), fp)) != 0) {
                        fwrite(line, 1, n, stdout);
-                       have_nl = (line[n - 1] == '\n');
+                       append_nl = (line[n - 1] != '\n');
                }
                (void) fclose(fp);
+               if (append_nl)
+                       printf("\n");
        }
-       if (!have_nl)
-               printf("\n");
        printf("\n");           /* just in case */
 }