Tue Mar 6 23:40:47 2012 UTC ()
Change to use C89 concatenated strings.


(matt)
diff -r1.9 -r1.9.38.1 src/distrib/utils/more/main.c
cvs diff -r1.9 -r1.9.38.1 src/distrib/utils/more/main.c (expand / switch to unified diff)

--- src/distrib/utils/more/main.c 2004/09/01 01:46:56 1.9
+++ src/distrib/utils/more/main.c 2012/03/06 23:40:47 1.9.38.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: main.c,v 1.9 2004/09/01 01:46:56 chs Exp $ */ 1/* main.c,v 1.9 2004/09/01 01:46:56 chs Exp */
2 2
3/* 3/*
4 * Copyright (c) 1988 Mark Nudelman 4 * Copyright (c) 1988 Mark Nudelman
5 * Copyright (c) 1988, 1993 5 * Copyright (c) 1988, 1993
6 * Regents of the University of California. All rights reserved. 6 * Regents of the University of California. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -22,37 +22,37 @@ @@ -22,37 +22,37 @@
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE. 30 * SUCH DAMAGE.
31 */ 31 */
32 32
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34#ifndef lint 34#ifndef lint
35__COPYRIGHT(\ 35__COPYRIGHT(
36"@(#) Copyright (c) 1988 Mark Nudelman.\n\ 36"@(#) Copyright (c) 1988 Mark Nudelman.\n"
37@(#) Copyright (c) 1988, 1993\n\ 37"@(#) Copyright (c) 1988, 1993\n"
38 Regents of the University of California. All rights reserved.\n"); 38" Regents of the University of California. All rights reserved.\n");
39#endif /* not lint */ 39#endif /* not lint */
40 40
41#ifndef lint 41#ifndef lint
42#if 0 42#if 0
43static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/7/93"; 43static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/7/93";
44#else 44#else
45__RCSID("$NetBSD: main.c,v 1.9 2004/09/01 01:46:56 chs Exp $"); 45__RCSID("main.c,v 1.9 2004/09/01 01:46:56 chs Exp");
46#endif 46#endif
47#endif /* not lint */ 47#endif /* not lint */
48 48
49/* 49/*
50 * Entry point, initialization, miscellaneous routines. 50 * Entry point, initialization, miscellaneous routines.
51 */ 51 */
52 52
53#include <sys/types.h> 53#include <sys/types.h>
54#include <sys/file.h> 54#include <sys/file.h>
55#include <stdio.h> 55#include <stdio.h>
56#include <string.h> 56#include <string.h>
57#include <errno.h> 57#include <errno.h>
58#include <stdlib.h> 58#include <stdlib.h>