Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-6]: src/usr.sbin/pkg_install/info Pull up revision 1.24 (reques...
details: https://anonhg.NetBSD.org/src/rev/66d555a1a1dc
branches: netbsd-1-6
changeset: 528516:66d555a1a1dc
user: lukem <lukem%NetBSD.org@localhost>
date: Sun Jul 21 04:59:48 2002 +0000
description:
Pull up revision 1.24 (requested by yamt in ticket #530):
show_file: add an extra '\n' unless file ended with '\n'.
diffstat:
usr.sbin/pkg_install/info/show.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (38 lines):
diff -r 9124df185f3f -r 66d555a1a1dc usr.sbin/pkg_install/info/show.c
--- a/usr.sbin/pkg_install/info/show.c Sun Jul 21 04:43:19 2002 +0000
+++ b/usr.sbin/pkg_install/info/show.c Sun Jul 21 04:59:48 2002 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: show.c,v 1.21.2.1 2002/06/28 12:44:31 lukem Exp $ */
+/* $NetBSD: show.c,v 1.21.2.2 2002/07/21 04:59:48 lukem 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.21.2.1 2002/06/28 12:44:31 lukem Exp $");
+__RCSID("$NetBSD: show.c,v 1.21.2.2 2002/07/21 04:59:48 lukem Exp $");
#endif
#endif
@@ -104,6 +104,7 @@
FILE *fp;
char line[1024];
int n;
+ int have_nl = 0;
if (!Quiet) {
printf("%s%s", InfoPrefix, title);
@@ -113,9 +114,12 @@
} else {
while ((n = fread(line, 1, sizeof(line), fp)) != 0) {
fwrite(line, 1, n, stdout);
+ have_nl = (line[n - 1] == '\n');
}
(void) fclose(fp);
}
+ if (!have_nl)
+ printf("\n");
printf("\n"); /* just in case */
}
Home |
Main Index |
Thread Index |
Old Index