1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
|
diff -Naur xli-2006-11-10_old//clip.c xli-2006-11-10_new//clip.c
--- xli-2006-11-10_old//clip.c 1999-10-25 04:14:52.000000000 +0200
+++ xli-2006-11-10_new//clip.c 2011-06-14 22:33:37.000000000 +0200
@@ -8,6 +8,7 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "xli.h"
diff -Naur xli-2006-11-10_old//dither.c xli-2006-11-10_new//dither.c
--- xli-2006-11-10_old//dither.c 1999-10-25 04:14:54.000000000 +0200
+++ xli-2006-11-10_new//dither.c 2011-06-14 22:34:00.000000000 +0200
@@ -22,6 +22,7 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "kljcpyrght.h"
#include "xli.h"
diff -Naur xli-2006-11-10_old//faces.c xli-2006-11-10_new//faces.c
--- xli-2006-11-10_old//faces.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//faces.c 2011-06-14 22:52:38.000000000 +0200
@@ -8,10 +8,10 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "xli.h"
#include "imagetypes.h"
-#include <string.h>
/* read a hex value and return its value
*/
diff -Naur xli-2006-11-10_old//fbm.c xli-2006-11-10_new//fbm.c
--- xli-2006-11-10_old//fbm.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//fbm.c 2011-06-14 22:54:08.000000000 +0200
@@ -14,9 +14,10 @@
* Copyright 1990 Mark Majhor (see the included file
* "mrmcpyrght.h" for complete copyright information)
*/
+# include <string.h>
# include "xli.h"
# include <ctype.h>
-# include <string.h>
+
#define FBM_C
# include "fbm.h"
# include "imagetypes.h"
diff -Naur xli-2006-11-10_old//Imakefile xli-2006-11-10_new//Imakefile
--- xli-2006-11-10_old//Imakefile 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//Imakefile 2011-06-14 23:07:58.000000000 +0200
@@ -36,21 +36,7 @@
ComplexProgramTarget_1(xli,$(DEFINES) $(LOCAL_LIBRARIES),)
ComplexProgramTarget_2(xlito,,)
-install:: $(SYSPATHFILE)
+install::
$(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
$(LN) $(BINDIR)/xli $(BINDIR)/xview
$(LN) $(BINDIR)/xli $(BINDIR)/xsetbg
-
-$(SYSPATHFILE):
- @echo "*** Creating default $(SYSPATHFILE) since you"
- @echo "*** don't have one. This file is used to set up default places"
- @echo "*** and names to look for images. You probably want to edit"
- @echo "*** it for your site. See the xloadimage manual page for"
- @echo "*** details on the contents of this file."
- cp /dev/null $(SYSPATHFILE)
- echo "path=$(INCDIR)/bitmaps $(INCDIR)/images" \
- >> $(SYSPATHFILE)
- echo "extension=.gif .jpg .rle .csun .msun .sun .face .xbm .bm" \
- >>$(SYSPATHFILE)
- chmod a+r $(SYSPATHFILE)
-
diff -Naur xli-2006-11-10_old//misc.c xli-2006-11-10_new//misc.c
--- xli-2006-11-10_old//misc.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//misc.c 2011-06-14 22:54:57.000000000 +0200
@@ -8,11 +8,11 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "xli.h"
#include "patchlevel"
#include <signal.h>
-#include <string.h>
static char *signalName(int sig)
{
diff -Naur xli-2006-11-10_old//options.c xli-2006-11-10_new//options.c
--- xli-2006-11-10_old//options.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//options.c 2011-06-14 22:56:10.000000000 +0200
@@ -8,9 +8,9 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "xli.h"
-#include <string.h>
#include <stdlib.h>
/* options array and definitions. If you add something to this you also
diff -Naur xli-2006-11-10_old//path.c xli-2006-11-10_new//path.c
--- xli-2006-11-10_old//path.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//path.c 2011-06-14 22:57:08.000000000 +0200
@@ -8,6 +8,7 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "xli.h"
#include <sys/stat.h>
@@ -17,7 +18,6 @@
#include <pwd.h>
#endif
#include <errno.h>
-#include <string.h>
extern int errno;
diff -Naur xli-2006-11-10_old//png.c xli-2006-11-10_new//png.c
--- xli-2006-11-10_old//png.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//png.c 2011-06-14 23:02:44.000000000 +0200
@@ -3,10 +3,10 @@
* Glenn Randers-Pehrson et al. Any bugs are my fault. -- smar@reptiles.org
*/
+#include <png.h>
#include "xli.h"
#include "imagetypes.h"
#include "pbm.h"
-#include <png.h>
#include <assert.h>
#define TITLE_KEYWORD "Title"
diff -Naur xli-2006-11-10_old//root.c xli-2006-11-10_new//root.c
--- xli-2006-11-10_old//root.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//root.c 2011-06-14 22:58:13.000000000 +0200
@@ -10,9 +10,9 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "xli.h"
-#include <string.h>
#define RETAIN_PROP_NAME "_XSETROOT_ID"
diff -Naur xli-2006-11-10_old//window.c xli-2006-11-10_new//window.c
--- xli-2006-11-10_old//window.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//window.c 2011-06-14 22:58:54.000000000 +0200
@@ -9,10 +9,10 @@
* See included file "copyright.h" for complete copyright information.
*/
+#include <string.h>
#include "copyright.h"
#include "xli.h"
#include <ctype.h>
-#include <string.h>
#include <signal.h>
#include <errno.h>
#include <sys/types.h>
diff -Naur xli-2006-11-10_old//xlito.c xli-2006-11-10_new//xlito.c
--- xli-2006-11-10_old//xlito.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//xlito.c 2011-06-14 23:03:49.000000000 +0200
@@ -1,3 +1,4 @@
+#include <string.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
@@ -8,7 +9,6 @@
#ifndef VMS
#include <unistd.h>
#endif
-#include <string.h>
#define VERSION "1"
#define PATCHLEVEL "02"
diff -Naur xli-2006-11-10_old//xpixmap.c xli-2006-11-10_new//xpixmap.c
--- xli-2006-11-10_old//xpixmap.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//xpixmap.c 2011-06-14 22:59:53.000000000 +0200
@@ -15,11 +15,10 @@
*
* Modified 16/10/92 by GWG to add version 2C and 3 support.
*/
-
+#include <string.h>
#include "copyright.h"
#include "xli.h"
#include "imagetypes.h"
-#include <string.h>
static void freeCtable(char **ctable, int ncolors)
/* color table */
diff -Naur xli-2006-11-10_old//zio.c xli-2006-11-10_new//zio.c
--- xli-2006-11-10_old//zio.c 2006-11-11 06:52:14.000000000 +0100
+++ xli-2006-11-10_new//zio.c 2011-06-14 23:01:31.000000000 +0200
@@ -18,10 +18,10 @@
*
*/
+#include <string.h>
+#include <ctype.h>
#include "copyright.h"
#include "xli.h"
-#include <ctype.h>
-#include <string.h>
#ifdef VMS
#define NO_UNCOMPRESS /* VMS doesn't have uncompress */
|