Fri Aug 7 13:53:54 2009 UTC ()
Add missing parenthesis in commented out code.
From Henning Petersen in PR 41838.


(wiz)
diff -r1.5 -r1.6 src/usr.bin/window/wwterminfo.c
cvs diff -r1.5 -r1.6 src/usr.bin/window/Attic/wwterminfo.c (expand / switch to unified diff)

--- src/usr.bin/window/Attic/wwterminfo.c 2003/08/07 11:17:45 1.5
+++ src/usr.bin/window/Attic/wwterminfo.c 2009/08/07 13:53:54 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wwterminfo.c,v 1.5 2003/08/07 11:17:45 agc Exp $ */ 1/* $NetBSD: wwterminfo.c,v 1.6 2009/08/07 13:53:54 wiz Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1993 4 * Copyright (c) 1982, 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 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Edward Wang at The University of California, Berkeley. 8 * Edward Wang at The University of California, Berkeley.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -27,27 +27,27 @@ @@ -27,27 +27,27 @@
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36#ifndef lint 36#ifndef lint
37#if 0 37#if 0
38static char sccsid[] = "@(#)wwterminfo.c 8.1 (Berkeley) 6/6/93"; 38static char sccsid[] = "@(#)wwterminfo.c 8.1 (Berkeley) 6/6/93";
39#else 39#else
40__RCSID("$NetBSD: wwterminfo.c,v 1.5 2003/08/07 11:17:45 agc Exp $"); 40__RCSID("$NetBSD: wwterminfo.c,v 1.6 2009/08/07 13:53:54 wiz Exp $");
41#endif 41#endif
42#endif /* not lint */ 42#endif /* not lint */
43 43
44#ifdef TERMINFO 44#ifdef TERMINFO
45 45
46#include <sys/types.h> 46#include <sys/types.h>
47#include <sys/stat.h> 47#include <sys/stat.h>
48#include <sys/wait.h> 48#include <sys/wait.h>
49 49
50#include <stdio.h> 50#include <stdio.h>
51#include <stdlib.h> 51#include <stdlib.h>
52#include <paths.h> 52#include <paths.h>
53#include <unistd.h> 53#include <unistd.h>
@@ -63,27 +63,27 @@ __RCSID("$NetBSD: wwterminfo.c,v 1.5 200 @@ -63,27 +63,27 @@ __RCSID("$NetBSD: wwterminfo.c,v 1.5 200
63 */ 63 */
64 64
65/* 65/*
66 * Initialize the working terminfo directory 66 * Initialize the working terminfo directory
67 */ 67 */
68int 68int
69wwterminfoinit() 69wwterminfoinit()
70{ 70{
71 FILE *fp; 71 FILE *fp;
72 char buf[2048]; 72 char buf[2048];
73 73
74 /* make the directory */ 74 /* make the directory */
75 (void) sprintf(wwterminfopath, "%swwinXXXXXX", _PATH_TMP); 75 (void) sprintf(wwterminfopath, "%swwinXXXXXX", _PATH_TMP);
76 if (mkdtemp(wwterminfopath) == NULL) || 76 if ((mkdtemp(wwterminfopath) == NULL) ||
77 chmod(wwterminfopath, 0755) < 0) { 77 chmod(wwterminfopath, 0755) < 0) {
78 wwerrno = WWE_SYS; 78 wwerrno = WWE_SYS;
79 return -1; 79 return -1;
80 } 80 }
81 (void) setenv("TERMINFO", wwterminfopath, 1); 81 (void) setenv("TERMINFO", wwterminfopath, 1);
82 /* make a termcap entry and turn it into terminfo */ 82 /* make a termcap entry and turn it into terminfo */
83 (void) sprintf(buf, "%s/cap", wwterminfopath); 83 (void) sprintf(buf, "%s/cap", wwterminfopath);
84 if ((fp = fopen(buf, "w")) == NULL) { 84 if ((fp = fopen(buf, "w")) == NULL) {
85 wwerrno = WWE_SYS; 85 wwerrno = WWE_SYS;
86 return -1; 86 return -1;
87 } 87 }
88 (void) fprintf(fp, "%sco#%d:li#%d:%s\n", 88 (void) fprintf(fp, "%sco#%d:li#%d:%s\n",
89 WWT_TERMCAP, wwncol, wwnrow, wwwintermcap); 89 WWT_TERMCAP, wwncol, wwnrow, wwwintermcap);