summaryrefslogtreecommitdiff
path: root/usr.bin/tic
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2001-02-22 04:16:37 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2001-02-22 04:16:37 +0000
commit98742c91331e6772410df6e9d0a0d9f08b522dac (patch)
treebe13678e0217bee0152d46755923a1b6a2bf4b94 /usr.bin/tic
parenteb05d20ac3c4c642fe84cebb15f94ebb6ba65d69 (diff)
Update to ncurses-5.2-20010210:
o remove macro callPutChar() from tty_update.c, since this is no longer needed (reported by Philippe Blain). o add a null-pointer check in tic.c to handle the case when the input file is really empty. Modify the next_char() function in comp_scan.c to allow arbitrarily long lines, and incidentally supply a newline to files that do not end in a newline. These changes improve tic's recovery from attempts to read binary files, e.g., its output from the terminfo database (reported by Bernhard Rosenkraenzer). o revert change to c++/demo.cc from 20001209, which changed definition of main() apparently to accommodate cygwin linker, but broke the demo program.
Diffstat (limited to 'usr.bin/tic')
-rw-r--r--usr.bin/tic/tic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tic/tic.c b/usr.bin/tic/tic.c
index 13f5f9aad8a..ba5b9164607 100644
--- a/usr.bin/tic/tic.c
+++ b/usr.bin/tic/tic.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: tic.c,v 1.24 2001/01/29 01:58:23 niklas Exp $ */
+/* $OpenBSD: tic.c,v 1.25 2001/02/22 04:16:36 millert Exp $ */
/****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -46,7 +46,7 @@
#include <term_entry.h>
#include <transform.h>
-MODULE_ID("$From: tic.c,v 1.84 2000/11/04 22:50:16 tom Exp $")
+MODULE_ID("$From: tic.c,v 1.85 2001/02/03 23:31:45 tom Exp $")
const char *_nc_progname = "tic";
@@ -707,7 +707,7 @@ main(int argc, char *argv[])
printf("# length=%d\n", len);
}
}
- if (!namelst) {
+ if (!namelst && _nc_tail) {
int c, oldc = '\0';
bool in_comment = FALSE;
bool trailing_comment = FALSE;