Wed Feb 10 10:33:45 2010 UTC ()
Constify cat argument and tidy.


(roy)
diff -r1.12 -r1.13 src/usr.bin/tset/extern.h
diff -r1.8 -r1.9 src/usr.bin/tset/misc.c
cvs diff -r1.12 -r1.13 src/usr.bin/tset/extern.h (expand / switch to unified diff)

--- src/usr.bin/tset/extern.h 2010/02/03 15:34:46 1.12
+++ src/usr.bin/tset/extern.h 2010/02/10 10:33:45 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: extern.h,v 1.12 2010/02/03 15:34:46 roy Exp $ */ 1/* $NetBSD: extern.h,v 1.13 2010/02/10 10:33:45 roy Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1991, 1993 4 * Copyright (c) 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -25,22 +25,22 @@ @@ -25,22 +25,22 @@
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 * 30 *
31 * @(#)extern.h 8.1 (Berkeley) 6/9/93 31 * @(#)extern.h 8.1 (Berkeley) 6/9/93
32 */ 32 */
33 33
34extern struct termios mode, oldmode; 34extern struct termios mode, oldmode;
35extern int ncolumns, isreset, nlines; 35extern int ncolumns, isreset, nlines;
36 36
37void add_mapping __P((const char *, char *)); 37void add_mapping __P((const char *, char *));
38void tset_cat __P((char *)); 38void tset_cat __P((const char *));
39const char *get_terminfo_entry __P((const char *)); 39const char *get_terminfo_entry __P((const char *));
40const char *mapped __P((const char *)); 40const char *mapped __P((const char *));
41int outc __P((int)); 41int outc __P((int));
42void reset_mode __P((void)); 42void reset_mode __P((void));
43void set_control_chars __P((int, int, int)); 43void set_control_chars __P((int, int, int));
44void set_conversions __P((int)); 44void set_conversions __P((int));
45void set_init __P((void)); 45void set_init __P((void));
46void wrtermcap __P((char *)); 46void wrtermcap __P((char *));
cvs diff -r1.8 -r1.9 src/usr.bin/tset/misc.c (expand / switch to unified diff)

--- src/usr.bin/tset/misc.c 2006/05/01 23:18:37 1.8
+++ src/usr.bin/tset/misc.c 2010/02/10 10:33:45 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: misc.c,v 1.8 2006/05/01 23:18:37 christos Exp $ */ 1/* $NetBSD: misc.c,v 1.9 2010/02/10 10:33:45 roy Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1991, 1993 4 * Copyright (c) 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -20,53 +20,47 @@ @@ -20,53 +20,47 @@
20 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 22 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33#ifndef lint 33__RCSID("$NetBSD: misc.c,v 1.9 2010/02/10 10:33:45 roy Exp $");
34#if 0 
35static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/9/93"; 
36#endif 
37__RCSID("$NetBSD: misc.c,v 1.8 2006/05/01 23:18:37 christos Exp $"); 
38#endif /* not lint */ 
39 34
40#include <err.h> 35#include <err.h>
41#include <errno.h> 36#include <errno.h>
42#include <fcntl.h> 37#include <fcntl.h>
43#include <stdio.h> 38#include <stdio.h>
44#include <stdlib.h> 39#include <stdlib.h>
45#include <string.h> 40#include <string.h>
46#include <unistd.h> 41#include <unistd.h>
47#include "extern.h" 42#include "extern.h"
48 43
49void 44void
50tset_cat(file) 45tset_cat(const char *file)
51 char *file; 
52{ 46{
53 register int fd, nr, nw; 47 register int fd, nr, nw;
54 char buf[1024]; 48 char buf[1024];
55 49
56 if ((fd = open(file, O_RDONLY, 0)) < 0) 50 if ((fd = open(file, O_RDONLY, 0)) < 0)
57 err(1, "%s", file); 51 err(1, "%s", file);
58 52
59 while ((nr = read(fd, buf, sizeof(buf))) > 0) 53 while ((nr = read(fd, buf, sizeof(buf))) > 0)
60 if ((nw = write(STDERR_FILENO, buf, nr)) == -1) 54 if ((nw = write(STDERR_FILENO, buf, nr)) == -1)
61 err(1, "write to stderr"); 55 err(1, "write to stderr");
62 if (nr != 0) 56 if (nr != 0)
63 err(1, "%s", file); 57 err(1, "%s", file);
64 (void)close(fd); 58 (void)close(fd);
65} 59}
66 60
67int 61int
68outc(c) 62outc(int c)
69 int c; 
70{ 63{
 64
71 return (putc(c, stderr)); 65 return (putc(c, stderr));
72} 66}