]> git.pld-linux.org Git - packages/e16.git/blame - enlightenment-use_sys_snprintf.patch
projects / packages / e16.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- removed all Group fields translations (oure rpm now can handle translating
[packages/e16.git] / enlightenment-use_sys_snprintf.patch
CommitLineData
0bbdaedd 1diff -Nru enlightenment-0.16.5/src/E.h enlightenment-0.16.5.new/src/E.h
2--- enlightenment-0.16.5/src/E.h Fri Jul 28 19:23:34 2000
3+++ enlightenment-0.16.5.new/src/E.h Fri Jul 20 05:34:54 2001
4@@ -245,7 +245,7 @@
5 #define Esetenv(var, val, overwrite) \
6 { \
7 static char envvar[FILEPATH_LEN_MAX]; \
8- Esnprintf(envvar, FILEPATH_LEN_MAX, "%s=%s", var, val);\
9+ snprintf(envvar, FILEPATH_LEN_MAX, "%s=%s", var, val);\
10 putenv(envvar);\
11 }
12
13diff -Nru enlightenment-0.16.5/src/actions.c enlightenment-0.16.5.new/src/actions.c
14--- enlightenment-0.16.5/src/actions.c Fri Jul 28 21:13:13 2000
15+++ enlightenment-0.16.5.new/src/actions.c Fri Jul 20 05:18:15 2001
16@@ -272,7 +272,7 @@
17 {
18 char stuff[255];
19
20- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
21+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
22 ActionClassToRemove->ref_count);
23 DIALOG_OK(_("ActionClass Error!"), stuff);
24 EDBUG_RETURN_;
25@@ -3302,7 +3302,7 @@
26 {
27 char stuff[255];
28
29- Esnprintf(stuff, sizeof(stuff), _("About Enlightenment %s"),
30+ snprintf(stuff, sizeof(stuff), _("About Enlightenment %s"),
31 ENLIGHTENMENT_VERSION);
32 DialogSetTitle(d, stuff);
33 }
34@@ -3683,7 +3683,7 @@
35 ibl = ListAllIconboxes(&num);
36 if (ibl)
37 Efree(ibl);
38- Esnprintf(s, sizeof(s), "_IB_%i", num);
39+ snprintf(s, sizeof(s), "_IB_%i", num);
40 AUDIO_PLAY("SOUND_NEW_ICONBOX");
41 ib = CreateIconbox(s);
42 ShowIconbox(ib);
43@@ -3918,7 +3918,7 @@
44 if (!(CanZoom()))
45 EDBUG_RETURN(0);
46
47- Esnprintf(s, sizeof(s), "%s/.zoom_warn", UserEDir());
48+ snprintf(s, sizeof(s), "%s/.zoom_warn", UserEDir());
49 if (!exists(s))
50 {
51 FILE *f;
52diff -Nru enlightenment-0.16.5/src/alert.c enlightenment-0.16.5.new/src/alert.c
53--- enlightenment-0.16.5/src/alert.c Fri Jul 28 19:23:34 2000
54+++ enlightenment-0.16.5.new/src/alert.c Fri Jul 20 05:16:12 2001
55@@ -54,7 +54,7 @@
56 /*
57 * #ifdef __USE_GNU
58 */
59- Evsnprintf(text, 10240, fmt, ap);
60+ snprintf(text, 10240, fmt, ap);
61 /*
62 * #else
63 * vsprintf(text, fmt, ap);
64diff -Nru enlightenment-0.16.5/src/borders.c enlightenment-0.16.5.new/src/borders.c
65--- enlightenment-0.16.5/src/borders.c Fri Jul 28 21:13:13 2000
66+++ enlightenment-0.16.5.new/src/borders.c Fri Jul 20 05:18:21 2001
67@@ -1915,7 +1915,7 @@
68 if (b->part[i].iclass->external)
69 {
70 ewin->bits[i].win = 0;
71- Esnprintf(s, sizeof(s), "request imageclass %s",
72+ snprintf(s, sizeof(s), "request imageclass %s",
73 b->part[i].iclass->name);
74 CommsBroadcast(s);
75 await = Emalloc(sizeof(AwaitIclass));
76@@ -2546,7 +2546,7 @@
77 {
78 char stuff[255];
79
80- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
81+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
82 b->ref_count);
83 DIALOG_OK(_("Border Error!"), stuff);
84 EDBUG_RETURN_;
85diff -Nru enlightenment-0.16.5/src/buttons.c enlightenment-0.16.5.new/src/buttons.c
86--- enlightenment-0.16.5/src/buttons.c Fri Jul 28 19:23:34 2000
87+++ enlightenment-0.16.5.new/src/buttons.c Fri Jul 20 05:20:09 2001
88@@ -123,7 +123,7 @@
89 {
90 char stuff[255];
91
92- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
93+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
94 b->ref_count);
95 DIALOG_OK(_("Button Error!"), stuff);
96
97diff -Nru enlightenment-0.16.5/src/cmclass.c enlightenment-0.16.5.new/src/cmclass.c
98--- enlightenment-0.16.5/src/cmclass.c Fri Jul 28 19:23:34 2000
99+++ enlightenment-0.16.5.new/src/cmclass.c Fri Jul 20 05:19:23 2001
100@@ -94,7 +94,7 @@
101 {
102 char stuff[255];
103
104- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
105+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
106 cm->ref_count);
107 DIALOG_OK(_("ColorModClass Error!"), stuff);
108
109diff -Nru enlightenment-0.16.5/src/comms.c enlightenment-0.16.5.new/src/comms.c
110--- enlightenment-0.16.5/src/comms.c Fri Jul 28 19:23:34 2000
111+++ enlightenment-0.16.5.new/src/comms.c Fri Jul 20 05:20:06 2001
112@@ -31,7 +31,7 @@
113 EDBUG(5, "CommsSetup");
114 comms_win = XCreateSimpleWindow(disp, root.win, -100, -100, 5, 5, 0, 0, 0);
115 XSelectInput(disp, comms_win, StructureNotifyMask | SubstructureNotifyMask);
116- Esnprintf(s, sizeof(s), "WINID %8x", (int)comms_win);
117+ snprintf(s, sizeof(s), "WINID %8x", (int)comms_win);
118 a = XInternAtom(disp, "ENLIGHTENMENT_COMMS", False);
119 XChangeProperty(disp, comms_win, a, XA_STRING, 8, PropModeReplace,
120 (unsigned char *)s, strlen(s));
121@@ -113,7 +113,7 @@
122 ev.xclient.format = 8;
123 for (i = 0; i < len + 1; i += 12)
124 {
125- Esnprintf(ss, sizeof(ss), "%8x", (int)comms_win);
126+ snprintf(ss, sizeof(ss), "%8x", (int)comms_win);
127 for (j = 0; j < 12; j++)
128 {
129 ss[8 + j] = s[i + j];
130@@ -161,7 +161,7 @@
131 ev.xclient.format = 8;
132 for (i = 0; i < len + 1; i += 12)
133 {
134- Esnprintf(ss, sizeof(ss), "%8x", (int)comms_win);
135+ snprintf(ss, sizeof(ss), "%8x", (int)comms_win);
136 for (j = 0; j < 12; j++)
137 {
138 ss[8 + j] = s[i + j];
139@@ -214,7 +214,7 @@
140 ev.xclient.format = 8;
141 for (i = 0; i < len + 1; i += 12)
142 {
143- Esnprintf(ss, sizeof(ss), "%8x", (int)comms_win);
144+ snprintf(ss, sizeof(ss), "%8x", (int)comms_win);
145 for (j = 0; j < 12; j++)
146 {
147 ss[8 + j] = s[i + j];
148@@ -263,7 +263,7 @@
149 cl = MakeClient(win);
150 if (!cl)
151 EDBUG_RETURN(NULL);
152- Esnprintf(st, sizeof(st), "%8x", (int)win);
153+ snprintf(st, sizeof(st), "%8x", (int)win);
154 cl->name = duplicate(st);
155 AddItem((void *)cl, st, cl->win, LIST_TYPE_CLIENT);
156 XSelectInput(disp, win, StructureNotifyMask | SubstructureNotifyMask);
157@@ -488,7 +488,7 @@
158 if (exists(buf))
159 {
160 SetDefaultTheme(buf);
161- Esnprintf(sss, sizeof(sss), "restart_theme %s", buf);
162+ snprintf(sss, sizeof(sss), "restart_theme %s", buf);
163 doExit(sss);
164 }
165 }
166@@ -663,7 +663,7 @@
167 {
168 if (desks.desk[i].bg == bg)
169 {
170- Esnprintf(buf2, sizeof(buf2), "%i\n", i);
171+ snprintf(buf2, sizeof(buf2), "%i\n", i);
172 strcat(buf, buf2);
173 }
174 }
175@@ -737,11 +737,11 @@
176 (Mod5Mask | ControlMask | ShiftMask)) mod =
177 20;
178 if (a->action->params)
179- Esnprintf(buf2, sizeof(buf2), "%s %i %i %s\n",
180+ snprintf(buf2, sizeof(buf2), "%s %i %i %s\n",
181 key, mod, a->action->Type,
182 a->action->params);
183 else
184- Esnprintf(buf2, sizeof(buf2), "%s %i %i\n", key,
185+ snprintf(buf2, sizeof(buf2), "%s %i %i\n", key,
186 mod, a->action->Type);
187 if (buf)
188 {
189@@ -903,9 +903,9 @@
190 bg =
191 (Background *) FindItem(w, 0, LIST_FINDBY_NAME,
192 LIST_TYPE_BACKGROUND);
193- Esnprintf(buf, sizeof(buf), "(null)");
194+ snprintf(buf, sizeof(buf), "(null)");
195 if ((bg) && (bg->cmclass))
196- Esnprintf(buf, sizeof(buf), "%s", bg->cmclass->name);
197+ snprintf(buf, sizeof(buf), "%s", bg->cmclass->name);
198 CommsSend(c, buf);
199 }
200 else if (!strcmp(w, "del_colmod"))
201@@ -917,7 +917,7 @@
202 cm =
203 (ColorModifierClass *) FindItem(w, 0, LIST_FINDBY_NAME,
204 LIST_TYPE_COLORMODIFIER);
205- Esnprintf(buf, sizeof(buf), "(null)");
206+ snprintf(buf, sizeof(buf), "(null)");
207 if (cm)
208 FreeCMClass(cm);
209 }
210@@ -931,33 +931,33 @@
211 cm =
212 (ColorModifierClass *) FindItem(w, 0, LIST_FINDBY_NAME,
213 LIST_TYPE_COLORMODIFIER);
214- Esnprintf(buf, sizeof(buf), "(null)");
215+ snprintf(buf, sizeof(buf), "(null)");
216 if (cm)
217 {
218- Esnprintf(buf, sizeof(buf), "%i", (int)(cm->red.num));
219+ snprintf(buf, sizeof(buf), "%i", (int)(cm->red.num));
220 for (i = 0; i < cm->red.num; i++)
221 {
222- Esnprintf(buf2, sizeof(buf2), " %i", (int)(cm->red.px[i]));
223+ snprintf(buf2, sizeof(buf2), " %i", (int)(cm->red.px[i]));
224 strcat(buf, buf2);
225- Esnprintf(buf2, sizeof(buf2), " %i", (int)(cm->red.py[i]));
226+ snprintf(buf2, sizeof(buf2), " %i", (int)(cm->red.py[i]));
227 strcat(buf, buf2);
228 }
229- Esnprintf(buf2, sizeof(buf2), "\n%i", (int)(cm->green.num));
230+ snprintf(buf2, sizeof(buf2), "\n%i", (int)(cm->green.num));
231 strcat(buf, buf2);
232 for (i = 0; i < cm->green.num; i++)
233 {
234- Esnprintf(buf2, sizeof(buf2), " %i", (int)(cm->green.px[i]));
235+ snprintf(buf2, sizeof(buf2), " %i", (int)(cm->green.px[i]));
236 strcat(buf, buf2);
237- Esnprintf(buf2, sizeof(buf2), " %i", (int)(cm->green.py[i]));
238+ snprintf(buf2, sizeof(buf2), " %i", (int)(cm->green.py[i]));
239 strcat(buf, buf2);
240 }
241- Esnprintf(buf2, sizeof(buf2), "\n%i", (int)(cm->red.num));
242+ snprintf(buf2, sizeof(buf2), "\n%i", (int)(cm->red.num));
243 strcat(buf, buf2);
244 for (i = 0; i < cm->blue.num; i++)
245 {
246- Esnprintf(buf2, sizeof(buf2), " %i", (int)(cm->blue.px[i]));
247+ snprintf(buf2, sizeof(buf2), " %i", (int)(cm->blue.px[i]));
248 strcat(buf, buf2);
249- Esnprintf(buf2, sizeof(buf2), " %i", (int)(cm->blue.py[i]));
250+ snprintf(buf2, sizeof(buf2), " %i", (int)(cm->blue.py[i]));
251 strcat(buf, buf2);
252 }
253 }
254@@ -1053,11 +1053,11 @@
255 bg =
256 (Background *) FindItem(w, 0, LIST_FINDBY_NAME,
257 LIST_TYPE_BACKGROUND);
258- Esnprintf(buf, sizeof(buf), "(null)");
259+ snprintf(buf, sizeof(buf), "(null)");
260 if (bg)
261 {
262 if ((bg->bg.file) && (bg->top.file))
263- Esnprintf(buf, sizeof(buf),
264+ snprintf(buf, sizeof(buf),
265 "%s %i %i %i %s %i %i %i %i %i %i %s %i %i %i %i %i",
266 bg->name, bg->bg.solid.r, bg->bg.solid.g,
267 bg->bg.solid.b, bg->bg.file, bg->bg.tile,
268@@ -1066,7 +1066,7 @@
269 bg->top.keep_aspect, bg->top.xjust, bg->top.yjust,
270 bg->top.xperc, bg->top.yperc);
271 else if ((!(bg->bg.file)) && (bg->top.file))
272- Esnprintf(buf, sizeof(buf),
273+ snprintf(buf, sizeof(buf),
274 "%s %i %i %i %s %i %i %i %i %i %i %s %i %i %i %i %i",
275 bg->name, bg->bg.solid.r, bg->bg.solid.g,
276 bg->bg.solid.b, "(null)", bg->bg.tile,
277@@ -1075,7 +1075,7 @@
278 bg->top.keep_aspect, bg->top.xjust, bg->top.yjust,
279 bg->top.xperc, bg->top.yperc);
280 else if ((bg->bg.file) && (!(bg->top.file)))
281- Esnprintf(buf, sizeof(buf),
282+ snprintf(buf, sizeof(buf),
283 "%s %i %i %i %s %i %i %i %i %i %i %s %i %i %i %i %i",
284 bg->name, bg->bg.solid.r, bg->bg.solid.g,
285 bg->bg.solid.b, bg->bg.file, bg->bg.tile,
286@@ -1084,7 +1084,7 @@
287 bg->top.keep_aspect, bg->top.xjust, bg->top.yjust,
288 bg->top.xperc, bg->top.yperc);
289 else if ((!(bg->bg.file)) && (!(bg->top.file)))
290- Esnprintf(buf, sizeof(buf),
291+ snprintf(buf, sizeof(buf),
292 "%s %i %i %i %s %i %i %i %i %i %i %s %i %i %i %i %i",
293 bg->name, bg->bg.solid.r, bg->bg.solid.g,
294 bg->bg.solid.b, "(null)", bg->bg.tile,
295@@ -1579,7 +1579,7 @@
296 int a, b;
297
298 GetAreaSize(&a, &b);
299- Esnprintf(buf, sizeof(buf),
300+ snprintf(buf, sizeof(buf),
301 "FOCUSMODE: %i\n" "DOCKAPP_SUPPORT: %i\n" "DOCKDIRMODE: %i\n"
302 "ICONDIRMODE: %i\n" "MOVEMODE: %i\n" "RESIZEMODE: %i\n"
303 "SLIDEMODE: %i\n" "CLEANUPSLIDE: %i\n" "MAPSLIDE: %i\n"
304@@ -1643,7 +1643,7 @@
305 char buf[FILEPATH_LEN_MAX];
306
307 buf[0] = 0;
308- Esnprintf(buf, sizeof(buf), "Number of desks is %d\n",
309+ snprintf(buf, sizeof(buf), "Number of desks is %d\n",
310 mode.numdesktops);
311 CommsSend(c, buf);
312 }
313@@ -1695,7 +1695,7 @@
314 ewin->client.icon_name = none;
315 if (ewin->border)
316 {
317- Esnprintf(buf, sizeof(buf),
318+ snprintf(buf, sizeof(buf),
319 "***CLIENT***\n" "CLIENT_WIN_ID: %8x\n"
320 "FRAME_WIN_ID: %8x\n"
321 "FRAME_X,Y: %5i , %5i\n"
322@@ -1774,7 +1774,7 @@
323 }
324 else
325 {
326- Esnprintf(buf, sizeof(buf),
327+ snprintf(buf, sizeof(buf),
328 "***CLIENT***\n" "CLIENT_WIN_ID: %8x\n"
329 "FRAME_WIN_ID: %8x\n"
330 "FRAME_X,Y: %5i , %5i\n"
331@@ -1863,7 +1863,7 @@
332 }
333 else
334 {
335- Esnprintf(buf, sizeof(buf), "No matching EWin found\n");
336+ snprintf(buf, sizeof(buf), "No matching EWin found\n");
337 }
338 if (buf)
339 {
340@@ -1879,22 +1879,22 @@
341 char buf4[FILEPATH_LEN_MAX];
342 char buf5[FILEPATH_LEN_MAX];
343
344- Esnprintf(buf, sizeof(buf), "stuff:\n");
345+ snprintf(buf, sizeof(buf), "stuff:\n");
346 if (mode.ewin)
347 {
348- Esnprintf(buf2, sizeof(buf2), "mode.ewin - %8x\n",
349+ snprintf(buf2, sizeof(buf2), "mode.ewin - %8x\n",
350 mode.ewin->client.win);
351 strcat(buf, buf2);
352 }
353 if (mode.focuswin)
354 {
355- Esnprintf(buf3, sizeof(buf3), "mode.focuswin - %8x\n",
356+ snprintf(buf3, sizeof(buf3), "mode.focuswin - %8x\n",
357 mode.focuswin->client.win);
358 strcat(buf, buf3);
359 }
360 if (mode.realfocuswin)
361 {
362- Esnprintf(buf4, sizeof(buf4), "mode.realfocuswin - %8x\n",
363+ snprintf(buf4, sizeof(buf4), "mode.realfocuswin - %8x\n",
364 mode.realfocuswin->client.win);
365 strcat(buf, buf4);
366 }
367@@ -1904,7 +1904,7 @@
368 }
369 if (mode.context_ewin)
370 {
371- Esnprintf(buf5, sizeof(buf5), "context_ewin - %8x\n",
372+ snprintf(buf5, sizeof(buf5), "context_ewin - %8x\n",
373 mode.context_ewin->client.win);
374 strcat(buf, buf5);
375 }
376@@ -1935,7 +1935,7 @@
377 lst[i]->client.icon_name = none;
378 if (lst[i]->border)
379 {
380- Esnprintf(buf, sizeof(buf),
381+ snprintf(buf, sizeof(buf),
382 "***CLIENT***\n" "CLIENT_WIN_ID: %8x\n"
383 "FRAME_WIN_ID: %8x\n"
384 "FRAME_X,Y: %5i , %5i\n"
385@@ -2017,7 +2017,7 @@
386 }
387 else
388 {
389- Esnprintf(buf, sizeof(buf),
390+ snprintf(buf, sizeof(buf),
391 "***CLIENT***\n" "CLIENT_WIN_ID: %8x\n"
392 "FRAME_WIN_ID: %8x\n"
393 "FRAME_X,Y: %5i , %5i\n"
394@@ -2138,7 +2138,7 @@
395 {
396 char buf[FILEPATH_LEN_MAX];
397
398- Esnprintf(buf, sizeof(buf),
399+ snprintf(buf, sizeof(buf),
400 _("Received Unknown Client Message.\n"
401 "Client Name: %s\n" "Client Version: %s\n"
402 "Message Contents:\n\n" "%s\n"), s1, s2, s);
403diff -Nru enlightenment-0.16.5/src/config.c enlightenment-0.16.5.new/src/config.c
404--- enlightenment-0.16.5/src/config.c Thu Aug 9 19:37:20 2001
405+++ enlightenment-0.16.5.new/src/config.c Fri Jul 20 05:20:52 2001
406@@ -3266,7 +3266,7 @@
407 s[i] = '.';
408 i++;
409 }
410- Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef "
411+ snprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef "
412 #ifndef __EMX__
413 "-include %s/config/definitions " "-I%s "
414 "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s "
415@@ -3294,7 +3294,7 @@
416 root.h, root.depth, def_user, def_home, def_shell, path,
417 UserCacheDir(), s);
418 system(execline);
419- Esnprintf(execline, sizeof(execline), "%s/cached/cfg/%s.preparsed",
420+ snprintf(execline, sizeof(execline), "%s/cached/cfg/%s.preparsed",
421 UserCacheDir(), s);
422 #ifndef __EMX__
423 fpin = fopen(execline, "r");
424@@ -3334,7 +3334,7 @@
425
426 EDBUG(5, "LoadConfigFile");
427
428- Esnprintf(s, sizeof(s), "%s", f);
429+ snprintf(s, sizeof(s), "%s", f);
430 file = FindFile(s);
431 if (!file)
432 EDBUG_RETURN(0);
433@@ -3353,7 +3353,7 @@
434 i++;
435 }
436
437- Esnprintf(s, sizeof(s), "%s/cached/cfg/%s.preparsed", UserCacheDir(), s2);
438+ snprintf(s, sizeof(s), "%s/cached/cfg/%s.preparsed", UserCacheDir(), s2);
439
440 if (strstr(f, "control.cfg"))
441 notheme = 1;
442@@ -3589,20 +3589,20 @@
443
444 /* look in ~/.enlightenment first */
445
446- Esnprintf(s, sizeof(s), "%s/%s", UserEDir(), file);
447+ snprintf(s, sizeof(s), "%s/%s", UserEDir(), file);
448 if (findLocalizedFile(s) || isfile(s))
449 EDBUG_RETURN(duplicate(s));
450
451 /* look in theme dir */
452- Esnprintf(s, sizeof(s), "%s/%s", themepath, file);
453+ snprintf(s, sizeof(s), "%s/%s", themepath, file);
454 if (findLocalizedFile(s) || isfile(s))
455 EDBUG_RETURN(duplicate(s));
456
457 /* look in system config dir */
458 #ifndef __EMX__
459- Esnprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file);
460+ snprintf(s, sizeof(s), "%s/%s", CONFIGDATADIR, file);
461 #else
462- Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
463+ snprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
464 file);
465 #endif
466 if (findLocalizedFile(s) || isfile(s))
467@@ -3639,15 +3639,15 @@
468 #endif
469
470 /* look in ~/.enlightenment first */
471- Esnprintf(s, sizeof(s), "%s/%s", UserEDir(), file);
472+ snprintf(s, sizeof(s), "%s/%s", UserEDir(), file);
473 if (findLocalizedFile(s) || isfile(s))
474 EDBUG_RETURN(duplicate(s));
475
476 /* look in system config dir */
477 #ifndef __EMX__
478- Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
479+ snprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
480 #else
481- Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
482+ snprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
483 file);
484 #endif
485 if (findLocalizedFile(s) || isfile(s))
486@@ -3667,12 +3667,12 @@
487 EDBUG(5, "LoadEConfig");
488 mustdel = 0;
489
490- Esnprintf(s, sizeof(s), "%s/", UserEDir());
491+ snprintf(s, sizeof(s), "%s/", UserEDir());
492 Fnlib_add_dir(fd, s);
493 #ifndef __EMX__
494- Esnprintf(s, sizeof(s), "%s/", CONFIGDATADIR);
495+ snprintf(s, sizeof(s), "%s/", CONFIGDATADIR);
496 #else
497- Esnprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
498+ snprintf(s, sizeof(s), "%s/config/", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
499 #endif
500 Fnlib_add_dir(fd, s);
501 /* save the current theme */
502@@ -3685,7 +3685,7 @@
503 fprintf(f, "%s\n", themelocation);
504 fclose(f);
505 }
506- Esnprintf(ss, sizeof(ss), "%s/user_theme.cfg", UserEDir());
507+ snprintf(ss, sizeof(ss), "%s/user_theme.cfg", UserEDir());
508 rm(ss);
509 mv(s, ss);
510 if (!isfile(ss))
511@@ -3725,7 +3725,7 @@
512 EDBUG_RETURN(0);
513 }
514 strcpy(themepath, theme);
515- Esnprintf(s, sizeof(s), "%s/", theme);
516+ snprintf(s, sizeof(s), "%s/", theme);
517 Fnlib_add_dir(fd, s);
518 {
519 Progressbar *p = NULL;
520diff -Nru enlightenment-0.16.5/src/coords.c enlightenment-0.16.5.new/src/coords.c
521--- enlightenment-0.16.5/src/coords.c Wed Jul 26 20:00:46 2000
522+++ enlightenment-0.16.5.new/src/coords.c Fri Jul 20 05:22:18 2001
523@@ -47,7 +47,7 @@
524 if ((!ic) || (!tc))
525 return;
526
527- Esnprintf(s, sizeof(s), "%i x %i (%i, %i)", w, h, x, y);
528+ snprintf(s, sizeof(s), "%i x %i (%i, %i)", w, h, x, y);
529 TextSize(tc, 0, 0, 0, s, &cw, &ch, 17);
530 ewin = mode.ewin;
531 cw += (ic->padding.left + ic->padding.right);
532diff -Nru enlightenment-0.16.5/src/cursors.c enlightenment-0.16.5.new/src/cursors.c
533--- enlightenment-0.16.5/src/cursors.c Wed Jul 26 20:00:46 2000
534+++ enlightenment-0.16.5.new/src/cursors.c Fri Jul 20 05:22:27 2001
535@@ -40,7 +40,7 @@
536 if (!img)
537 return NULL;
538
539- Esnprintf(msk, sizeof(msk), "%s.mask", img);
540+ snprintf(msk, sizeof(msk), "%s.mask", img);
541 pmap = 0;
542 mask = 0;
543 xh = 0;
544@@ -107,7 +107,7 @@
545 {
546 char stuff[255];
547
548- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
549+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
550 ec->ref_count);
551 DIALOG_OK(_("ECursor Error!"), stuff);
552
553diff -Nru enlightenment-0.16.5/src/desktops.c enlightenment-0.16.5.new/src/desktops.c
554--- enlightenment-0.16.5/src/desktops.c Fri Jul 28 21:13:13 2000
555+++ enlightenment-0.16.5.new/src/desktops.c Fri Jul 20 05:23:08 2001
556@@ -78,7 +78,7 @@
557 Efree(f);
558 }
559 }
560- Esnprintf(s, sizeof(s),
561+ snprintf(s, sizeof(s),
562 "%c%c%c%c%c%c" "%c%c%c%c%c%c" "%c%c%c%c%c%c" "%c%c%c%c%c%c"
563 "%c%c%c%c%c%c" "%c%c%c%c%c%c" "%c%c%c%c%c%c" "%c%c%c%c%c%c"
564 "%c%c%c%c%c%c" "%c%c%c%c%c%c" "%c%c%c%c%c%c",
565@@ -155,7 +155,7 @@
566 if (p)
567 {
568 p->desktop = i;
569- Esnprintf(s, sizeof(s), "%i", i);
570+ snprintf(s, sizeof(s), "%i", i);
571 PagerTitle(p, s);
572 PagerShow(p);
573 }
574@@ -382,7 +382,7 @@
575 {
576 char stuff[255];
577
578- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
579+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
580 bg->ref_count);
581 DIALOG_OK(_("Background Error!"), stuff);
582
583@@ -1047,7 +1047,7 @@
584
585 for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
586 {
587- Esnprintf(s, sizeof(s), "DRAGBAR_DESKTOP_%i", i);
588+ snprintf(s, sizeof(s), "DRAGBAR_DESKTOP_%i", i);
589 ac = FindItem(s, 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS);
590 if (!ac)
591 {
592@@ -1056,15 +1056,15 @@
593 a = CreateAction(EVENT_MOUSE_DOWN, 0, 0, 0, 1, 0, NULL, NULL);
594 AddAction(ac, a);
595 param = Emalloc(3);
596- Esnprintf(param, 3, "%i", i);
597+ snprintf(param, 3, "%i", i);
598 AddToAction(a, ACTION_DESKTOP_DRAG, param);
599 a = CreateAction(EVENT_MOUSE_DOWN, 0, 0, 0, 3, 0, NULL, NULL);
600 AddAction(ac, a);
601- Esnprintf(s, sizeof(s), "deskmenu");
602+ snprintf(s, sizeof(s), "deskmenu");
603 AddToAction(a, ACTION_SHOW_MENU, duplicate(s));
604 a = CreateAction(EVENT_MOUSE_DOWN, 0, 0, 0, 2, 0, NULL, NULL);
605 AddAction(ac, a);
606- Esnprintf(s, sizeof(s), "taskmenu");
607+ snprintf(s, sizeof(s), "taskmenu");
608 AddToAction(a, ACTION_SHOW_MENU, duplicate(s));
609 if (i > 0)
610 {
611@@ -1090,7 +1090,7 @@
612 "applications currently running.\n"));
613 }
614 }
615- Esnprintf(s, sizeof(s), "RAISEBUTTON_DESKTOP_%i", i);
616+ snprintf(s, sizeof(s), "RAISEBUTTON_DESKTOP_%i", i);
617 ac2 = FindItem(s, 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS);
618 if (!ac2)
619 {
620@@ -1099,14 +1099,14 @@
621 a = CreateAction(EVENT_MOUSE_UP, 1, 0, 1, 0, 0, NULL, NULL);
622 AddAction(ac2, a);
623 param = Emalloc(3);
624- Esnprintf(param, 3, "%i", i);
625+ snprintf(param, 3, "%i", i);
626 AddToAction(a, ACTION_DESKTOP_RAISE, param);
627 ac2->tooltipstring =
628 duplicate(_
629 ("Click here to raise this desktop\n"
630 "to the top.\n"));
631 }
632- Esnprintf(s, sizeof(s), "LOWERBUTTON_DESKTOP_%i", i);
633+ snprintf(s, sizeof(s), "LOWERBUTTON_DESKTOP_%i", i);
634 ac3 = FindItem(s, 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS);
635 if (!ac3)
636 {
637@@ -1115,7 +1115,7 @@
638 a = CreateAction(EVENT_MOUSE_UP, 1, 0, 1, 0, 0, NULL, NULL);
639 AddAction(ac3, a);
640 param = Emalloc(3);
641- Esnprintf(param, 3, "%i", i);
642+ snprintf(param, 3, "%i", i);
643 AddToAction(a, ACTION_DESKTOP_LOWER, param);
644 ac3->tooltipstring =
645 duplicate(_
646diff -Nru enlightenment-0.16.5/src/dialog.c enlightenment-0.16.5.new/src/dialog.c
647--- enlightenment-0.16.5/src/dialog.c Fri Jul 28 21:13:13 2000
648+++ enlightenment-0.16.5.new/src/dialog.c Fri Jul 20 05:16:32 2001
649@@ -287,7 +287,7 @@
650
651 SC_Kill();
652 va_start(ap, fmt);
653- Evsnprintf(text, 10240, fmt, ap);
654+ snprintf(text, 10240, fmt, ap);
655 va_end(ap);
656 Alert(text);
657 }
658@@ -299,7 +299,7 @@
659 va_list ap;
660
661 va_start(ap, fmt);
662- Evsnprintf(text, 10240, fmt, ap);
663+ snprintf(text, 10240, fmt, ap);
664 va_end(ap);
665 ASSIGN_ALERT(_("Attention !!!"), _("OK"), " ", " ");
666 Alert(text);
667@@ -313,7 +313,7 @@
668 va_list ap;
669
670 va_start(ap, fmt);
671- Evsnprintf(text, 10240, fmt, ap);
672+ snprintf(text, 10240, fmt, ap);
673 va_end(ap);
674 DialogSetText(d, text);
675 }
676diff -Nru enlightenment-0.16.5/src/dock.c enlightenment-0.16.5.new/src/dock.c
677--- enlightenment-0.16.5/src/dock.c Wed Jul 26 20:00:46 2000
678+++ enlightenment-0.16.5.new/src/dock.c Fri Jul 20 05:24:34 2001
679@@ -31,7 +31,7 @@
680 char id[32];
681
682 EDBUG(3, "DockIt");
683- Esnprintf(id, sizeof(id), "%i", ewin->client.win);
684+ snprintf(id, sizeof(id), "%i", ewin->client.win);
685 ac = 0;
686 ic = FindItem("DEFAULT_DOCK_BUTTON", 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
687 if (mode.dockstartx >= 0)
688diff -Nru enlightenment-0.16.5/src/draw.c enlightenment-0.16.5.new/src/draw.c
689--- enlightenment-0.16.5/src/draw.c Fri Jul 28 21:13:13 2000
690+++ enlightenment-0.16.5.new/src/draw.c Fri Jul 20 05:23:46 2001
691@@ -965,7 +965,7 @@
692 if ((x2) >= (x1)) \
693 { \
694 XDrawLine(disp, root.win, gc, x1, y1, x2, y1); \
695- Esnprintf(str, sizeof(str), "%i", (x2) - (x1) + 1); \
696+ snprintf(str, sizeof(str), "%i", (x2) - (x1) + 1); \
697 XDrawString(disp, root.win, gc, ((x1) + (x2)) / 2, (y1) - 10, str, strlen(str)); \
698 }
699 #define DRAW_V_ARROW(y1, y2, x1) \
700@@ -979,7 +979,7 @@
701 if ((y2) >= (y1)) \
702 { \
703 XDrawLine(disp, root.win, gc, x1, y1, x1, y2); \
704- Esnprintf(str, sizeof(str), "%i", (y2) - (y1) + 1); \
705+ snprintf(str, sizeof(str), "%i", (y2) - (y1) + 1); \
706 XDrawString(disp, root.win, gc, x1 + 10, ((y1) + (y2)) / 2, str, strlen(str)); \
707 }
708 #define DO_DRAW_MODE_1(aa, bb, cc, dd) \
709diff -Nru enlightenment-0.16.5/src/file.c enlightenment-0.16.5.new/src/file.c
710--- enlightenment-0.16.5/src/file.c Fri Jul 28 21:13:13 2000
711+++ enlightenment-0.16.5.new/src/file.c Fri Jul 20 05:24:41 2001
712@@ -52,7 +52,7 @@
713 EDBUG(9, "Etmp");
714 if (!n_calls)
715 n_calls = (unsigned long)time(NULL) + (unsigned long)getpid();
716- Esnprintf(s, 1024, "%s/TMP_%Xl", UserEDir(), n_calls);
717+ snprintf(s, 1024, "%s/TMP_%Xl", UserEDir(), n_calls);
718 n_calls++;
719 EDBUG_RETURN_;
720 }
721diff -Nru enlightenment-0.16.5/src/gnome.c enlightenment-0.16.5.new/src/gnome.c
722--- enlightenment-0.16.5/src/gnome.c Wed Jul 26 20:00:46 2000
723+++ enlightenment-0.16.5.new/src/gnome.c Fri Jul 20 05:24:28 2001
724@@ -651,7 +651,7 @@
725 atom_set = XInternAtom(disp, XA_WIN_WORKSPACE_NAMES, False);
726 for (i = 0; i < mode.numdesktops; i++)
727 {
728- Esnprintf(s, sizeof(s), "%i", i);
729+ snprintf(s, sizeof(s), "%i", i);
730 names[i] = duplicate(s);
731 }
732 if (XStringListToTextProperty(names, mode.numdesktops, &text))
733diff -Nru enlightenment-0.16.5/src/groups.c enlightenment-0.16.5.new/src/groups.c
734--- enlightenment-0.16.5/src/groups.c Wed Jul 26 20:00:46 2000
735+++ enlightenment-0.16.5.new/src/groups.c Fri Jul 20 05:24:38 2001
736@@ -396,7 +396,7 @@
737 FILE *f;
738 char s[1024];
739
740- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", UserEDir(),
741+ snprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", UserEDir(),
742 root.scr);
743 f = fopen(s, "w");
744 if (f)
745@@ -441,7 +441,7 @@
746 FILE *f;
747 char s[1024];
748
749- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", UserEDir(),
750+ snprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", UserEDir(),
751 root.scr);
752 f = fopen(s, "r");
753 if (f)
754diff -Nru enlightenment-0.16.5/src/iclass.c enlightenment-0.16.5.new/src/iclass.c
755--- enlightenment-0.16.5/src/iclass.c Wed Jul 26 20:00:46 2000
756+++ enlightenment-0.16.5.new/src/iclass.c Fri Jul 20 05:25:42 2001
757@@ -108,7 +108,7 @@
758 {
759 char stuff[255];
760
761- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
762+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
763 i->ref_count);
764 DIALOG_OK(_("ImageClass Error!"), stuff);
765 EDBUG_RETURN_;
766diff -Nru enlightenment-0.16.5/src/iconify.c enlightenment-0.16.5.new/src/iconify.c
767--- enlightenment-0.16.5/src/iconify.c Fri Jul 28 19:23:35 2000
768+++ enlightenment-0.16.5.new/src/iconify.c Fri Jul 20 05:25:36 2001
769@@ -1055,7 +1055,7 @@
770 char s[1024];
771 FILE *f;
772
773- Esnprintf(s, sizeof(s), "%s/icondefs.cfg", UserEDir());
774+ snprintf(s, sizeof(s), "%s/icondefs.cfg", UserEDir());
775 f = fopen(s, "w");
776 if (f)
777 {
778@@ -2442,7 +2442,7 @@
779 p_menu->name = duplicate("__IBOX_MENU");
780 p_menu->style =
781 FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_MENU_STYLE);
782- Esnprintf(s, sizeof(s), "iconbox %s", ib->name);
783+ snprintf(s, sizeof(s), "iconbox %s", ib->name);
784 mi =
785 CreateMenuItem(_("This Iconbox Settings..."), NULL, ACTION_CONFIG, s,
786 NULL);
787@@ -2454,7 +2454,7 @@
788 NULL, NULL);
789 AddItemToMenu(p_menu, mi);
790 AddItem(p_menu, p_menu->name, 0, LIST_TYPE_MENU);
791- Esnprintf(s, sizeof(s), "named %s", p_menu->name);
792+ snprintf(s, sizeof(s), "named %s", p_menu->name);
793 spawnMenu(s);
794 x = 0;
795 y = 0;
796diff -Nru enlightenment-0.16.5/src/ipc.c enlightenment-0.16.5.new/src/ipc.c
797--- enlightenment-0.16.5/src/ipc.c Fri Jul 28 21:13:13 2000
798+++ enlightenment-0.16.5.new/src/ipc.c Fri Jul 20 05:25:39 2001
799@@ -613,7 +613,7 @@
800 {
801 for (i = 0; cfg_panels[i]; i += 2)
802 {
803- Esnprintf(buf2, sizeof(buf2), "%s : %s\n", cfg_panels[i],
804+ snprintf(buf2, sizeof(buf2), "%s : %s\n", cfg_panels[i],
805 cfg_panels[i + 1]);
806 strcat(buf, buf2);
807 }
808@@ -737,10 +737,10 @@
809 SaveSnapInfo();
810 }
811 else
812- Esnprintf(buf, sizeof(buf), "Error: no window found");
813+ snprintf(buf, sizeof(buf), "Error: no window found");
814 }
815 else
816- Esnprintf(buf, sizeof(buf), "Error: no parameters");
817+ snprintf(buf, sizeof(buf), "Error: no parameters");
818
819 if (buf[0])
820 CommsSend(c, buf);
821@@ -771,20 +771,20 @@
822 {
823 if (mode.kde_support)
824 {
825- Esnprintf(buf, sizeof(buf), "kde: active");
826+ snprintf(buf, sizeof(buf), "kde: active");
827 }
828 else
829 {
830- Esnprintf(buf, sizeof(buf), "kde: inactive");
831+ snprintf(buf, sizeof(buf), "kde: inactive");
832 }
833 }
834 else
835 {
836- Esnprintf(buf, sizeof(buf), "Error: unknown state specified");
837+ snprintf(buf, sizeof(buf), "Error: unknown state specified");
838 }
839 }
840 else
841- Esnprintf(buf, sizeof(buf), "Error: no state specified");
842+ snprintf(buf, sizeof(buf), "Error: no state specified");
843
844 if (buf[0])
845 CommsSend(c, buf);
846@@ -816,7 +816,7 @@
847 {
848 if (!param2[0])
849 {
850- Esnprintf(buf, sizeof(buf), "Error: no module specified");
851+ snprintf(buf, sizeof(buf), "Error: no module specified");
852 }
853 else
854 {
855@@ -832,7 +832,7 @@
856 {
857 if (!param2[0])
858 {
859- Esnprintf(buf, sizeof(buf), "Error: no module specified");
860+ snprintf(buf, sizeof(buf), "Error: no module specified");
861 }
862 else
863 {
864@@ -843,7 +843,7 @@
865 strcat(buf, ModuleErrorCodeToString(returncode));
866 if (!buf[0])
867 {
868- Esnprintf(buf, sizeof(buf), "");
869+ snprintf(buf, sizeof(buf), "");
870 }
871 }
872 }
873@@ -853,18 +853,18 @@
874 strcat(buf, ModuleListAsString());
875 if (!buf[0])
876 {
877- Esnprintf(buf, sizeof(buf), "no modules loaded");
878+ snprintf(buf, sizeof(buf), "no modules loaded");
879 }
880 }
881 else
882 {
883- Esnprintf(buf, sizeof(buf),
884+ snprintf(buf, sizeof(buf),
885 "Error: unknown module operation specified");
886 }
887 }
888 else
889 {
890- Esnprintf(buf, sizeof(buf), "Error: no module operation specified");
891+ snprintf(buf, sizeof(buf), "Error: no module operation specified");
892 }
893
894 if (buf[0])
895@@ -900,7 +900,7 @@
896 {
897 if (!strcmp(param2, "?"))
898 {
899- Esnprintf(buf, sizeof(buf), "dock_startposition: %d %d",
900+ snprintf(buf, sizeof(buf), "dock_startposition: %d %d",
901 mode.dockstartx, mode.dockstarty);
902 }
903 else
904@@ -913,7 +913,7 @@
905 }
906 else
907 {
908- Esnprintf(buf, sizeof(buf),
909+ snprintf(buf, sizeof(buf),
910 "Error: no y coordinate");
911
912 }
913@@ -921,7 +921,7 @@
914 }
915 else
916 {
917- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
918+ snprintf(buf, sizeof(buf), "Error: no operation specified");
919 }
920 }
921 else if (!strcmp(param1, "direction"))
922@@ -932,23 +932,23 @@
923 {
924 if (mode.dockdirmode == DOCK_LEFT)
925 {
926- Esnprintf(buf, sizeof(buf), "dock_dir: left");
927+ snprintf(buf, sizeof(buf), "dock_dir: left");
928 }
929 else if (mode.dockdirmode == DOCK_RIGHT)
930 {
931- Esnprintf(buf, sizeof(buf), "dock_dir: right");
932+ snprintf(buf, sizeof(buf), "dock_dir: right");
933 }
934 else if (mode.dockdirmode == DOCK_UP)
935 {
936- Esnprintf(buf, sizeof(buf), "dock_dir: up");
937+ snprintf(buf, sizeof(buf), "dock_dir: up");
938 }
939 else if (mode.dockdirmode == DOCK_DOWN)
940 {
941- Esnprintf(buf, sizeof(buf), "dock_dir: down");
942+ snprintf(buf, sizeof(buf), "dock_dir: down");
943 }
944 else
945 {
946- Esnprintf(buf, sizeof(buf),
947+ snprintf(buf, sizeof(buf),
948 "Error: I have NO " "idea what direction "
949 "this thing is going");
950 }
951@@ -971,13 +971,13 @@
952 }
953 else
954 {
955- Esnprintf(buf, sizeof(buf),
956+ snprintf(buf, sizeof(buf),
957 "Error: unknown direction " "specified");
958 }
959 }
960 else
961 {
962- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
963+ snprintf(buf, sizeof(buf), "Error: no operation specified");
964 }
965 }
966 else if (!strcmp(param1, "support"))
967@@ -986,7 +986,7 @@
968 {
969 if (!strcmp(param2, "?"))
970 {
971- Esnprintf(buf, sizeof(buf), "dockapp support: %s",
972+ snprintf(buf, sizeof(buf), "dockapp support: %s",
973 (mode.dockapp_support) ? "enabled" :
974 "disabled");
975 }
976@@ -994,28 +994,28 @@
977 || (!strcmp(param2, "enable")))
978 {
979 mode.dockapp_support = 1;
980- Esnprintf(buf, sizeof(buf), "dockapp support: enabled");
981+ snprintf(buf, sizeof(buf), "dockapp support: enabled");
982 }
983 else if ((!strcmp(param2, "off"))
984 || (!strcmp(param2, "disable")))
985 {
986 mode.dockapp_support = 0;
987- Esnprintf(buf, sizeof(buf), "dockapp support: disabled");
988+ snprintf(buf, sizeof(buf), "dockapp support: disabled");
989 }
990 }
991 else
992 {
993- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
994+ snprintf(buf, sizeof(buf), "Error: no operation specified");
995 }
996 }
997 else
998 {
999- Esnprintf(buf, sizeof(buf), "Error: unknown mode");
1000+ snprintf(buf, sizeof(buf), "Error: unknown mode");
1001 }
1002 }
1003 else
1004 {
1005- Esnprintf(buf, sizeof(buf), "Error: no mode given");
1006+ snprintf(buf, sizeof(buf), "Error: no mode given");
1007 }
1008
1009 if (buf[0])
1010@@ -1037,16 +1037,16 @@
1011 {
1012 if (!strcmp(params, "screen_size"))
1013 {
1014- Esnprintf(buf, sizeof(buf), "screen_size: %d %d", root.w, root.h);
1015+ snprintf(buf, sizeof(buf), "screen_size: %d %d", root.w, root.h);
1016 }
1017 else
1018 {
1019- Esnprintf(buf, sizeof(buf), "Error: unknown info requested");
1020+ snprintf(buf, sizeof(buf), "Error: unknown info requested");
1021 }
1022 }
1023 else
1024 {
1025- Esnprintf(buf, sizeof(buf), "Error: no info requested");
1026+ snprintf(buf, sizeof(buf), "Error: no info requested");
1027 }
1028
1029 if (buf[0])
1030@@ -1102,22 +1102,22 @@
1031 (Button *) FindItem(param1, 0, LIST_FINDBY_NAME,
1032 LIST_TYPE_BUTTON);
1033 if (b)
1034- Esnprintf(buf, sizeof(buf), "%u references remain",
1035+ snprintf(buf, sizeof(buf), "%u references remain",
1036 b->ref_count);
1037 }
1038 else
1039 {
1040- Esnprintf(buf, sizeof(buf), "Error: no cursor specified");
1041+ snprintf(buf, sizeof(buf), "Error: no cursor specified");
1042 }
1043 }
1044 else
1045 {
1046- Esnprintf(buf, sizeof(buf), "Error: unknown operation specified");
1047+ snprintf(buf, sizeof(buf), "Error: unknown operation specified");
1048 }
1049 }
1050 else
1051 {
1052- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1053+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1054 }
1055
1056 if (buf[0])
1057@@ -1158,7 +1158,7 @@
1058
1059 if (bg)
1060 {
1061- Esnprintf(buf, sizeof(buf),
1062+ snprintf(buf, sizeof(buf),
1063 "%s ref_count %u\n" " bg.solid\t %i %i %i \n"
1064 " bg.file\t %s \ttop.file\t %s \n"
1065 " bg.tile\t %i \n"
1066@@ -1176,7 +1176,7 @@
1067 bg->top.yperc);
1068 }
1069 else
1070- Esnprintf(buf, sizeof(buf),
1071+ snprintf(buf, sizeof(buf),
1072 "Error: background '%s' does not exist.", name);
1073 }
1074 else
1075@@ -1195,7 +1195,7 @@
1076 AddItem(bg, bg->name, 0, LIST_TYPE_BACKGROUND);
1077 }
1078 if (!bg)
1079- Esnprintf(buf, sizeof(buf),
1080+ snprintf(buf, sizeof(buf),
1081 "Error: could not create background '%s'.",
1082 name);
1083 else
1084@@ -1275,7 +1275,7 @@
1085 }
1086 else
1087 {
1088- Esnprintf(buf, sizeof(buf),
1089+ snprintf(buf, sizeof(buf),
1090 "Error: unknown background value type '%s'.",
1091 type);
1092 }
1093@@ -1298,12 +1298,12 @@
1094 FreeDesktopBG(bg);
1095 }
1096 else
1097- Esnprintf(buf, sizeof(buf),
1098+ snprintf(buf, sizeof(buf),
1099 "Error: ref_count for background '%s' is %u.",
1100 name, bg->ref_count);
1101 }
1102 else
1103- Esnprintf(buf, sizeof(buf),
1104+ snprintf(buf, sizeof(buf),
1105 "Error: background '%s' does not exist.", name);
1106 }
1107 }
1108@@ -1322,7 +1322,7 @@
1109 for (i = 0; i < num; i++)
1110 {
1111 buf2[0] = 0;
1112- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1113+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1114 if (buf3)
1115 buf3 = realloc(buf3, strlen(buf3) + strlen(buf2) + 1);
1116 else
1117@@ -1393,22 +1393,22 @@
1118 (Border *) FindItem(param1, 0, LIST_FINDBY_NAME,
1119 LIST_TYPE_BORDER);
1120 if (b)
1121- Esnprintf(buf, sizeof(buf), "%u references remain",
1122+ snprintf(buf, sizeof(buf), "%u references remain",
1123 b->ref_count);
1124 }
1125 else
1126 {
1127- Esnprintf(buf, sizeof(buf), "Error: no cursor specified");
1128+ snprintf(buf, sizeof(buf), "Error: no cursor specified");
1129 }
1130 }
1131 else
1132 {
1133- Esnprintf(buf, sizeof(buf), "Error: unknown operation specified");
1134+ snprintf(buf, sizeof(buf), "Error: unknown operation specified");
1135 }
1136 }
1137 else
1138 {
1139- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1140+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1141 }
1142
1143 if (buf[0])
1144@@ -1463,22 +1463,22 @@
1145 (ECursor *) FindItem(param1, 0, LIST_FINDBY_NAME,
1146 LIST_TYPE_ECURSOR);
1147 if (ec)
1148- Esnprintf(buf, sizeof(buf), "%u references remain",
1149+ snprintf(buf, sizeof(buf), "%u references remain",
1150 ec->ref_count);
1151 }
1152 else
1153 {
1154- Esnprintf(buf, sizeof(buf), "Error: no cursor specified");
1155+ snprintf(buf, sizeof(buf), "Error: no cursor specified");
1156 }
1157 }
1158 else
1159 {
1160- Esnprintf(buf, sizeof(buf), "Error: unknown operation specified");
1161+ snprintf(buf, sizeof(buf), "Error: unknown operation specified");
1162 }
1163 }
1164 else
1165 {
1166- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1167+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1168 }
1169
1170 if (buf[0])
1171@@ -1580,13 +1580,13 @@
1172 if (txt)
1173 {
1174 TextSize(t, 0, 0, STATE_NORMAL, txt, &w, &h, 17);
1175- Esnprintf(buf, sizeof(buf), "%i %i", w, h);
1176+ snprintf(buf, sizeof(buf), "%i %i", w, h);
1177 }
1178 else
1179- Esnprintf(buf, sizeof(buf), "0 0");
1180+ snprintf(buf, sizeof(buf), "0 0");
1181 }
1182 else
1183- Esnprintf(buf, sizeof(buf), "TextClass %s not found",
1184+ snprintf(buf, sizeof(buf), "TextClass %s not found",
1185 param1);
1186 }
1187 else if (!strcmp(param2, "query"))
1188@@ -1597,9 +1597,9 @@
1189 (TextClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
1190 LIST_TYPE_TCLASS);
1191 if (t)
1192- Esnprintf(buf, sizeof(buf), "TextClass %s found", t->name);
1193+ snprintf(buf, sizeof(buf), "TextClass %s found", t->name);
1194 else
1195- Esnprintf(buf, sizeof(buf), "TextClass %s not found",
1196+ snprintf(buf, sizeof(buf), "TextClass %s not found",
1197 param1);
1198 }
1199 else if (!strcmp(param2, "ref_count"))
1200@@ -1610,23 +1610,23 @@
1201 (TextClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
1202 LIST_TYPE_TCLASS);
1203 if (t)
1204- Esnprintf(buf, sizeof(buf), "%u references remain.",
1205+ snprintf(buf, sizeof(buf), "%u references remain.",
1206 t->ref_count);
1207 }
1208 else
1209 {
1210- Esnprintf(buf, sizeof(buf),
1211+ snprintf(buf, sizeof(buf),
1212 "Error: unknown operation specified");
1213 }
1214 }
1215 else
1216 {
1217- Esnprintf(buf, sizeof(buf), "Error: no class specified");
1218+ snprintf(buf, sizeof(buf), "Error: no class specified");
1219 }
1220 }
1221 else
1222 {
1223- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1224+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1225 }
1226
1227 if (buf[0])
1228@@ -1683,23 +1683,23 @@
1229 LIST_FINDBY_NAME,
1230 LIST_TYPE_COLORMODIFIER);
1231 if (cm)
1232- Esnprintf(buf, sizeof(buf), "%u references remain.",
1233+ snprintf(buf, sizeof(buf), "%u references remain.",
1234 cm->ref_count);
1235 }
1236 else
1237 {
1238- Esnprintf(buf, sizeof(buf),
1239+ snprintf(buf, sizeof(buf),
1240 "Error: unknown operation specified");
1241 }
1242 }
1243 else
1244 {
1245- Esnprintf(buf, sizeof(buf), "Error: no class specified");
1246+ snprintf(buf, sizeof(buf), "Error: no class specified");
1247 }
1248 }
1249 else
1250 {
1251- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1252+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1253 }
1254
1255 if (buf[0])
1256@@ -1754,23 +1754,23 @@
1257 (ActionClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
1258 LIST_TYPE_ACLASS);
1259 if (a)
1260- Esnprintf(buf, sizeof(buf), "%u references remain.",
1261+ snprintf(buf, sizeof(buf), "%u references remain.",
1262 a->ref_count);
1263 }
1264 else
1265 {
1266- Esnprintf(buf, sizeof(buf),
1267+ snprintf(buf, sizeof(buf),
1268 "Error: unknown operation specified");
1269 }
1270 }
1271 else
1272 {
1273- Esnprintf(buf, sizeof(buf), "Error: no class specified");
1274+ snprintf(buf, sizeof(buf), "Error: no class specified");
1275 }
1276 }
1277 else
1278 {
1279- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1280+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1281 }
1282
1283 if (buf[0])
1284@@ -1833,11 +1833,11 @@
1285 (ImageClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
1286 LIST_TYPE_ICLASS);
1287 if (iclass)
1288- Esnprintf(buf, sizeof(buf), "%i %i %i %i",
1289+ snprintf(buf, sizeof(buf), "%i %i %i %i",
1290 iclass->padding.left, iclass->padding.right,
1291 iclass->padding.top, iclass->padding.bottom);
1292 else
1293- Esnprintf(buf, sizeof(buf),
1294+ snprintf(buf, sizeof(buf),
1295 "Error: Imageclass does not exist");
1296 }
1297 else if (!strcmp(param2, "get_image_size"))
1298@@ -1863,20 +1863,20 @@
1299 normal->real_file);
1300 if (im)
1301 {
1302- Esnprintf(buf, sizeof(buf), "%i %i",
1303+ snprintf(buf, sizeof(buf), "%i %i",
1304 im->rgb_width, im->rgb_height);
1305 Imlib_destroy_image(id, im);
1306 }
1307 else
1308- Esnprintf(buf, sizeof(buf),
1309+ snprintf(buf, sizeof(buf),
1310 "Error: Image does not exist");
1311 }
1312 else
1313- Esnprintf(buf, sizeof(buf),
1314+ snprintf(buf, sizeof(buf),
1315 "Error: Image does not exist");
1316 }
1317 else
1318- Esnprintf(buf, sizeof(buf),
1319+ snprintf(buf, sizeof(buf),
1320 "Error: Imageclass does not exist");
1321 }
1322 else if (!strcmp(param2, "apply"))
1323@@ -1941,7 +1941,7 @@
1324 else
1325 st = STATE_NORMAL;
1326 if (!(hptr = atword(params, 6)))
1327- Esnprintf(buf, sizeof(buf),
1328+ snprintf(buf, sizeof(buf),
1329 "Error: missing width and/or height");
1330 else
1331 {
1332@@ -1953,7 +1953,7 @@
1333 IclassApplyCopy(iclass, win, w, h, 0, 0, st, &pmap,
1334 &mask);
1335 queue_up = pq;
1336- Esnprintf(buf, sizeof(buf), "0x%08x 0x%08x", pmap,
1337+ snprintf(buf, sizeof(buf), "0x%08x 0x%08x", pmap,
1338 mask);
1339 }
1340 }
1341@@ -1966,7 +1966,7 @@
1342 (ImageClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
1343 LIST_TYPE_ICLASS);
1344 if (i)
1345- Esnprintf(buf, sizeof(buf), "%u references remain",
1346+ snprintf(buf, sizeof(buf), "%u references remain",
1347 i->ref_count);
1348 }
1349 else if (!strcmp(param2, "query"))
1350@@ -1977,26 +1977,26 @@
1351 (ImageClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
1352 LIST_TYPE_ICLASS);
1353 if (i)
1354- Esnprintf(buf, sizeof(buf), "ImageClass %s found",
1355+ snprintf(buf, sizeof(buf), "ImageClass %s found",
1356 i->name);
1357 else
1358- Esnprintf(buf, sizeof(buf), "ImageClass %s not found",
1359+ snprintf(buf, sizeof(buf), "ImageClass %s not found",
1360 param1);
1361 }
1362 else
1363 {
1364- Esnprintf(buf, sizeof(buf),
1365+ snprintf(buf, sizeof(buf),
1366 "Error: unknown operation specified");
1367 }
1368 }
1369 else
1370 {
1371- Esnprintf(buf, sizeof(buf), "Error: no class specified");
1372+ snprintf(buf, sizeof(buf), "Error: no class specified");
1373 }
1374 }
1375 else
1376 {
1377- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1378+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1379 }
1380
1381 if (buf[0])
1382@@ -2039,7 +2039,7 @@
1383 }
1384 else
1385 {
1386- Esnprintf(buf, sizeof(buf), "Error: no file specified");
1387+ snprintf(buf, sizeof(buf), "Error: no file specified");
1388 }
1389 }
1390 else if (!strcmp(param1, "delete"))
1391@@ -2050,18 +2050,18 @@
1392 }
1393 else
1394 {
1395- Esnprintf(buf, sizeof(buf),
1396+ snprintf(buf, sizeof(buf),
1397 "Error: unknown operation specified");
1398 }
1399 }
1400 else
1401 {
1402- Esnprintf(buf, sizeof(buf), "Error: no class specified");
1403+ snprintf(buf, sizeof(buf), "Error: no class specified");
1404 }
1405 }
1406 else
1407 {
1408- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
1409+ snprintf(buf, sizeof(buf), "Error: no operation specified");
1410 }
1411
1412 if (buf[0])
1413@@ -2085,11 +2085,11 @@
1414 if (soundtoplay)
1415 ApplySclass(soundtoplay);
1416 else
1417- Esnprintf(buf, sizeof(buf), "Error: unknown soundclass selected");
1418+ snprintf(buf, sizeof(buf), "Error: unknown soundclass selected");
1419 }
1420 else
1421 {
1422- Esnprintf(buf, sizeof(buf), "Error: no soundclass selected");
1423+ snprintf(buf, sizeof(buf), "Error: no soundclass selected");
1424 }
1425
1426 if (buf[0])
1427@@ -2118,7 +2118,7 @@
1428 for (i = 0; i < num; i++)
1429 {
1430 buf2[0] = 0;
1431- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1432+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1433 if (buf)
1434 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1435 else
1436@@ -2139,7 +2139,7 @@
1437 for (i = 0; i < num; i++)
1438 {
1439 buf2[0] = 0;
1440- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1441+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1442 if (buf)
1443 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1444 else
1445@@ -2160,7 +2160,7 @@
1446 for (i = 0; i < num; i++)
1447 {
1448 buf2[0] = 0;
1449- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1450+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1451 if (buf)
1452 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1453 else
1454@@ -2181,7 +2181,7 @@
1455 for (i = 0; i < num; i++)
1456 {
1457 buf2[0] = 0;
1458- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1459+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1460 if (buf)
1461 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1462 else
1463@@ -2202,7 +2202,7 @@
1464 for (i = 0; i < num; i++)
1465 {
1466 buf2[0] = 0;
1467- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1468+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1469 if (buf)
1470 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1471 else
1472@@ -2223,7 +2223,7 @@
1473 for (i = 0; i < num; i++)
1474 {
1475 buf2[0] = 0;
1476- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1477+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1478 if (buf)
1479 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1480 else
1481@@ -2244,7 +2244,7 @@
1482 for (i = 0; i < num; i++)
1483 {
1484 buf2[0] = 0;
1485- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1486+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1487 if (buf)
1488 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1489 else
1490@@ -2265,7 +2265,7 @@
1491 for (i = 0; i < num; i++)
1492 {
1493 buf2[0] = 0;
1494- Esnprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1495+ snprintf(buf2, sizeof(buf2), "%s\n", lst[i]->name);
1496 if (buf)
1497 buf = realloc(buf, strlen(buf) + strlen(buf2) + 1);
1498 else
1499@@ -2304,7 +2304,7 @@
1500 DIALOG_OK(_("Message"), params);
1501 }
1502 else
1503- Esnprintf(buf, sizeof(buf), "Error: No text for dialog specified");
1504+ snprintf(buf, sizeof(buf), "Error: No text for dialog specified");
1505
1506 if (buf[0])
1507 CommsSend(c, buf);
1508@@ -2329,12 +2329,12 @@
1509 my_focused_win = GetFocusEwin();
1510 if (my_focused_win)
1511 {
1512- Esnprintf(buf, sizeof(buf), "focused: %8x",
1513+ snprintf(buf, sizeof(buf), "focused: %8x",
1514 my_focused_win->client.win);
1515 }
1516 else
1517 {
1518- Esnprintf(buf, sizeof(buf), "focused: none");
1519+ snprintf(buf, sizeof(buf), "focused: none");
1520 }
1521 }
1522 else
1523@@ -2349,7 +2349,7 @@
1524 }
1525 else
1526 {
1527- Esnprintf(buf, sizeof(buf), "Error: no window selected");
1528+ snprintf(buf, sizeof(buf), "Error: no window selected");
1529 }
1530
1531 if (buf[0])
1532@@ -2390,16 +2390,16 @@
1533 {
1534 if (mode.all_new_windows_get_focus)
1535 {
1536- Esnprintf(buf, sizeof(buf), "new_window_focus: on");
1537+ snprintf(buf, sizeof(buf), "new_window_focus: on");
1538 }
1539 else
1540 {
1541- Esnprintf(buf, sizeof(buf), "new_window_focus: off");
1542+ snprintf(buf, sizeof(buf), "new_window_focus: off");
1543 }
1544 }
1545 else
1546 {
1547- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1548+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1549 }
1550 }
1551 else if (!strcmp(param1, "focus_list"))
1552@@ -2416,16 +2416,16 @@
1553 {
1554 if (mode.display_warp)
1555 {
1556- Esnprintf(buf, sizeof(buf), "focus_list: on");
1557+ snprintf(buf, sizeof(buf), "focus_list: on");
1558 }
1559 else
1560 {
1561- Esnprintf(buf, sizeof(buf), "focus_list: off");
1562+ snprintf(buf, sizeof(buf), "focus_list: off");
1563 }
1564 }
1565 else
1566 {
1567- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1568+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1569 }
1570 }
1571 else if (!strcmp(param1, "new_popup_window_focus"))
1572@@ -2442,18 +2442,18 @@
1573 {
1574 if (mode.new_transients_get_focus)
1575 {
1576- Esnprintf(buf, sizeof(buf),
1577+ snprintf(buf, sizeof(buf),
1578 "new_popup_window_focus: on");
1579 }
1580 else
1581 {
1582- Esnprintf(buf, sizeof(buf),
1583+ snprintf(buf, sizeof(buf),
1584 "new_popup_window_focus: off");
1585 }
1586 }
1587 else
1588 {
1589- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1590+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1591 }
1592 }
1593 else if (!strcmp(param1, "new_popup_of_owner_focus"))
1594@@ -2470,18 +2470,18 @@
1595 {
1596 if (mode.new_transients_get_focus_if_group_focused)
1597 {
1598- Esnprintf(buf, sizeof(buf),
1599+ snprintf(buf, sizeof(buf),
1600 "new_popup_of_owner_focus: on");
1601 }
1602 else
1603 {
1604- Esnprintf(buf, sizeof(buf),
1605+ snprintf(buf, sizeof(buf),
1606 "new_popup_of_owner_focus: off");
1607 }
1608 }
1609 else
1610 {
1611- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1612+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1613 }
1614 }
1615 else if (!strcmp(param1, "raise_on_keyboard_focus_switch"))
1616@@ -2498,18 +2498,18 @@
1617 {
1618 if (mode.raise_on_next_focus)
1619 {
1620- Esnprintf(buf, sizeof(buf),
1621+ snprintf(buf, sizeof(buf),
1622 "raise_on_keyboard_focus_switch: on");
1623 }
1624 else
1625 {
1626- Esnprintf(buf, sizeof(buf),
1627+ snprintf(buf, sizeof(buf),
1628 "raise_on_keyboard_focus_switch: off");
1629 }
1630 }
1631 else
1632 {
1633- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1634+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1635 }
1636 }
1637 else if (!strcmp(param1, "raise_after_keyboard_focus_switch"))
1638@@ -2526,18 +2526,18 @@
1639 {
1640 if (mode.raise_after_next_focus)
1641 {
1642- Esnprintf(buf, sizeof(buf),
1643+ snprintf(buf, sizeof(buf),
1644 "raise_after_keyboard_focus_switch: on");
1645 }
1646 else
1647 {
1648- Esnprintf(buf, sizeof(buf),
1649+ snprintf(buf, sizeof(buf),
1650 "raise_after_keyboard_focus_switch: off");
1651 }
1652 }
1653 else
1654 {
1655- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1656+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1657 }
1658 }
1659 else if (!strcmp(param1, "display_warp"))
1660@@ -2554,16 +2554,16 @@
1661 {
1662 if (mode.display_warp)
1663 {
1664- Esnprintf(buf, sizeof(buf), "display_warp: on");
1665+ snprintf(buf, sizeof(buf), "display_warp: on");
1666 }
1667 else
1668 {
1669- Esnprintf(buf, sizeof(buf), "display_warp: off");
1670+ snprintf(buf, sizeof(buf), "display_warp: off");
1671 }
1672 }
1673 else
1674 {
1675- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1676+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1677 }
1678 }
1679 else if (!strcmp(param1, "pointer_to_keyboard_focus_window"))
1680@@ -2580,18 +2580,18 @@
1681 {
1682 if (mode.warp_on_next_focus)
1683 {
1684- Esnprintf(buf, sizeof(buf),
1685+ snprintf(buf, sizeof(buf),
1686 "pointer_to_keyboard_focus_window: on");
1687 }
1688 else
1689 {
1690- Esnprintf(buf, sizeof(buf),
1691+ snprintf(buf, sizeof(buf),
1692 "pointer_to_keyboard_focus_window: off");
1693 }
1694 }
1695 else
1696 {
1697- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1698+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1699 }
1700 }
1701 else if (!strcmp(param1, "pointer_after_keyboard_focus_window"))
1702@@ -2608,18 +2608,18 @@
1703 {
1704 if (mode.warp_after_next_focus)
1705 {
1706- Esnprintf(buf, sizeof(buf),
1707+ snprintf(buf, sizeof(buf),
1708 "pointer_after_keyboard_focus_window: on");
1709 }
1710 else
1711 {
1712- Esnprintf(buf, sizeof(buf),
1713+ snprintf(buf, sizeof(buf),
1714 "pointer_after_keyboard_focus_window: off");
1715 }
1716 }
1717 else
1718 {
1719- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1720+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1721 }
1722 }
1723 else if (!strcmp(param1, "transients_follow_leader"))
1724@@ -2636,18 +2636,18 @@
1725 {
1726 if (mode.transientsfollowleader)
1727 {
1728- Esnprintf(buf, sizeof(buf),
1729+ snprintf(buf, sizeof(buf),
1730 "transients_follow_leader: on");
1731 }
1732 else
1733 {
1734- Esnprintf(buf, sizeof(buf),
1735+ snprintf(buf, sizeof(buf),
1736 "transients_follow_leader: off");
1737 }
1738 }
1739 else
1740 {
1741- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1742+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1743 }
1744 }
1745 else if (!strcmp(param1, "switch_to_popup_location"))
1746@@ -2664,18 +2664,18 @@
1747 {
1748 if (mode.switchfortransientmap)
1749 {
1750- Esnprintf(buf, sizeof(buf),
1751+ snprintf(buf, sizeof(buf),
1752 "switch_to_popup_location: on");
1753 }
1754 else
1755 {
1756- Esnprintf(buf, sizeof(buf),
1757+ snprintf(buf, sizeof(buf),
1758 "switch_to_popup_location: off");
1759 }
1760 }
1761 else
1762 {
1763- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1764+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1765 }
1766 }
1767 else if (!strcmp(param1, "manual_placement"))
1768@@ -2692,16 +2692,16 @@
1769 {
1770 if (mode.manual_placement)
1771 {
1772- Esnprintf(buf, sizeof(buf), "manual_placement: on");
1773+ snprintf(buf, sizeof(buf), "manual_placement: on");
1774 }
1775 else
1776 {
1777- Esnprintf(buf, sizeof(buf), "manual_placement: off");
1778+ snprintf(buf, sizeof(buf), "manual_placement: off");
1779 }
1780 }
1781 else
1782 {
1783- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1784+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1785 }
1786 }
1787 else if (!strcmp(param1, "manual_placement_mouse_pointer"))
1788@@ -2718,28 +2718,28 @@
1789 {
1790 if (mode.manual_placement_mouse_pointer)
1791 {
1792- Esnprintf(buf, sizeof(buf),
1793+ snprintf(buf, sizeof(buf),
1794 "manual_placement_mouse_pointer: on");
1795 }
1796 else
1797 {
1798- Esnprintf(buf, sizeof(buf),
1799+ snprintf(buf, sizeof(buf),
1800 "manual_placement_mouse_pointer: off");
1801 }
1802 }
1803 else
1804 {
1805- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1806+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1807 }
1808 }
1809 else
1810 {
1811- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1812+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1813 }
1814 }
1815 else
1816 {
1817- Esnprintf(buf, sizeof(buf), "Error: no mode selected");
1818+ snprintf(buf, sizeof(buf), "Error: no mode selected");
1819 }
1820
1821 if (buf[0])
1822@@ -2771,7 +2771,7 @@
1823 {
1824 if (lst[i]->pager)
1825 {
1826- Esnprintf(buf2, sizeof(buf2), "%8x\n",
1827+ snprintf(buf2, sizeof(buf2), "%8x\n",
1828 lst[i]->client.win);
1829 strcat(buf, buf2);
1830 }
1831@@ -2783,7 +2783,7 @@
1832 {
1833 if (lst[i]->menu)
1834 {
1835- Esnprintf(buf2, sizeof(buf2), "%8x\n",
1836+ snprintf(buf2, sizeof(buf2), "%8x\n",
1837 lst[i]->client.win);
1838 strcat(buf, buf2);
1839 }
1840@@ -2795,7 +2795,7 @@
1841 {
1842 if (lst[i]->dialog)
1843 {
1844- Esnprintf(buf2, sizeof(buf2), "%8x\n",
1845+ snprintf(buf2, sizeof(buf2), "%8x\n",
1846 lst[i]->client.win);
1847 strcat(buf, buf2);
1848 }
1849@@ -2807,7 +2807,7 @@
1850 {
1851 if (lst[i]->internal)
1852 {
1853- Esnprintf(buf2, sizeof(buf2), "%8x\n",
1854+ snprintf(buf2, sizeof(buf2), "%8x\n",
1855 lst[i]->client.win);
1856 strcat(buf, buf2);
1857 }
1858@@ -2815,7 +2815,7 @@
1859 }
1860 else
1861 {
1862- Esnprintf(buf, sizeof(buf),
1863+ snprintf(buf, sizeof(buf),
1864 "Error: unknown internal list specified");
1865 }
1866
1867@@ -2858,11 +2858,11 @@
1868 {
1869 if (mode.show_pagers)
1870 {
1871- Esnprintf(buf, sizeof(buf), "pager: on");
1872+ snprintf(buf, sizeof(buf), "pager: on");
1873 }
1874 else
1875 {
1876- Esnprintf(buf, sizeof(buf), "pager: off");
1877+ snprintf(buf, sizeof(buf), "pager: off");
1878 }
1879 }
1880 else if (!strcmp(param1, "hiq"))
1881@@ -2872,11 +2872,11 @@
1882 {
1883 if (mode.pager_hiq)
1884 {
1885- Esnprintf(buf, sizeof(buf), "pager_hiq: on");
1886+ snprintf(buf, sizeof(buf), "pager_hiq: on");
1887 }
1888 else
1889 {
1890- Esnprintf(buf, sizeof(buf), "pager_hiq: off");
1891+ snprintf(buf, sizeof(buf), "pager_hiq: off");
1892 }
1893 }
1894 else if (!strcmp(param2, "on"))
1895@@ -2889,7 +2889,7 @@
1896 }
1897 else
1898 {
1899- Esnprintf(buf, sizeof(buf), "Error: unknown mode selected");
1900+ snprintf(buf, sizeof(buf), "Error: unknown mode selected");
1901
1902 }
1903 }
1904@@ -2919,13 +2919,13 @@
1905 }
1906 else
1907 {
1908- Esnprintf(buf, sizeof(buf),
1909+ snprintf(buf, sizeof(buf),
1910 "Error: unknown mode selected");
1911 }
1912 }
1913 else
1914 {
1915- Esnprintf(buf, sizeof(buf), "Error: no mode selected");
1916+ snprintf(buf, sizeof(buf), "Error: no mode selected");
1917 }
1918 }
1919 else if (!strcmp(param1, "title"))
1920@@ -2954,7 +2954,7 @@
1921 }
1922 else
1923 {
1924- Esnprintf(buf, sizeof(buf), "Error: no mode selected");
1925+ snprintf(buf, sizeof(buf), "Error: no mode selected");
1926 }
1927 }
1928 }
1929@@ -2965,7 +2965,7 @@
1930 {
1931 if (!strcmp(param2, "?"))
1932 {
1933- Esnprintf(buf, sizeof(buf), "pager_scanrate: %d",
1934+ snprintf(buf, sizeof(buf), "pager_scanrate: %d",
1935 mode.pager_scanspeed);
1936 }
1937 else
1938@@ -2975,7 +2975,7 @@
1939 }
1940 else
1941 {
1942- Esnprintf(buf, sizeof(buf), "Error: no scanrate specified.");
1943+ snprintf(buf, sizeof(buf), "Error: no scanrate specified.");
1944 }
1945 }
1946 else if (!strcmp(param1, "snap"))
1947@@ -2985,11 +2985,11 @@
1948 {
1949 if (mode.pager_hiq)
1950 {
1951- Esnprintf(buf, sizeof(buf), "pager_snap: on");
1952+ snprintf(buf, sizeof(buf), "pager_snap: on");
1953 }
1954 else
1955 {
1956- Esnprintf(buf, sizeof(buf), "pager_snap: off");
1957+ snprintf(buf, sizeof(buf), "pager_snap: off");
1958 }
1959 }
1960 else if (!strcmp(param2, "on"))
1961@@ -3025,12 +3025,12 @@
1962 }
1963 else if (!strcmp(param3, "?"))
1964 {
1965- Esnprintf(buf, sizeof(buf), "Desk %s: %i pagers", param2,
1966+ snprintf(buf, sizeof(buf), "Desk %s: %i pagers", param2,
1967 PagerForDesktop(atoi(param2)));
1968 }
1969 else
1970 {
1971- Esnprintf(buf, sizeof(buf),
1972+ snprintf(buf, sizeof(buf),
1973 "Error: unknown mode specified");
1974 }
1975 }
1976@@ -3038,22 +3038,22 @@
1977 {
1978 if (param2[0])
1979 {
1980- Esnprintf(buf, sizeof(buf), "Error: no mode specified");
1981+ snprintf(buf, sizeof(buf), "Error: no mode specified");
1982 }
1983 else
1984 {
1985- Esnprintf(buf, sizeof(buf), "Error: no desk specified");
1986+ snprintf(buf, sizeof(buf), "Error: no desk specified");
1987 }
1988 }
1989 }
1990 else
1991 {
1992- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
1993+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
1994 }
1995 }
1996 else
1997 {
1998- Esnprintf(buf, sizeof(buf), "Error: no mode specified");
1999+ snprintf(buf, sizeof(buf), "Error: no mode specified");
2000 }
2001
2002 if (buf[0])
2003@@ -3102,29 +3102,29 @@
2004 if (mode.movemode)
2005 {
2006 if (mode.movemode == 1)
2007- Esnprintf(buf, sizeof(buf), "movemode: lined");
2008+ snprintf(buf, sizeof(buf), "movemode: lined");
2009 else if (mode.movemode == 2)
2010- Esnprintf(buf, sizeof(buf), "movemode: box");
2011+ snprintf(buf, sizeof(buf), "movemode: box");
2012 else if (mode.movemode == 3)
2013- Esnprintf(buf, sizeof(buf), "movemode: shaded");
2014+ snprintf(buf, sizeof(buf), "movemode: shaded");
2015 else if (mode.movemode == 4)
2016- Esnprintf(buf, sizeof(buf), "movemode: semi-solid");
2017+ snprintf(buf, sizeof(buf), "movemode: semi-solid");
2018 else if (mode.movemode == 5)
2019- Esnprintf(buf, sizeof(buf), "movemode: translucent");
2020+ snprintf(buf, sizeof(buf), "movemode: translucent");
2021 }
2022 else
2023 {
2024- Esnprintf(buf, sizeof(buf), "movemode: opaque");
2025+ snprintf(buf, sizeof(buf), "movemode: opaque");
2026 }
2027 }
2028 else
2029 {
2030- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2031+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2032 }
2033 }
2034 else
2035 {
2036- Esnprintf(buf, sizeof(buf), "Error: no mode specified");
2037+ snprintf(buf, sizeof(buf), "Error: no mode specified");
2038 }
2039
2040 if (buf[0])
2041@@ -3169,27 +3169,27 @@
2042 if (mode.resizemode)
2043 {
2044 if (mode.resizemode == 1)
2045- Esnprintf(buf, sizeof(buf), "resizemode: lined");
2046+ snprintf(buf, sizeof(buf), "resizemode: lined");
2047 else if (mode.resizemode == 2)
2048- Esnprintf(buf, sizeof(buf), "resizemode: box");
2049+ snprintf(buf, sizeof(buf), "resizemode: box");
2050 else if (mode.resizemode == 3)
2051- Esnprintf(buf, sizeof(buf), "resizemode: shaded");
2052+ snprintf(buf, sizeof(buf), "resizemode: shaded");
2053 else if (mode.resizemode == 4)
2054- Esnprintf(buf, sizeof(buf), "resizemode: semi-solid");
2055+ snprintf(buf, sizeof(buf), "resizemode: semi-solid");
2056 }
2057 else
2058 {
2059- Esnprintf(buf, sizeof(buf), "resizemode: opaque");
2060+ snprintf(buf, sizeof(buf), "resizemode: opaque");
2061 }
2062 }
2063 else
2064 {
2065- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2066+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2067 }
2068 }
2069 else
2070 {
2071- Esnprintf(buf, sizeof(buf), "Error: no mode specified");
2072+ snprintf(buf, sizeof(buf), "Error: no mode specified");
2073 }
2074
2075 if (buf[0])
2076@@ -3226,23 +3226,23 @@
2077 if (mode.geominfomode)
2078 {
2079 if (mode.geominfomode == 1)
2080- Esnprintf(buf, sizeof(buf), "geominfomode: center");
2081+ snprintf(buf, sizeof(buf), "geominfomode: center");
2082 else if (mode.geominfomode == 2)
2083- Esnprintf(buf, sizeof(buf), "geominfomode: corner");
2084+ snprintf(buf, sizeof(buf), "geominfomode: corner");
2085 }
2086 else
2087 {
2088- Esnprintf(buf, sizeof(buf), "geominfomode: never");
2089+ snprintf(buf, sizeof(buf), "geominfomode: never");
2090 }
2091 }
2092 else
2093 {
2094- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2095+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2096 }
2097 }
2098 else
2099 {
2100- Esnprintf(buf, sizeof(buf), "Error: no mode specified");
2101+ snprintf(buf, sizeof(buf), "Error: no mode specified");
2102 }
2103
2104 if (buf[0])
2105@@ -3283,13 +3283,13 @@
2106 else if (!strcmp(word2, "?"))
2107 {
2108 if (FX_IsOn("ripples"))
2109- Esnprintf(buf, sizeof(buf), "ripples: on");
2110+ snprintf(buf, sizeof(buf), "ripples: on");
2111 else
2112- Esnprintf(buf, sizeof(buf), "ripples: off");
2113+ snprintf(buf, sizeof(buf), "ripples: off");
2114 }
2115 else
2116 {
2117- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2118+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2119 }
2120 }
2121 else if (!strcmp(word1, "deskslide"))
2122@@ -3306,13 +3306,13 @@
2123 else if (!strcmp(word2, "?"))
2124 {
2125 if (desks.slidein)
2126- Esnprintf(buf, sizeof(buf), "deskslide: on");
2127+ snprintf(buf, sizeof(buf), "deskslide: on");
2128 else
2129- Esnprintf(buf, sizeof(buf), "deskslide: off");
2130+ snprintf(buf, sizeof(buf), "deskslide: off");
2131 }
2132 else
2133 {
2134- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2135+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2136 }
2137 }
2138 else if (!strcmp(word1, "mapslide"))
2139@@ -3329,13 +3329,13 @@
2140 else if (!strcmp(word2, "?"))
2141 {
2142 if (mode.mapslide)
2143- Esnprintf(buf, sizeof(buf), "mapslide: on");
2144+ snprintf(buf, sizeof(buf), "mapslide: on");
2145 else
2146- Esnprintf(buf, sizeof(buf), "mapslide: off");
2147+ snprintf(buf, sizeof(buf), "mapslide: off");
2148 }
2149 else
2150 {
2151- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2152+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2153 }
2154 }
2155 else if (!strcmp(word1, "raindrops"))
2156@@ -3354,13 +3354,13 @@
2157 else if (!strcmp(word2, "?"))
2158 {
2159 if (FX_IsOn("raindrops"))
2160- Esnprintf(buf, sizeof(buf), "raindrops: on");
2161+ snprintf(buf, sizeof(buf), "raindrops: on");
2162 else
2163- Esnprintf(buf, sizeof(buf), "raindrops: off");
2164+ snprintf(buf, sizeof(buf), "raindrops: off");
2165 }
2166 else
2167 {
2168- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2169+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2170 }
2171 }
2172 else if (!strcmp(word1, "menu_animate"))
2173@@ -3377,13 +3377,13 @@
2174 else if (!strcmp(word2, "?"))
2175 {
2176 if (mode.menuslide)
2177- Esnprintf(buf, sizeof(buf), "menu_animate: on");
2178+ snprintf(buf, sizeof(buf), "menu_animate: on");
2179 else
2180- Esnprintf(buf, sizeof(buf), "menu_animate: off");
2181+ snprintf(buf, sizeof(buf), "menu_animate: off");
2182 }
2183 else
2184 {
2185- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2186+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2187 }
2188 }
2189 else if (!strcmp(word1, "waves"))
2190@@ -3402,13 +3402,13 @@
2191 else if (!strcmp(word2, "?"))
2192 {
2193 if (FX_IsOn("waves"))
2194- Esnprintf(buf, sizeof(buf), "waves: on");
2195+ snprintf(buf, sizeof(buf), "waves: on");
2196 else
2197- Esnprintf(buf, sizeof(buf), "waves: off");
2198+ snprintf(buf, sizeof(buf), "waves: off");
2199 }
2200 else
2201 {
2202- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2203+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2204 }
2205 }
2206 else if (!strcmp(word1, "animate_win_shading"))
2207@@ -3425,13 +3425,13 @@
2208 else if (!strcmp(word2, "?"))
2209 {
2210 if (mode.animate_shading)
2211- Esnprintf(buf, sizeof(buf), "animate_win_shading: on");
2212+ snprintf(buf, sizeof(buf), "animate_win_shading: on");
2213 else
2214- Esnprintf(buf, sizeof(buf), "animate_win_shading: off");
2215+ snprintf(buf, sizeof(buf), "animate_win_shading: off");
2216 }
2217 else
2218 {
2219- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2220+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2221 }
2222 }
2223 else if (!strcmp(word1, "window_shade_speed"))
2224@@ -3441,12 +3441,12 @@
2225 {
2226 if (mode.animate_shading)
2227 {
2228- Esnprintf(buf, sizeof(buf), "shadespeed: %d seconds",
2229+ snprintf(buf, sizeof(buf), "shadespeed: %d seconds",
2230 mode.shadespeed);
2231 }
2232 else
2233 {
2234- Esnprintf(buf, sizeof(buf), "shadespeed: off");
2235+ snprintf(buf, sizeof(buf), "shadespeed: off");
2236 }
2237 }
2238 else
2239@@ -3501,29 +3501,29 @@
2240 {
2241 if (desks.dragdir == 1)
2242 {
2243- Esnprintf(buf, sizeof(buf), "Dragbar: right");
2244+ snprintf(buf, sizeof(buf), "Dragbar: right");
2245 }
2246 else if (desks.dragdir == 2)
2247 {
2248- Esnprintf(buf, sizeof(buf), "Dragbar: top");
2249+ snprintf(buf, sizeof(buf), "Dragbar: top");
2250 }
2251 else if (desks.dragdir == 3)
2252 {
2253- Esnprintf(buf, sizeof(buf), "Dragbar: bottom");
2254+ snprintf(buf, sizeof(buf), "Dragbar: bottom");
2255 }
2256 else
2257 {
2258- Esnprintf(buf, sizeof(buf), "Dragbar: left");
2259+ snprintf(buf, sizeof(buf), "Dragbar: left");
2260 }
2261 }
2262 else
2263 {
2264- Esnprintf(buf, sizeof(buf), "Dragbar: off");
2265+ snprintf(buf, sizeof(buf), "Dragbar: off");
2266 }
2267 }
2268 else
2269 {
2270- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2271+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2272 }
2273
2274 if (move)
2275@@ -3564,12 +3564,12 @@
2276 {
2277 if (mode.tooltips)
2278 {
2279- Esnprintf(buf, sizeof(buf), "tooltips: %f seconds",
2280+ snprintf(buf, sizeof(buf), "tooltips: %f seconds",
2281 mode.tiptime);
2282 }
2283 else
2284 {
2285- Esnprintf(buf, sizeof(buf), "tooltips: off");
2286+ snprintf(buf, sizeof(buf), "tooltips: off");
2287 }
2288 }
2289 else
2290@@ -3594,13 +3594,13 @@
2291 {
2292 if (mode.edge_flip_resistance >= 0)
2293 {
2294- Esnprintf(buf, sizeof(buf),
2295+ snprintf(buf, sizeof(buf),
2296 "edge_resistance: %d / 100 seconds",
2297 mode.edge_flip_resistance);
2298 }
2299 else
2300 {
2301- Esnprintf(buf, sizeof(buf), "edge_resistance: off");
2302+ snprintf(buf, sizeof(buf), "edge_resistance: off");
2303 }
2304 }
2305 else
2306@@ -3610,7 +3610,7 @@
2307 }
2308 else
2309 {
2310- Esnprintf(buf, sizeof(buf), "Error: no time given");
2311+ snprintf(buf, sizeof(buf), "Error: no time given");
2312 }
2313 }
2314 else if (!strcmp(word1, "edge_snap_distance"))
2315@@ -3620,7 +3620,7 @@
2316 {
2317 if (!strcmp(word2, "?"))
2318 {
2319- Esnprintf(buf, sizeof(buf), "edge_snap_distance: %d",
2320+ snprintf(buf, sizeof(buf), "edge_snap_distance: %d",
2321 mode.edge_snap_dist);
2322 }
2323 else
2324@@ -3630,7 +3630,7 @@
2325 }
2326 else
2327 {
2328- Esnprintf(buf, sizeof(buf), "Error: no pixel distance given");
2329+ snprintf(buf, sizeof(buf), "Error: no pixel distance given");
2330 }
2331 }
2332 else if (!strcmp(word1, "autoraise"))
2333@@ -3648,12 +3648,12 @@
2334 {
2335 if (mode.autoraise)
2336 {
2337- Esnprintf(buf, sizeof(buf), "autoraise: %f seconds",
2338+ snprintf(buf, sizeof(buf), "autoraise: %f seconds",
2339 mode.autoraisetime);
2340 }
2341 else
2342 {
2343- Esnprintf(buf, sizeof(buf), "autoraise: off");
2344+ snprintf(buf, sizeof(buf), "autoraise: off");
2345 }
2346 }
2347 else
2348@@ -3705,23 +3705,23 @@
2349 else if (!strcmp(word2, "?"))
2350 {
2351 if (mode.sound)
2352- Esnprintf(buf, sizeof(buf), "audio: on");
2353+ snprintf(buf, sizeof(buf), "audio: on");
2354 else
2355- Esnprintf(buf, sizeof(buf), "audio: off");
2356+ snprintf(buf, sizeof(buf), "audio: off");
2357 }
2358 else
2359 {
2360- Esnprintf(buf, sizeof(buf), "Error: unknown mode specified");
2361+ snprintf(buf, sizeof(buf), "Error: unknown mode specified");
2362 }
2363 }
2364 else
2365 {
2366- Esnprintf(buf, sizeof(buf), "Error: unknown effect specified");
2367+ snprintf(buf, sizeof(buf), "Error: unknown effect specified");
2368 }
2369 }
2370 else
2371 {
2372- Esnprintf(buf, sizeof(buf), "Error: no effect specified");
2373+ snprintf(buf, sizeof(buf), "Error: no effect specified");
2374 }
2375
2376 if (buf[0])
2377@@ -3761,25 +3761,25 @@
2378 {
2379 if (mode.activenetwork)
2380 {
2381- Esnprintf(buf, sizeof(buf), "Active network: on");
2382+ snprintf(buf, sizeof(buf), "Active network: on");
2383 }
2384 else
2385 {
2386- Esnprintf(buf, sizeof(buf), "Active network: off");
2387+ snprintf(buf, sizeof(buf), "Active network: off");
2388 }
2389 }
2390 else
2391 {
2392- Esnprintf(buf, sizeof(buf), "Error: unknown state.");
2393+ snprintf(buf, sizeof(buf), "Error: unknown state.");
2394 }
2395 }
2396 #else
2397- Esnprintf(buf, sizeof(buf),
2398+ snprintf(buf, sizeof(buf),
2399 "Active Network not compiled into this version of E");
2400 #endif
2401 }
2402 else
2403- Esnprintf(buf, sizeof(buf), "Error: no state specified");
2404+ snprintf(buf, sizeof(buf), "Error: no state specified");
2405
2406 if (buf[0])
2407 CommsSend(c, buf);
2408@@ -3820,7 +3820,7 @@
2409 lst[i]->client.title = none;
2410 if (params)
2411 {
2412- Esnprintf(buf, sizeof(buf),
2413+ snprintf(buf, sizeof(buf),
2414 "%8x : %s :: %d : %d %d : %d %d\n",
2415 lst[i]->client.win, lst[i]->client.title,
2416 lst[i]->desktop, lst[i]->area_x, lst[i]->area_y,
2417@@ -3828,7 +3828,7 @@
2418 }
2419 else
2420 {
2421- Esnprintf(buf, sizeof(buf), "%8x : %s\n", lst[i]->client.win,
2422+ snprintf(buf, sizeof(buf), "%8x : %s\n", lst[i]->client.win,
2423 lst[i]->client.title);
2424 }
2425 if (!ret)
2426@@ -3871,7 +3871,7 @@
2427
2428 if (!params)
2429 {
2430- Esnprintf(buf, sizeof(buf), "Error: no area specified");
2431+ snprintf(buf, sizeof(buf), "Error: no area specified");
2432 }
2433 else
2434 {
2435@@ -3919,7 +3919,7 @@
2436 else if (!strcmp(param1, "?"))
2437 {
2438 GetCurrentArea(&a, &b);
2439- Esnprintf(buf, sizeof(buf), "Current Area: %d %d", a, b);
2440+ snprintf(buf, sizeof(buf), "Current Area: %d %d", a, b);
2441 }
2442 else
2443 {
2444@@ -3975,7 +3975,7 @@
2445 word(params, 2, operation);
2446 if (!operation[0])
2447 {
2448- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
2449+ snprintf(buf, sizeof(buf), "Error: no operation specified");
2450 }
2451 else
2452 {
2453@@ -3984,7 +3984,7 @@
2454 ewin = FindEwinByChildren(win);
2455 if (!ewin)
2456 {
2457- Esnprintf(buf, sizeof(buf), "Error: no such window: %8x",
2458+ snprintf(buf, sizeof(buf), "Error: no such window: %8x",
2459 win);
2460 }
2461 else
2462@@ -4021,15 +4021,15 @@
2463 else if (!strcmp(param1, "?"))
2464 {
2465 if (ewin->iconified)
2466- Esnprintf(buf, sizeof(buf),
2467+ snprintf(buf, sizeof(buf),
2468 "window iconified: yes");
2469 else
2470- Esnprintf(buf, sizeof(buf),
2471+ snprintf(buf, sizeof(buf),
2472 "window iconified: no");
2473 }
2474 else
2475 {
2476- Esnprintf(buf, sizeof(buf),
2477+ snprintf(buf, sizeof(buf),
2478 "Error: unknown mode specified");
2479 }
2480 }
2481@@ -4059,15 +4059,15 @@
2482 else if (!strcmp(param1, "?"))
2483 {
2484 if (ewin->shaded)
2485- Esnprintf(buf, sizeof(buf),
2486+ snprintf(buf, sizeof(buf),
2487 "window shaded: yes");
2488 else
2489- Esnprintf(buf, sizeof(buf),
2490+ snprintf(buf, sizeof(buf),
2491 "window shaded: no");
2492 }
2493 else
2494 {
2495- Esnprintf(buf, sizeof(buf),
2496+ snprintf(buf, sizeof(buf),
2497 "Error: unknown mode specified");
2498 }
2499 }
2500@@ -4097,15 +4097,15 @@
2501 else if (!strcmp(param1, "?"))
2502 {
2503 if (ewin->sticky)
2504- Esnprintf(buf, sizeof(buf),
2505+ snprintf(buf, sizeof(buf),
2506 "window sticky: yes");
2507 else
2508- Esnprintf(buf, sizeof(buf),
2509+ snprintf(buf, sizeof(buf),
2510 "window sticky: no");
2511 }
2512 else
2513 {
2514- Esnprintf(buf, sizeof(buf),
2515+ snprintf(buf, sizeof(buf),
2516 "Error: unknown mode specified");
2517 }
2518 }
2519@@ -4132,7 +4132,7 @@
2520 if (!strncmp(ptr, "?", 1))
2521 {
2522 /* return the window title */
2523- Esnprintf(buf, sizeof(buf),
2524+ snprintf(buf, sizeof(buf),
2525 "window title: %s",
2526 ewin->client.title);
2527 }
2528@@ -4155,7 +4155,7 @@
2529 else
2530 {
2531 /* error */
2532- Esnprintf(buf, sizeof(buf),
2533+ snprintf(buf, sizeof(buf),
2534 "Error: no title specified");
2535 }
2536 }
2537@@ -4203,7 +4203,7 @@
2538 {
2539 if (ewin->border->name)
2540 {
2541- Esnprintf(buf, sizeof(buf),
2542+ snprintf(buf, sizeof(buf),
2543 "window border: %s",
2544 ewin->border->name);
2545 }
2546@@ -4228,7 +4228,7 @@
2547 }
2548 else
2549 {
2550- Esnprintf(buf, sizeof(buf),
2551+ snprintf(buf, sizeof(buf),
2552 "Error: no border specified");
2553 }
2554 }
2555@@ -4255,7 +4255,7 @@
2556 }
2557 else if (!strcmp(param1, "?"))
2558 {
2559- Esnprintf(buf, sizeof(buf), "window desk: %d",
2560+ snprintf(buf, sizeof(buf), "window desk: %d",
2561 ewin->desktop);
2562 }
2563 else
2564@@ -4269,7 +4269,7 @@
2565 }
2566 else
2567 {
2568- Esnprintf(buf, sizeof(buf),
2569+ snprintf(buf, sizeof(buf),
2570 "Error: no desktop supplied");
2571 }
2572 }
2573@@ -4282,7 +4282,7 @@
2574 {
2575 if (!strcmp(param1, "?"))
2576 {
2577- Esnprintf(buf, sizeof(buf),
2578+ snprintf(buf, sizeof(buf),
2579 "window area: %d %d", ewin->area_x,
2580 ewin->area_y);
2581 }
2582@@ -4294,7 +4294,7 @@
2583 }
2584 else
2585 {
2586- Esnprintf(buf, sizeof(buf),
2587+ snprintf(buf, sizeof(buf),
2588 "Error: no area supplied");
2589 }
2590 }
2591@@ -4315,13 +4315,13 @@
2592 {
2593 if (!strcmp(param1, "?"))
2594 {
2595- Esnprintf(buf, sizeof(buf),
2596+ snprintf(buf, sizeof(buf),
2597 "window location: %d %d", ewin->x,
2598 ewin->y);
2599 }
2600 else if (!strcmp(param1, "??"))
2601 {
2602- Esnprintf(buf, sizeof(buf),
2603+ snprintf(buf, sizeof(buf),
2604 "client location: %d %d",
2605 ewin->x + ewin->border->border.left,
2606 ewin->y + ewin->border->border.top);
2607@@ -4335,7 +4335,7 @@
2608 }
2609 else
2610 {
2611- Esnprintf(buf, sizeof(buf),
2612+ snprintf(buf, sizeof(buf),
2613 "Error: no coords supplied");
2614 }
2615 }
2616@@ -4348,13 +4348,13 @@
2617 {
2618 if (!strcmp(param1, "?"))
2619 {
2620- Esnprintf(buf, sizeof(buf),
2621+ snprintf(buf, sizeof(buf),
2622 "window size: %d %d", ewin->client.w,
2623 ewin->client.h);
2624 }
2625 else if (!strcmp(param1, "??"))
2626 {
2627- Esnprintf(buf, sizeof(buf),
2628+ snprintf(buf, sizeof(buf),
2629 "frame size: %d %d", ewin->w,
2630 ewin->h);
2631 }
2632@@ -4399,11 +4399,11 @@
2633 {
2634 if (ewin == GetFocusEwin())
2635 {
2636- Esnprintf(buf, sizeof(buf), "focused: yes");
2637+ snprintf(buf, sizeof(buf), "focused: yes");
2638 }
2639 else
2640 {
2641- Esnprintf(buf, sizeof(buf), "focused: no");
2642+ snprintf(buf, sizeof(buf), "focused: no");
2643 }
2644 }
2645 else
2646@@ -4413,14 +4413,14 @@
2647 }
2648 else
2649 {
2650- Esnprintf(buf, sizeof(buf), "Error: unknown operation");
2651+ snprintf(buf, sizeof(buf), "Error: unknown operation");
2652 }
2653 }
2654 }
2655 }
2656 else
2657 {
2658- Esnprintf(buf, sizeof(buf), "Error: no window specified");
2659+ snprintf(buf, sizeof(buf), "Error: no window specified");
2660 }
2661
2662 if (buf[0])
2663@@ -4444,7 +4444,7 @@
2664 int ax, ay;
2665
2666 GetAreaSize(&ax, &ay);
2667- Esnprintf(buf, sizeof(buf), "Number of Areas: %d %d", ax, ay);
2668+ snprintf(buf, sizeof(buf), "Number of Areas: %d %d", ax, ay);
2669 }
2670 else
2671 {
2672@@ -4457,7 +4457,7 @@
2673 }
2674 else
2675 {
2676- Esnprintf(buf, sizeof(buf), "Error: number of areas not given");
2677+ snprintf(buf, sizeof(buf), "Error: number of areas not given");
2678 }
2679
2680 if (buf[0])
2681@@ -4478,7 +4478,7 @@
2682 {
2683 if (!strcmp(params, "?"))
2684 {
2685- Esnprintf(buf, sizeof(buf), "Number of Desks: %d",
2686+ snprintf(buf, sizeof(buf), "Number of Desks: %d",
2687 mode.numdesktops);
2688 }
2689 else
2690@@ -4488,7 +4488,7 @@
2691 }
2692 else
2693 {
2694- Esnprintf(buf, sizeof(buf), "Error: number of desks not given");
2695+ snprintf(buf, sizeof(buf), "Error: number of desks not given");
2696 }
2697
2698 if (buf[0])
2699@@ -4527,7 +4527,7 @@
2700 }
2701 else if (!strcmp(params, "?"))
2702 {
2703- Esnprintf(buf, sizeof(buf), "Focus Mode: ");
2704+ snprintf(buf, sizeof(buf), "Focus Mode: ");
2705 if (mode.focusmode == 2)
2706 {
2707 if (mode.click_focus_grabbed)
2708@@ -4554,12 +4554,12 @@
2709 }
2710 else
2711 {
2712- Esnprintf(buf, sizeof(buf), "Error: unknown focus type");
2713+ snprintf(buf, sizeof(buf), "Error: unknown focus type");
2714 }
2715 }
2716 else
2717 {
2718- Esnprintf(buf, sizeof(buf), "Error: no focus type given");
2719+ snprintf(buf, sizeof(buf), "Error: no focus type given");
2720 }
2721
2722 if (buf[0])
2723@@ -4590,7 +4590,7 @@
2724 }
2725 else if (!strcmp(params, "?"))
2726 {
2727- Esnprintf(buf, sizeof(buf), "Icons: ");
2728+ snprintf(buf, sizeof(buf), "Icons: ");
2729 if (mode.showicons)
2730 strcat(buf, "on");
2731 else
2732@@ -4598,13 +4598,13 @@
2733 }
2734 else
2735 {
2736- Esnprintf(buf, sizeof(buf), "Error: unknown icon statee: %s",
2737+ snprintf(buf, sizeof(buf), "Error: unknown icon statee: %s",
2738 params);
2739 }
2740 }
2741 else
2742 {
2743- Esnprintf(buf, sizeof(buf), "Error: no icon state specified");
2744+ snprintf(buf, sizeof(buf), "Error: no icon state specified");
2745 }
2746
2747 if (buf[0])
2748@@ -4622,7 +4622,7 @@
2749 buf[0] = 0;
2750 if (!params)
2751 {
2752- Esnprintf(buf, sizeof(buf), "Error: no desktop selected");
2753+ snprintf(buf, sizeof(buf), "Error: no desktop selected");
2754 }
2755 else
2756 {
2757@@ -4636,7 +4636,7 @@
2758 }
2759 else if (!strcmp(params, "?"))
2760 {
2761- Esnprintf(buf, sizeof(buf), "Current Desktop: %d", desks.current);
2762+ snprintf(buf, sizeof(buf), "Current Desktop: %d", desks.current);
2763 }
2764 else
2765 {
2766@@ -4703,7 +4703,7 @@
2767 {
2768 if (!strcmp(params, "?"))
2769 {
2770- Esnprintf(buf, sizeof(buf), GetSMFile());
2771+ snprintf(buf, sizeof(buf), GetSMFile());
2772 }
2773 else
2774 {
2775@@ -4712,7 +4712,7 @@
2776 }
2777 else
2778 {
2779- Esnprintf(buf, sizeof(buf), "Error: no file prefix specified");
2780+ snprintf(buf, sizeof(buf), "Error: no file prefix specified");
2781 }
2782
2783 if (buf[0])
2784@@ -4757,13 +4757,13 @@
2785
2786 if (params)
2787 {
2788- Esnprintf(buf, sizeof(buf), "restart_wm %s", params);
2789+ snprintf(buf, sizeof(buf), "restart_wm %s", params);
2790 params = NULL;
2791 doExit(buf);
2792 }
2793 else
2794 {
2795- Esnprintf(buf, sizeof(buf), "Error: no window manager specified");
2796+ snprintf(buf, sizeof(buf), "Error: no window manager specified");
2797 CommsSend(c, buf);
2798 }
2799
2800@@ -4779,13 +4779,13 @@
2801
2802 if (params)
2803 {
2804- Esnprintf(buf, sizeof(buf), "restart_theme %s", params);
2805+ snprintf(buf, sizeof(buf), "restart_theme %s", params);
2806 params = NULL;
2807 doExit(buf);
2808 }
2809 else
2810 {
2811- Esnprintf(buf, sizeof(buf), "Error: no theme specified");
2812+ snprintf(buf, sizeof(buf), "Error: no theme specified");
2813 CommsSend(c, buf);
2814 }
2815 return;
2816@@ -4818,7 +4818,7 @@
2817
2818 if (!strcmp(params, "?"))
2819 {
2820- Esnprintf(buf, sizeof(buf), "%s", GetDefaultTheme());
2821+ snprintf(buf, sizeof(buf), "%s", GetDefaultTheme());
2822 }
2823 else
2824 {
2825@@ -4827,13 +4827,13 @@
2826 char restartcommand[FILEPATH_LEN_MAX];
2827
2828 SetDefaultTheme(params);
2829- Esnprintf(restartcommand, sizeof(restartcommand),
2830+ snprintf(restartcommand, sizeof(restartcommand),
2831 "restart_theme %s", params);
2832 doExit(restartcommand);
2833 }
2834 else
2835 {
2836- Esnprintf(buf, sizeof(buf), "Could not find theme: %s",
2837+ snprintf(buf, sizeof(buf), "Could not find theme: %s",
2838 GetDefaultTheme());
2839 }
2840 }
2841@@ -4853,7 +4853,7 @@
2842
2843 buf[0] = 0;
2844
2845- Esnprintf(buf, sizeof(buf), themepath);
2846+ snprintf(buf, sizeof(buf), themepath);
2847
2848 if (buf[0])
2849 CommsSend(c, buf);
2850@@ -4875,9 +4875,9 @@
2851 if (!strcmp(params, "?"))
2852 {
2853 if (mode.autosave)
2854- Esnprintf(buf, sizeof(buf), "Autosave : on");
2855+ snprintf(buf, sizeof(buf), "Autosave : on");
2856 else
2857- Esnprintf(buf, sizeof(buf), "Autosave : off");
2858+ snprintf(buf, sizeof(buf), "Autosave : off");
2859 }
2860 else if (!strcmp(params, "on"))
2861 {
2862@@ -4889,7 +4889,7 @@
2863 }
2864 else
2865 {
2866- Esnprintf(buf, sizeof(buf), "Unknown autosave state: %s", params);
2867+ snprintf(buf, sizeof(buf), "Unknown autosave state: %s", params);
2868 }
2869 if (buf[0])
2870 CommsSend(c, buf);
2871@@ -4911,7 +4911,7 @@
2872 buf[0] = 0;
2873 buf2[0] = 0;
2874 numIPC = sizeof(IPCArray) / sizeof(IPCStruct);
2875- Esnprintf(buf, sizeof(buf), _("Enlightenment IPC Commands Help"));
2876+ snprintf(buf, sizeof(buf), _("Enlightenment IPC Commands Help"));
2877
2878 if (!params)
2879 {
2880@@ -5004,7 +5004,7 @@
2881 char buf[FILEPATH_LEN_MAX];
2882
2883 params = NULL;
2884- Esnprintf(buf, sizeof(buf),
2885+ snprintf(buf, sizeof(buf),
2886 "Copyright (C) 2000 Carsten Haitzler and Geoff Harrison,\n"
2887 "with various contributors (Isaac Richards, Sung-Hyun Nam, "
2888 "Kimball Thurston,\n"
2889@@ -5063,7 +5063,7 @@
2890
2891 buf[0] = 0;
2892
2893- Esnprintf(buf, sizeof(buf),
2894+ snprintf(buf, sizeof(buf),
2895 _("Enlightenment Version : %s\n" "code is current to : %s\n"),
2896 ENLIGHTENMENT_VERSION, E_CHECKOUT_DATE);
2897
2898@@ -5209,7 +5209,7 @@
2899
2900 if (!group)
2901 {
2902- Esnprintf(buf, sizeof(buf), "Error: no such group: %d", index);
2903+ snprintf(buf, sizeof(buf), "Error: no such group: %d", index);
2904 CommsSend(c, buf);
2905 return;
2906 }
2907@@ -5217,7 +5217,7 @@
2908
2909 if (!groups)
2910 {
2911- Esnprintf(buf, sizeof(buf), "Error: no memory");
2912+ snprintf(buf, sizeof(buf), "Error: no memory");
2913 CommsSend(c, buf);
2914 return;
2915 }
2916@@ -5228,20 +5228,20 @@
2917 {
2918 groups = (Group **) ListItemType(&num_groups, LIST_TYPE_GROUP);
2919
2920- Esnprintf(buf, sizeof(buf), "Number of groups: %d", num_groups);
2921+ snprintf(buf, sizeof(buf), "Number of groups: %d", num_groups);
2922 }
2923
2924 for (i = 0; i < num_groups; i++)
2925 {
2926 for (j = 0; j < groups[i]->num_members; j++)
2927 {
2928- Esnprintf(tmp, sizeof(tmp), "%d", groups[i]->index);
2929+ snprintf(tmp, sizeof(tmp), "%d", groups[i]->index);
2930 strcat(buf, tmp);
2931 strcat(buf, ": ");
2932 strcat(buf, groups[i]->members[j]->client.title);
2933 strcat(buf, "\n");
2934 }
2935- Esnprintf(buf2, sizeof(buf2),
2936+ snprintf(buf2, sizeof(buf2),
2937 " index: %d\n" " num_members: %d\n"
2938 " iconify: %d\n" " kill: %d\n"
2939 " move: %d\n" " raise: %d\n"
2940@@ -5291,7 +5291,7 @@
2941
2942 if (!operation[0])
2943 {
2944- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
2945+ snprintf(buf, sizeof(buf), "Error: no operation specified");
2946 }
2947 else
2948 {
2949@@ -5300,7 +5300,7 @@
2950 ewin = FindEwinByChildren(win);
2951 if (!ewin)
2952 {
2953- Esnprintf(buf, sizeof(buf), "Error: no such window: %8x",
2954+ snprintf(buf, sizeof(buf), "Error: no such window: %8x",
2955 win);
2956 }
2957 else
2958@@ -5308,7 +5308,7 @@
2959 if (!strcmp(operation, "start"))
2960 {
2961 BuildWindowGroup(&ewin, 1);
2962- Esnprintf(buf, sizeof(buf), "start %8x", win);
2963+ snprintf(buf, sizeof(buf), "start %8x", win);
2964 }
2965 else if (!strcmp(operation, "add"))
2966 {
2967@@ -5323,7 +5323,7 @@
2968 LIST_TYPE_GROUP);
2969 }
2970 AddEwinToGroup(ewin, group);
2971- Esnprintf(buf, sizeof(buf), "add %8x", win);
2972+ snprintf(buf, sizeof(buf), "add %8x", win);
2973 }
2974 else if (!strcmp(operation, "remove"))
2975 {
2976@@ -5338,7 +5338,7 @@
2977 LIST_TYPE_GROUP);
2978 }
2979 RemoveEwinFromGroup(ewin, group);
2980- Esnprintf(buf, sizeof(buf), "remove %8x", win);
2981+ snprintf(buf, sizeof(buf), "remove %8x", win);
2982 }
2983 else if (!strcmp(operation, "break"))
2984 {
2985@@ -5353,16 +5353,16 @@
2986 LIST_TYPE_GROUP);
2987 }
2988 BreakWindowGroup(ewin, group);
2989- Esnprintf(buf, sizeof(buf), "break %8x", win);
2990+ snprintf(buf, sizeof(buf), "break %8x", win);
2991 }
2992 else if (!strcmp(operation, "showhide"))
2993 {
2994 doShowHideGroup(windowid);
2995- Esnprintf(buf, sizeof(buf), "showhide %8x", win);
2996+ snprintf(buf, sizeof(buf), "showhide %8x", win);
2997 }
2998 else
2999 {
3000- Esnprintf(buf, sizeof(buf),
3001+ snprintf(buf, sizeof(buf),
3002 "Error: no such operation: %s", operation);
3003
3004 }
3005@@ -5371,7 +5371,7 @@
3006 }
3007 else
3008 {
3009- Esnprintf(buf, sizeof(buf), "Error: no window specified");
3010+ snprintf(buf, sizeof(buf), "Error: no window specified");
3011 }
3012
3013 if (buf)
3014@@ -5405,7 +5405,7 @@
3015
3016 if (!operation[0])
3017 {
3018- Esnprintf(buf, sizeof(buf), "Error: no operation specified");
3019+ snprintf(buf, sizeof(buf), "Error: no operation specified");
3020 }
3021 else
3022 {
3023@@ -5416,7 +5416,7 @@
3024
3025 if (!group)
3026 {
3027- Esnprintf(buf, sizeof(buf), "Error: no such group: %d",
3028+ snprintf(buf, sizeof(buf), "Error: no such group: %d",
3029 index);
3030 }
3031 else
3032@@ -5431,12 +5431,12 @@
3033
3034 if (onoff == -1 && strcmp(param1, "?"))
3035 {
3036- Esnprintf(buf, sizeof(buf),
3037+ snprintf(buf, sizeof(buf),
3038 "Error: unknown mode specified");
3039 }
3040 else if (!strcmp(operation, "num_members"))
3041 {
3042- Esnprintf(buf, sizeof(buf), "num_members: %d",
3043+ snprintf(buf, sizeof(buf), "num_members: %d",
3044 group->num_members);
3045 onoff = -1;
3046 }
3047@@ -5498,7 +5498,7 @@
3048 }
3049 else
3050 {
3051- Esnprintf(buf, sizeof(buf),
3052+ snprintf(buf, sizeof(buf),
3053 "Error: no such operation: %s",
3054 operation);
3055 onoff = -1;
3056@@ -5506,19 +5506,19 @@
3057 }
3058 else
3059 {
3060- Esnprintf(buf, sizeof(buf), "Error: no mode specified");
3061+ snprintf(buf, sizeof(buf), "Error: no mode specified");
3062 }
3063 }
3064
3065 if (onoff == 1)
3066- Esnprintf(buf, sizeof(buf), "%s: on", operation);
3067+ snprintf(buf, sizeof(buf), "%s: on", operation);
3068 else if (onoff == 0)
3069- Esnprintf(buf, sizeof(buf), "%s: off", operation);
3070+ snprintf(buf, sizeof(buf), "%s: off", operation);
3071 }
3072 }
3073 else
3074 {
3075- Esnprintf(buf, sizeof(buf), "Error: no group specified");
3076+ snprintf(buf, sizeof(buf), "Error: no group specified");
3077 }
3078
3079 if (buf)
3080@@ -5564,7 +5564,7 @@
3081 lst = (Snapshot **) ListItemType(&num, LIST_TYPE_SNAPSHOT);
3082 if (!num)
3083 {
3084- Esnprintf(buf, sizeof(buf), "Error: no remembered windows\n");
3085+ snprintf(buf, sizeof(buf), "Error: no remembered windows\n");
3086 }
3087 else
3088 {
3089@@ -5575,7 +5575,7 @@
3090 if (!lst[i] || (lst[i] && !lst[i]->used))
3091 j++;
3092 }
3093- Esnprintf(buf, sizeof(buf), "Number of remembered windows: %d\n",
3094+ snprintf(buf, sizeof(buf), "Number of remembered windows: %d\n",
3095 num - j);
3096 }
3097 /* strncat(buf, buf2, sizeof(buf)); */
3098@@ -5585,12 +5585,12 @@
3099 {
3100 if (!f)
3101 {
3102- Esnprintf(buf2, sizeof(buf2), "%s\n",
3103+ snprintf(buf2, sizeof(buf2), "%s\n",
3104 lst[i]->name ? lst[i]->name : nstr);
3105 }
3106 else
3107 {
3108- Esnprintf(buf2, sizeof(buf2),
3109+ snprintf(buf2, sizeof(buf2),
3110 " Name: %s\n"
3111 " Window Title: %s\n"
3112 " Window Name: %s\n"
3113diff -Nru enlightenment-0.16.5/src/kde.c enlightenment-0.16.5.new/src/kde.c
3114--- enlightenment-0.16.5/src/kde.c Wed Jul 26 20:00:47 2000
3115+++ enlightenment-0.16.5.new/src/kde.c Fri Jul 20 05:26:31 2001
3116@@ -1208,12 +1208,12 @@
3117
3118 if (!KDE_DESKTOP_NAME[i])
3119 {
3120- Esnprintf(s, sizeof(s), "KWM_DESKTOP_NAME_%d", i + 1);
3121+ snprintf(s, sizeof(s), "KWM_DESKTOP_NAME_%d", i + 1);
3122 KDE_DESKTOP_NAME[i] = XInternAtom(disp, s, False);
3123 }
3124 if (!getSimpleHint(root.win, KDE_DESKTOP_NAME[i]))
3125 {
3126- Esnprintf(s, sizeof(s), "Desk %d", i);
3127+ snprintf(s, sizeof(s), "Desk %d", i);
3128 XChangeProperty(disp, root.win, KDE_DESKTOP_NAME[i], XA_STRING, 8,
3129 PropModeReplace, (unsigned char *)s,
3130 strlen(s) + 1);
3131@@ -1249,7 +1249,7 @@
3132
3133 if (!KDE_DESKTOP_WINDOW_REGION[i])
3134 {
3135- Esnprintf(s, sizeof(s), "KWM_WINDOW_REGION_%d", i + 1);
3136+ snprintf(s, sizeof(s), "KWM_WINDOW_REGION_%d", i + 1);
3137 KDE_DESKTOP_WINDOW_REGION[i] = XInternAtom(disp, s, False);
3138 }
3139 if (a == KDE_DESKTOP_WINDOW_REGION[i])
3140@@ -1276,7 +1276,7 @@
3141 }
3142 if (i == 1)
3143 {
3144- /* Esnprintf(s, sizeof(s), "region %d changed to area:\n"
3145+ /* snprintf(s, sizeof(s), "region %d changed to area:\n"
3146 * "X %d to %d\nY to %d to %d\n", i + 1, data[0], data[2],
3147 * data[1], data[3]);
3148 * DIALOG_OK("kde hint",s); */
3149diff -Nru enlightenment-0.16.5/src/main.c enlightenment-0.16.5.new/src/main.c
3150--- enlightenment-0.16.5/src/main.c Fri Jul 28 19:23:35 2000
3151+++ enlightenment-0.16.5.new/src/main.c Fri Jul 20 05:26:34 2001
3152@@ -33,7 +33,7 @@
3153 if (fork())
3154 EDBUG_RETURN_;
3155
3156- Esnprintf(file, sizeof(file), "exec %s/dox %s/E-docs", ENLIGHTENMENT_BIN,
3157+ snprintf(file, sizeof(file), "exec %s/dox %s/E-docs", ENLIGHTENMENT_BIN,
3158 ENLIGHTENMENT_ROOT);
3159 execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file, NULL);
3160 exit(0);
3161@@ -114,7 +114,7 @@
3162 {
3163 if ((!strcmp("-theme", argv[j])) && (argc - j > 1))
3164 {
3165- Esnprintf(themepath, sizeof(themepath), "%s", argv[++j]);
3166+ snprintf(themepath, sizeof(themepath), "%s", argv[++j]);
3167 }
3168 else if ((!strcmp("-econfdir", argv[j])) && (argc - j > 1))
3169 {
3170@@ -210,7 +210,7 @@
3171 s[0] = 0;
3172 fclose(f);
3173 if (s[0])
3174- Esnprintf(themepath, sizeof(themepath), "%s", s);
3175+ snprintf(themepath, sizeof(themepath), "%s", s);
3176 }
3177 Efree(file);
3178 }
3179@@ -222,7 +222,7 @@
3180 def = GetDefaultTheme();
3181 if (def)
3182 {
3183- Esnprintf(themepath, sizeof(themepath), "%s", def);
3184+ snprintf(themepath, sizeof(themepath), "%s", def);
3185 Efree(def);
3186 }
3187 }
3188diff -Nru enlightenment-0.16.5/src/menus.c enlightenment-0.16.5.new/src/menus.c
3189--- enlightenment-0.16.5/src/menus.c Fri Jul 28 19:23:35 2000
3190+++ enlightenment-0.16.5.new/src/menus.c Fri Jul 20 05:28:20 2001
3191@@ -606,7 +606,7 @@
3192 if (m->win)
3193 EDestroyWindow(disp, m->win);
3194
3195- Esnprintf(s, sizeof(s), "__.%s", m->name);
3196+ snprintf(s, sizeof(s), "__.%s", m->name);
3197 RemoveTimerEvent(s);
3198 RemoveItem((char *)m, m->win, LIST_FINDBY_POINTER, LIST_TYPE_MENU);
3199 if (m->name)
3200@@ -1102,7 +1102,7 @@
3201 cc = st.st_mtime;
3202 else
3203 cc = st.st_ctime;
3204- Esnprintf(cs, sizeof(cs),
3205+ snprintf(cs, sizeof(cs),
3206 "%s/cached/img/.%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
3207 UserCacheDir(), chmap[(aa >> 0) & 0x3f],
3208 chmap[(aa >> 6) & 0x3f], chmap[(aa >> 12) & 0x3f],
3209@@ -1141,7 +1141,7 @@
3210 ImlibImage *im;
3211
3212 word(s, 2, s2);
3213- Esnprintf(ss, sizeof(ss), "%s/%s", dir, s2);
3214+ snprintf(ss, sizeof(ss), "%s/%s", dir, s2);
3215 im = Imlib_load_image(id, ss);
3216 if (im)
3217 {
3218@@ -1155,7 +1155,7 @@
3219 int maxw = 48, maxh = 48;
3220 int justx = 512, justy = 512;
3221
3222- Esnprintf(s2, sizeof(s2), "%s/cached/img/%s",
3223+ snprintf(s2, sizeof(s2), "%s/cached/img/%s",
3224 UserCacheDir(), s3);
3225 width = im->rgb_width;
3226 height = im->rgb_height;
3227@@ -1242,7 +1242,7 @@
3228 ic = CreateIclass();
3229 ic->name = duplicate("`");
3230 ic->norm.normal = CreateImageState();
3231- Esnprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
3232+ snprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
3233 UserCacheDir(), s3);
3234 ic->norm.normal->im_file = duplicate(stmp);
3235 ic->norm.normal->unloadable = 1;
3236@@ -1257,7 +1257,7 @@
3237 else if (!strcmp(ss, "EXE"))
3238 {
3239 word(s, 2, ss);
3240- Esnprintf(s, sizeof(s), "%s/%s", dir, ss);
3241+ snprintf(s, sizeof(s), "%s/%s", dir, ss);
3242 mi = CreateMenuItem(NULL, NULL, ACTION_EXEC, s, NULL);
3243 AddItemToMenu(m, mi);
3244 }
3245@@ -1266,8 +1266,8 @@
3246 char tmp[4096];
3247
3248 word(s, 2, tmp);
3249- Esnprintf(s, sizeof(s), "%s/%s:%s", dir, tmp, name);
3250- Esnprintf(ss, sizeof(ss), "%s/%s", dir, tmp);
3251+ snprintf(s, sizeof(s), "%s/%s:%s", dir, tmp, name);
3252+ snprintf(ss, sizeof(ss), "%s/%s", dir, tmp);
3253 mm = CreateMenuFromDirectory(s, ms, ss);
3254 mm->parent = m;
3255 AddItem(mm, mm->name, mm->win, LIST_TYPE_MENU);
3256@@ -1280,7 +1280,7 @@
3257 }
3258 }
3259 list = ls(dir, &num);
3260- Esnprintf(s, sizeof(s), "Scanning %s", dir);
3261+ snprintf(s, sizeof(s), "Scanning %s", dir);
3262 if (!init_win_ext)
3263 p = CreateProgressbar(s, 600, 16);
3264 if (p)
3265@@ -1290,15 +1290,15 @@
3266 {
3267 if (p)
3268 SetProgressbar(p, (i * 100) / num);
3269- Esnprintf(ss, sizeof(ss), "%s/%s", dir, list[i]);
3270+ snprintf(ss, sizeof(ss), "%s/%s", dir, list[i]);
3271 /* skip "dot" files and dirs - senisble */
3272 if ((*(list[i]) != '.') && (stat(ss, &st) >= 0))
3273 {
3274 ext = FileExtension(ss);
3275 if (S_ISDIR(st.st_mode))
3276 {
3277- Esnprintf(s, sizeof(s), "%s/%s:%s", dir, list[i], name);
3278- Esnprintf(ss, sizeof(ss), "%s/%s", dir, list[i]);
3279+ snprintf(s, sizeof(s), "%s/%s:%s", dir, list[i], name);
3280+ snprintf(ss, sizeof(ss), "%s/%s", dir, list[i]);
3281 mm = CreateMenuFromDirectory(s, ms, ss);
3282 mm->parent = m;
3283 AddItem(mm, mm->name, mm->win, LIST_TYPE_MENU);
3284@@ -1351,7 +1351,7 @@
3285 cc = st.st_mtime;
3286 else
3287 cc = st.st_ctime;
3288- Esnprintf(s3, sizeof(s3),
3289+ snprintf(s3, sizeof(s3),
3290 ".%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
3291 chmap[(aa >> 0) & 0x3f], chmap[(aa >> 6) & 0x3f],
3292 chmap[(aa >> 12) & 0x3f], chmap[(aa >> 18) & 0x3f],
3293@@ -1380,7 +1380,7 @@
3294 int scr_asp, im_asp, w2, h2;
3295 int maxw = 48, maxh = 48;
3296
3297- Esnprintf(s2, sizeof(s2), "%s/cached/img/%s",
3298+ snprintf(s2, sizeof(s2), "%s/cached/img/%s",
3299 UserCacheDir(), s3);
3300 width = im->rgb_width;
3301 height = im->rgb_height;
3302@@ -1455,7 +1455,7 @@
3303 ic = CreateIclass();
3304 ic->name = duplicate("`");
3305 ic->norm.normal = CreateImageState();
3306- Esnprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
3307+ snprintf(stmp, sizeof(stmp), "%s/cached/img/%s",
3308 UserCacheDir(), s3);
3309 ic->norm.normal->im_file = duplicate(stmp);
3310 ic->norm.normal->unloadable = 1;
3311@@ -1509,7 +1509,7 @@
3312 FillFlatFileMenu(m, m->style, m->name, ff, m);
3313 m->data = ff;
3314 m->ref_menu = parent;
3315- Esnprintf(s, sizeof(s), "__.%s", m->name);
3316+ snprintf(s, sizeof(s), "__.%s", m->name);
3317 DoIn(s, 2.0, FileMenuUpdate, 0, m);
3318 calls--;
3319 EDBUG_RETURN(m);
3320@@ -1566,7 +1566,7 @@
3321 tmp = NULL;
3322 if (icon)
3323 {
3324- Esnprintf(wd, sizeof(wd), "__FM.%s", icon);
3325+ snprintf(wd, sizeof(wd), "__FM.%s", icon);
3326 icc =
3327 FindItem(wd, 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
3328 if (!icc)
3329@@ -1603,7 +1603,7 @@
3330 }
3331 else if ((act) && (!strcmp(act, "menu")) && (params))
3332 {
3333- Esnprintf(wd, sizeof(wd), "__FM.%s.%i", name, count);
3334+ snprintf(wd, sizeof(wd), "__FM.%s.%i", name, count);
3335 count++;
3336 mm = CreateMenuFromFlatFile(wd, ms, params, parent);
3337 if (mm)
3338@@ -1648,7 +1648,7 @@
3339 /* if the menu is up dont update */
3340 if (((mode.cur_menu_mode) || (clickmenu)) && (mode.cur_menu_depth > 0))
3341 {
3342- Esnprintf(s, sizeof(s), "__.%s", m->name);
3343+ snprintf(s, sizeof(s), "__.%s", m->name);
3344 DoIn(s, 2.0, FileMenuUpdate, 0, m);
3345 return;
3346 }
3347@@ -1668,7 +1668,7 @@
3348 m->last_change = lastmod;
3349 if (m == mm)
3350 {
3351- Esnprintf(s, sizeof(s), "__.%s", m->name);
3352+ snprintf(s, sizeof(s), "__.%s", m->name);
3353 DoIn(s, 2.0, FileMenuUpdate, 0, m);
3354 }
3355 EmptyMenu(mm);
3356@@ -1676,7 +1676,7 @@
3357 RepackMenu(mm);
3358 return;
3359 }
3360- Esnprintf(s, sizeof(s), "__.%s", m->name);
3361+ snprintf(s, sizeof(s), "__.%s", m->name);
3362 DoIn(s, 2.0, FileMenuUpdate, 0, m);
3363 val = 0;
3364 }
3365@@ -1695,7 +1695,7 @@
3366 EDBUG(5, "CreateMenuFromGnome");
3367
3368 if ((lang = setlocale(LC_MESSAGES, NULL)) != NULL)
3369- Esnprintf(name_buf, sizeof(name_buf), "Name[%s]=", lang);
3370+ snprintf(name_buf, sizeof(name_buf), "Name[%s]=", lang);
3371 else
3372 name_buf[0] = '\0';
3373
3374@@ -1707,17 +1707,17 @@
3375 {
3376 if ((strcmp(list[i], ".")) && (strcmp(list[i], "..")))
3377 {
3378- Esnprintf(ss, sizeof(ss), "%s/%s", dir, list[i]);
3379+ snprintf(ss, sizeof(ss), "%s/%s", dir, list[i]);
3380 if (isdir(ss))
3381 {
3382- Esnprintf(s, sizeof(s), "%s/%s:%s", dir, list[i], name);
3383+ snprintf(s, sizeof(s), "%s/%s:%s", dir, list[i], name);
3384 mm = CreateMenuFromGnome(s, ms, ss);
3385 mm->parent = m;
3386 AddItem(mm, mm->name, mm->win, LIST_TYPE_MENU);
3387 name = list[i];
3388 if (name_buf[0])
3389 {
3390- Esnprintf(s, sizeof(s), "%s/.directory", ss);
3391+ snprintf(s, sizeof(s), "%s/.directory", ss);
3392 if ((f = fopen(s, "r")) != NULL)
3393 {
3394 while (fgets(s, sizeof(s), f))
3395@@ -1827,7 +1827,7 @@
3396 for (i = 0; i < num; i++)
3397 {
3398 s = fullfileof(lst[i]);
3399- Esnprintf(ss, sizeof(ss), "restart_theme %s", s);
3400+ snprintf(ss, sizeof(ss), "restart_theme %s", s);
3401 Efree(s);
3402 s = fileof(lst[i]);
3403 mi = CreateMenuItem(s, NULL, ACTION_EXIT, ss, NULL);
3404@@ -1905,7 +1905,7 @@
3405 if ((!lst[i]->menu) && (!lst[i]->pager) && (!lst[i]->skipwinlist)
3406 && (lst[i]->client.title) && (!lst[i]->ibox))
3407 {
3408- Esnprintf(s, sizeof(s), "%i", (int)(lst[i]->client.win));
3409+ snprintf(s, sizeof(s), "%i", (int)(lst[i]->client.win));
3410 mi =
3411 CreateMenuItem(lst[i]->client.title, NULL,
3412 ACTION_FOCUS_SET, s, NULL);
3413@@ -1942,7 +1942,7 @@
3414 && (!lst[i]->skipwinlist) && (lst[i]->client.title)
3415 && (!lst[i]->ibox))
3416 {
3417- Esnprintf(s, sizeof(s), "%i", (int)(lst[i]->client.win));
3418+ snprintf(s, sizeof(s), "%i", (int)(lst[i]->client.win));
3419 mi =
3420 CreateMenuItem(lst[i]->client.title, NULL,
3421 ACTION_FOCUS_SET, s, NULL);
3422@@ -1975,7 +1975,7 @@
3423 mm = CreateMenu();
3424 mm->name = duplicate("__SUBMENUDESK_E");
3425 mm->style = ms;
3426- Esnprintf(s, sizeof(s), "%i", j);
3427+ snprintf(s, sizeof(s), "%i", j);
3428 mi =
3429 CreateMenuItem(_("Go to this Desktop"), NULL, ACTION_GOTO_DESK, s,
3430 NULL);
3431@@ -1986,7 +1986,7 @@
3432 && (!lst[i]->pager) && (!lst[i]->skipwinlist)
3433 && (lst[i]->client.title) && (!lst[i]->ibox))
3434 {
3435- Esnprintf(s, sizeof(s), "%i", (int)(lst[i]->client.win));
3436+ snprintf(s, sizeof(s), "%i", (int)(lst[i]->client.win));
3437 mi =
3438 CreateMenuItem(lst[i]->client.title, NULL,
3439 ACTION_FOCUS_SET, s, NULL);
3440@@ -1994,7 +1994,7 @@
3441 }
3442 }
3443 mm->parent = m;
3444- Esnprintf(s, sizeof(s), _("Desktop %i"), j);
3445+ snprintf(s, sizeof(s), _("Desktop %i"), j);
3446 mi = CreateMenuItem(s, NULL, 0, NULL, mm);
3447 AddItemToMenu(m, mi);
3448 }
3449@@ -2056,7 +2056,7 @@
3450 mm = CreateMenu();
3451 mm->name = duplicate("__SUBMENUGROUP_E");
3452 mm->style = ms;
3453- Esnprintf(s, sizeof(s), "%i", lst[i]->members[0]->client.win);
3454+ snprintf(s, sizeof(s), "%i", lst[i]->members[0]->client.win);
3455 mi =
3456 CreateMenuItem(_("Show/Hide this group"), NULL,
3457 ACTION_SHOW_HIDE_GROUP, s, NULL);
3458@@ -2068,14 +2068,14 @@
3459
3460 for (j = 0; j < lst[i]->num_members; j++)
3461 {
3462- Esnprintf(s, sizeof(s), "%i", lst[i]->members[j]->client.win);
3463+ snprintf(s, sizeof(s), "%i", lst[i]->members[j]->client.win);
3464 mi =
3465 CreateMenuItem(lst[i]->members[j]->client.title, NULL,
3466 ACTION_FOCUS_SET, s, NULL);
3467 AddItemToMenu(mm, mi);
3468 }
3469 mm->parent = m;
3470- Esnprintf(s, sizeof(s), _("Group %i"), i);
3471+ snprintf(s, sizeof(s), _("Group %i"), i);
3472 mi = CreateMenuItem(s, NULL, 0, NULL, mm);
3473 AddItemToMenu(m, mi);
3474 }
3475diff -Nru enlightenment-0.16.5/src/misc.c enlightenment-0.16.5.new/src/misc.c
3476--- enlightenment-0.16.5/src/misc.c Wed Jul 26 20:00:47 2000
3477+++ enlightenment-0.16.5.new/src/misc.c Fri Jul 20 05:28:53 2001
3478@@ -51,9 +51,9 @@
3479 for (i = 0; i < 3; i++)
3480 {
3481 #ifndef __EMX__
3482- Esnprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_BIN, bins[i]);
3483+ snprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_BIN, bins[i]);
3484 #else
3485- Esnprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_BIN),
3486+ snprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_BIN),
3487 bins[i]);
3488 #endif
3489 if (!exists(s))
3490@@ -81,14 +81,14 @@
3491 "correctly.\n"), s);
3492 EExit(NULL);
3493 }
3494- Esnprintf(s, sizeof(s), "%s/dox", ENLIGHTENMENT_BIN);
3495+ snprintf(s, sizeof(s), "%s/dox", ENLIGHTENMENT_BIN);
3496 }
3497 for (i = 0; i < 3; i++)
3498 {
3499 #ifndef __EMX__
3500- Esnprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_ROOT, docs[i]);
3501+ snprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_ROOT, docs[i]);
3502 #else
3503- Esnprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
3504+ snprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
3505 docs[i]);
3506 #endif
3507 if (!exists(s))
3508@@ -109,9 +109,9 @@
3509 for (i = 0; i < 1; i++)
3510 {
3511 #ifndef __EMX__
3512- Esnprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_ROOT, thms[i]);
3513+ snprintf(s, sizeof(s), "%s/%s", ENLIGHTENMENT_ROOT, thms[i]);
3514 #else
3515- Esnprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
3516+ snprintf(s, sizeof(s), "%s/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),
3517 thms[i]);
3518 #endif
3519 if (!exists(s))
3520@@ -146,7 +146,7 @@
3521 char *home, buf[4096];
3522
3523 home = homedir(getuid());
3524- Esnprintf(buf, sizeof(buf), "%s/.enlightenment", home);
3525+ snprintf(buf, sizeof(buf), "%s/.enlightenment", home);
3526 Efree(home);
3527 dir = duplicate(buf);
3528 }
3529@@ -221,9 +221,9 @@
3530 char sss[FILEPATH_LEN_MAX];
3531
3532 #ifndef __EMX__
3533- Esnprintf(sss, sizeof(sss), "/bin/rm -rf %s", themepath);
3534+ snprintf(sss, sizeof(sss), "/bin/rm -rf %s", themepath);
3535 #else
3536- Esnprintf(sss, sizeof(sss), "rm.exe -rf %s", themepath);
3537+ snprintf(sss, sizeof(sss), "rm.exe -rf %s", themepath);
3538 #endif
3539 system(sss);
3540 }
3541@@ -434,93 +434,93 @@
3542 char s[4096];
3543
3544 return 1;
3545- Esnprintf(s, sizeof(s), "%s/%s", dir, "borders.cfg");
3546+ snprintf(s, sizeof(s), "%s/%s", dir, "borders.cfg");
3547 if (!isfile(s))
3548 {
3549 badreason = _("Theme does not contain a borders.cfg file\n");
3550 return 0;
3551 }
3552- Esnprintf(s, sizeof(s), "%s/%s", dir, "buttons.cfg");
3553+ snprintf(s, sizeof(s), "%s/%s", dir, "buttons.cfg");
3554 if (!isfile(s))
3555 {
3556 badreason = _("Theme does not contain a buttons.cfg file\n");
3557 return 0;
3558 }
3559- Esnprintf(s, sizeof(s), "%s/%s", dir, "colormodifiers.cfg");
3560+ snprintf(s, sizeof(s), "%s/%s", dir, "colormodifiers.cfg");
3561 if (!isfile(s))
3562 {
3563 badreason = _("Theme does not contain a colormodifiers.cfg file\n");
3564 return 0;
3565 }
3566- Esnprintf(s, sizeof(s), "%s/%s", dir, "cursors.cfg");
3567+ snprintf(s, sizeof(s), "%s/%s", dir, "cursors.cfg");
3568 if (!isfile(s))
3569 {
3570 badreason = _("Theme does not contain a cursors.cfg file\n");
3571 return 0;
3572 }
3573- Esnprintf(s, sizeof(s), "%s/%s", dir, "desktops.cfg");
3574+ snprintf(s, sizeof(s), "%s/%s", dir, "desktops.cfg");
3575 if (!isfile(s))
3576 {
3577 badreason = _("Theme does not contain a desktops.cfg file\n");
3578 return 0;
3579 }
3580- Esnprintf(s, sizeof(s), "%s/%s", dir, "imageclasses.cfg");
3581+ snprintf(s, sizeof(s), "%s/%s", dir, "imageclasses.cfg");
3582 if (!isfile(s))
3583 {
3584 badreason = _("Theme does not contain a imageclasses.cfg file\n");
3585 return 0;
3586 }
3587- Esnprintf(s, sizeof(s), "%s/%s", dir, "init.cfg");
3588+ snprintf(s, sizeof(s), "%s/%s", dir, "init.cfg");
3589 if (!isfile(s))
3590 {
3591 badreason = _("Theme does not contain a init.cfg file\n");
3592 return 0;
3593 }
3594- Esnprintf(s, sizeof(s), "%s/%s", dir, "menustyles.cfg");
3595+ snprintf(s, sizeof(s), "%s/%s", dir, "menustyles.cfg");
3596 if (!isfile(s))
3597 {
3598 badreason = _("Theme does not contain a menustyles.cfg file\n");
3599 return 0;
3600 }
3601- Esnprintf(s, sizeof(s), "%s/%s", dir, "slideouts.cfg");
3602+ snprintf(s, sizeof(s), "%s/%s", dir, "slideouts.cfg");
3603 if (!isfile(s))
3604 {
3605 badreason = _("Theme does not contain a slideouts.cfg file\n");
3606 return 0;
3607 }
3608 #ifndef __EMX__ /* OS/2 Team will compile ESound after XMMS project */
3609- Esnprintf(s, sizeof(s), "%s/%s", dir, "sound.cfg");
3610+ snprintf(s, sizeof(s), "%s/%s", dir, "sound.cfg");
3611 if (!isfile(s))
3612 {
3613 badreason = _("Theme does not contain a sound.cfg file\n");
3614 return 0;
3615 }
3616 #endif
3617- Esnprintf(s, sizeof(s), "%s/%s", dir, "tooltips.cfg");
3618+ snprintf(s, sizeof(s), "%s/%s", dir, "tooltips.cfg");
3619 if (!isfile(s))
3620 {
3621 badreason = _("Theme does not contain a tooltips.cfg file\n");
3622 return 0;
3623 }
3624- Esnprintf(s, sizeof(s), "%s/%s", dir, "windowmatches.cfg");
3625+ snprintf(s, sizeof(s), "%s/%s", dir, "windowmatches.cfg");
3626 if (!isfile(s))
3627 {
3628 badreason = _("Theme does not contain a windowmatches.cfg file\n");
3629 return 0;
3630 }
3631- Esnprintf(s, sizeof(s), "%s/%s", dir, "menus.cfg");
3632+ snprintf(s, sizeof(s), "%s/%s", dir, "menus.cfg");
3633 if (isfile(s))
3634 {
3635 badreason = _("Theme contains a menus.cfg file\n");
3636 return 0;
3637 }
3638- Esnprintf(s, sizeof(s), "%s/%s", dir, "control.cfg");
3639+ snprintf(s, sizeof(s), "%s/%s", dir, "control.cfg");
3640 if (isfile(s))
3641 {
3642 badreason = _("Theme contains a control.cfg file\n");
3643 return 0;
3644 }
3645- Esnprintf(s, sizeof(s), "%s/%s", dir, "keybindings.cfg");
3646+ snprintf(s, sizeof(s), "%s/%s", dir, "keybindings.cfg");
3647 if (isfile(s))
3648 {
3649 badreason = _("Theme contains a keybindings.cfg file\n");
3650diff -Nru enlightenment-0.16.5/src/modules.c enlightenment-0.16.5.new/src/modules.c
3651--- enlightenment-0.16.5/src/modules.c Wed Jul 26 20:00:47 2000
3652+++ enlightenment-0.16.5.new/src/modules.c Fri Jul 20 05:29:33 2001
3653@@ -69,7 +69,7 @@
3654
3655 char pathoffiletoload[FILEPATH_LEN_MAX];
3656
3657- Esnprintf(pathoffiletoload, sizeof(pathoffiletoload), "%s/%s",
3658+ snprintf(pathoffiletoload, sizeof(pathoffiletoload), "%s/%s",
3659 FindModulePath(module_name), module_name);
3660 handle = dlopen(pathoffiletoload, RTLD_LAZY);
3661
3662diff -Nru enlightenment-0.16.5/src/pager.c enlightenment-0.16.5.new/src/pager.c
3663--- enlightenment-0.16.5/src/pager.c Fri Jul 28 19:23:35 2000
3664+++ enlightenment-0.16.5.new/src/pager.c Fri Jul 20 05:29:30 2001
3665@@ -454,7 +454,7 @@
3666 static int offsets[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
3667
3668 p = (Pager *) data;
3669- Esnprintf(s, sizeof(s), "__.%x", p->win);
3670+ snprintf(s, sizeof(s), "__.%x", p->win);
3671 /* prevent runaway pager timeouts - dont knwo how it happens - but hack */
3672 /* around to stop it */
3673 cur_time = GetTime();
3674@@ -669,7 +669,7 @@
3675 ShowEwin(p->ewin);
3676 return;
3677 }
3678- Esnprintf(s, sizeof(s), "%i", p->desktop);
3679+ snprintf(s, sizeof(s), "%i", p->desktop);
3680 xch = XAllocClassHint();
3681 xch->res_name = s;
3682 xch->res_class = "Enlightenment_Pager";
3683@@ -729,7 +729,7 @@
3684 RememberImportantInfoForEwin(ewin);
3685 if (SNAP)
3686 {
3687- Esnprintf(s, sizeof(s), "__.%x", p->win);
3688+ snprintf(s, sizeof(s), "__.%x", p->win);
3689 if (mode.pager_scanspeed > 0)
3690 DoIn(s, 1 / ((double)mode.pager_scanspeed), PagerUpdateTimeout,
3691 0, p);
3692@@ -745,7 +745,7 @@
3693 char s[4096];
3694
3695 RemoveItem("PAGER", p->win, LIST_FINDBY_ID, LIST_TYPE_PAGER);
3696- Esnprintf(s, sizeof(s), "__.%x", p->win);
3697+ snprintf(s, sizeof(s), "__.%x", p->win);
3698 RemoveTimerEvent(s);
3699 if (p->name)
3700 Efree(p->name);
3701@@ -1006,7 +1006,7 @@
3702 ImlibImage *im;
3703
3704 uniq = GetUniqueBGString(desks.desk[p->desktop].bg);
3705- Esnprintf(s, sizeof(s), "%s/cached/pager/%s.%i.%i.%s",
3706+ snprintf(s, sizeof(s), "%s/cached/pager/%s.%i.%i.%s",
3707 UserCacheDir(),
3708 desks.desk[p->desktop].bg->name, (p->w / ax),
3709 (p->h / ay), uniq);
3710@@ -1270,7 +1270,7 @@
3711 pw_menu->style =
3712 FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_MENU_STYLE);
3713
3714- Esnprintf(s, sizeof(s), "%i", ewin->client.win);
3715+ snprintf(s, sizeof(s), "%i", ewin->client.win);
3716 mi = CreateMenuItem(_("Iconify"), NULL, ACTION_ICONIFY, s, NULL);
3717 AddItemToMenu(pw_menu, mi);
3718
3719@@ -1284,7 +1284,7 @@
3720 AddItemToMenu(pw_menu, mi);
3721
3722 AddItem(pw_menu, pw_menu->name, 0, LIST_TYPE_MENU);
3723- Esnprintf(s, sizeof(s), "named %s", pw_menu->name);
3724+ snprintf(s, sizeof(s), "named %s", pw_menu->name);
3725 spawnMenu(s);
3726 return;
3727 }
3728@@ -1325,7 +1325,7 @@
3729 AddItemToMenu(p_menu, mi);
3730 }
3731 AddItem(p_menu, p_menu->name, 0, LIST_TYPE_MENU);
3732- Esnprintf(s, sizeof(s), "named %s", p_menu->name);
3733+ snprintf(s, sizeof(s), "named %s", p_menu->name);
3734 spawnMenu(s);
3735 }
3736
3737@@ -1713,7 +1713,7 @@
3738 if (p)
3739 {
3740 p->desktop = desk;
3741- Esnprintf(s, sizeof(s), "%i", desk);
3742+ snprintf(s, sizeof(s), "%i", desk);
3743 PagerTitle(p, s);
3744 PagerShow(p);
3745 }
3746@@ -1734,7 +1734,7 @@
3747 if (p)
3748 {
3749 p->desktop = desk;
3750- Esnprintf(s, sizeof(s), "%i", desk);
3751+ snprintf(s, sizeof(s), "%i", desk);
3752 PagerTitle(p, s);
3753 PagerShow(p);
3754 }
3755@@ -1865,7 +1865,7 @@
3756 PagerForceUpdate(pl[i]);
3757 if (SNAP)
3758 {
3759- Esnprintf(s, sizeof(s), "__.%x", pl[i]->win);
3760+ snprintf(s, sizeof(s), "__.%x", pl[i]->win);
3761 if (mode.pager_scanspeed > 0)
3762 DoIn(s, 1 / ((double)mode.pager_scanspeed),
3763 PagerUpdateTimeout, 0, pl[i]);
3764diff -Nru enlightenment-0.16.5/src/progress.c enlightenment-0.16.5.new/src/progress.c
3765--- enlightenment-0.16.5/src/progress.c Fri Jul 28 19:23:35 2000
3766+++ enlightenment-0.16.5.new/src/progress.c Fri Jul 20 05:31:13 2001
3767@@ -92,7 +92,7 @@
3768 w = 1;
3769 if (w > p->w)
3770 w = p->w;
3771- Esnprintf(s, sizeof(s), "%i%%", p->value);
3772+ snprintf(s, sizeof(s), "%i%%", p->value);
3773 pq = queue_up;
3774 queue_up = 0;
3775 TclassApply(p->inc, p->n_win, p->h * 5, p->h, 0, 0, STATE_CLICKED, 0,
3776diff -Nru enlightenment-0.16.5/src/scursor.c enlightenment-0.16.5.new/src/scursor.c
3777--- enlightenment-0.16.5/src/scursor.c Fri Jul 28 21:13:13 2000
3778+++ enlightenment-0.16.5.new/src/scursor.c Fri Jul 20 05:31:30 2001
3779@@ -136,7 +136,7 @@
3780 ImlibImage *im;
3781 Pixmap pmap, mask;
3782
3783- Esnprintf(s, sizeof(s), "pix/wait%i.png", wait_count);
3784+ snprintf(s, sizeof(s), "pix/wait%i.png", wait_count);
3785 wait_count++;
3786 if (wait_count > 12)
3787 wait_count = 1;
3788diff -Nru enlightenment-0.16.5/src/session.c enlightenment-0.16.5.new/src/session.c
3789--- enlightenment-0.16.5/src/session.c Wed Jul 26 20:00:47 2000
3790+++ enlightenment-0.16.5.new/src/session.c Fri Jul 20 05:31:10 2001
3791@@ -127,7 +127,7 @@
3792 {
3793 char s[1024];
3794
3795- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX", UserEDir());
3796+ snprintf(s, sizeof(s), "%s/...e_session-XXXXXX", UserEDir());
3797 def_prefix = duplicate(s);
3798 }
3799 return def_prefix;
3800@@ -238,7 +238,7 @@
3801 }
3802 }
3803 fclose(f);
3804- Esnprintf(ss, sizeof(ss), "%s.clients.%i", GetSMFile(), root.scr);
3805+ snprintf(ss, sizeof(ss), "%s.clients.%i", GetSMFile(), root.scr);
3806 rm(ss);
3807 mv(s, ss);
3808 if (!isfile(ss))
3809@@ -259,7 +259,7 @@
3810 FILE *f;
3811 char s[4096], s1[4096];
3812
3813- Esnprintf(s, sizeof(s), "%s.clients.%i", GetSMFile(), root.scr);
3814+ snprintf(s, sizeof(s), "%s.clients.%i", GetSMFile(), root.scr);
3815 #ifndef __EMX__
3816 f = fopen(s, "r");
3817 #else
3818@@ -451,7 +451,7 @@
3819 {
3820 /* char buf[1024];
3821 *
3822- * Esnprintf(buf, sizeof(buf) / sizeof(char), "rm %s*", GetSMFile());
3823+ * snprintf(buf, sizeof(buf) / sizeof(char), "rm %s*", GetSMFile());
3824 * system(buf); */
3825
3826 rm(GetGenericSMFile());
3827@@ -542,9 +542,9 @@
3828 if (mustdel)
3829 {
3830 #ifndef __EMX__
3831- Esnprintf(sss, sizeof(sss), "/bin/rm -rf %s", themepath);
3832+ snprintf(sss, sizeof(sss), "/bin/rm -rf %s", themepath);
3833 #else
3834- Esnprintf(sss, sizeof(sss), "rm.exe -rf %s", themepath);
3835+ snprintf(sss, sizeof(sss), "rm.exe -rf %s", themepath);
3836 #endif
3837 system(sss);
3838 }
3839@@ -559,7 +559,7 @@
3840
3841 if (themepath[0] != 0)
3842 {
3843- Esnprintf(sss, sizeof(sss),
3844+ snprintf(sss, sizeof(sss),
3845 "exec %s -single -ext_init_win %i -theme %s "
3846 "-econfdir %s -ecachedir %s -display %s", command,
3847 w, themename, UserEDir(), UserCacheDir(), dstr);
3848@@ -567,7 +567,7 @@
3849 }
3850 else
3851 {
3852- Esnprintf(sss, sizeof(sss),
3853+ snprintf(sss, sizeof(sss),
3854 "exec %s -single -ext_init_win %i "
3855 "-econfdir %s -ecachedir %s -display %s", command,
3856 w, UserEDir(), UserCacheDir(), dstr);
3857@@ -583,7 +583,7 @@
3858 XCloseDisplay(disp);
3859 disp = NULL;
3860 sscanf(params, "%*s %1000s", s);
3861- Esnprintf(sss, sizeof(sss),
3862+ snprintf(sss, sizeof(sss),
3863 "exec %s -single -ext_init_win %i -theme %s "
3864 "-econfdir %s -ecachedir %s -display %s", command, w, s,
3865 UserEDir(), UserCacheDir(), dstr);
3866@@ -839,7 +839,7 @@
3867 priorityVal.value = &priority;
3868
3869 /* Tell session manager how to clean up our old data */
3870- Esnprintf(buf, sizeof(buf) / sizeof(char), "rm %s*.clients.*", sm_file);
3871+ snprintf(buf, sizeof(buf) / sizeof(char), "rm %s*.clients.*", sm_file);
3872
3873 discardVal[0].length = strlen(sh);
3874 discardVal[0].value = sh;
3875@@ -857,7 +857,7 @@
3876 }
3877 if (restarting)
3878 {
3879- Esnprintf(buf, sizeof(buf) / sizeof(char), "%i", init_win_ext);
3880+ snprintf(buf, sizeof(buf) / sizeof(char), "%i", init_win_ext);
3881
3882 restartVal[n].length = strlen(extinitwin);
3883 restartVal[n++].value = extinitwin;
3884@@ -939,7 +939,7 @@
3885
3886 /* int fd; */
3887
3888- Esnprintf(s, sizeof(s), "sm_file %s", default_save_prefix());
3889+ snprintf(s, sizeof(s), "sm_file %s", default_save_prefix());
3890 /* fd = Emkstemp(s + 8);
3891 * if (fd < 0)
3892 * {
3893@@ -1304,7 +1304,7 @@
3894 KDE_Shutdown();
3895 XCloseDisplay(disp);
3896 disp = NULL;
3897- Esnprintf(s, sizeof(s), "exec %s -display %s", atword(params, 2), dstr);
3898+ snprintf(s, sizeof(s), "exec %s -display %s", atword(params, 2), dstr);
3899 execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
3900 }
3901 else if (!strcmp(s, "restart"))
3902@@ -1321,14 +1321,14 @@
3903 if (themepath[0] != 0)
3904 {
3905 if (sm_client_id)
3906- Esnprintf(s, sizeof(s),
3907+ snprintf(s, sizeof(s),
3908 "exec %s -single -ext_init_win %i -theme %s "
3909 "-econfdir %s -ecachedir %s "
3910 "-smfile %s -smid %s -display %s", command,
3911 init_win_ext, themename, UserEDir(), UserCacheDir(),
3912 sm_file, sm_client_id, dstr);
3913 else
3914- Esnprintf(s, sizeof(s),
3915+ snprintf(s, sizeof(s),
3916 "exec %s -single -ext_init_win %i -theme %s "
3917 "-econfdir %s -ecachedir %s "
3918 "-smfile %s -display %s", command, init_win_ext,
3919@@ -1338,14 +1338,14 @@
3920 else
3921 {
3922 if (sm_client_id)
3923- Esnprintf(s, sizeof(s),
3924+ snprintf(s, sizeof(s),
3925 "exec %s -single -ext_init_win %i "
3926 "-econfdir %s -ecachedir %s "
3927 "-smfile %s -smid %s -display %s", command,
3928 init_win_ext, UserEDir(), UserCacheDir(), sm_file,
3929 sm_client_id, dstr);
3930 else
3931- Esnprintf(s, sizeof(s),
3932+ snprintf(s, sizeof(s),
3933 "exec %s -single -ext_init_win %i"
3934 "-econfdir %s -ecachedir %s "
3935 "-smfile %s -display %s", command, init_win_ext,
3936@@ -1368,14 +1368,14 @@
3937 disp = NULL;
3938 }
3939 if (sm_client_id)
3940- Esnprintf(s, sizeof(s),
3941+ snprintf(s, sizeof(s),
3942 "exec %s -single -ext_init_win %i -theme %s "
3943 "-econfdir %s -ecachedir %s "
3944 "-smfile %s -smid %s -display %s", command, init_win_ext,
3945 userthemepath, UserEDir(), UserCacheDir(), sm_file,
3946 sm_client_id, dstr);
3947 else
3948- Esnprintf(s, sizeof(s),
3949+ snprintf(s, sizeof(s),
3950 "exec %s -ext_init_win %i -theme %s "
3951 "-econfdir %s -ecachedir %s "
3952 "-smfile %s -single -display %s", command, init_win_ext,
3953diff -Nru enlightenment-0.16.5/src/settings.c enlightenment-0.16.5.new/src/settings.c
3954--- enlightenment-0.16.5/src/settings.c Fri Jul 28 23:29:56 2000
3955+++ enlightenment-0.16.5.new/src/settings.c Fri Jul 20 05:31:27 2001
3956@@ -84,7 +84,7 @@
3957 {
3958 char s[256];
3959
3960- Esnprintf(s, sizeof(s), "%s %03i %s", _("Pager scanning speed:"),
3961+ snprintf(s, sizeof(s), "%s %03i %s", _("Pager scanning speed:"),
3962 tmp_pager_scan_speed, _("lines per second"));
3963 DialogItemTextSetText(pager_scan_speed_label, s);
3964 DialogDrawItems(pager_settings_dialog, pager_scan_speed_label, 0, 0, 99999,
3965@@ -209,7 +209,7 @@
3966 DialogItemSetFill(di, 0, 0);
3967 DialogItemSetColSpan(di, 2);
3968 DialogItemSetAlign(di, 0, 512);
3969- Esnprintf(s, sizeof(s), "%s %03i %s", _("Pager scanning speed:"),
3970+ snprintf(s, sizeof(s), "%s %03i %s", _("Pager scanning speed:"),
3971 tmp_pager_scan_speed, _("lines per second"));
3972 DialogItemTextSetText(di, s);
3973
3974@@ -1089,9 +1089,9 @@
3975 for (i = tmp_desktops; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
3976 EUnmapWindow(disp, wins[i]);
3977 if (tmp_desktops > 1)
3978- Esnprintf(s, sizeof(s), _("%i Desktops"), tmp_desktops);
3979+ snprintf(s, sizeof(s), _("%i Desktops"), tmp_desktops);
3980 else
3981- Esnprintf(s, sizeof(s), _("%i Desktop"), tmp_desktops);
3982+ snprintf(s, sizeof(s), _("%i Desktop"), tmp_desktops);
3983 DialogItemTextSetText(tmp_desk_text, s);
3984 DialogDrawItems(tmp_desk_dialog, tmp_desk_text, 0, 0, 99999, 99999);
3985 }
3986@@ -1152,9 +1152,9 @@
3987 DialogItemSetFill(di, 1, 0);
3988 DialogItemSetColSpan(di, 2);
3989 if (tmp_desktops > 1)
3990- Esnprintf(s, sizeof(s), _("%i Desktops"), tmp_desktops);
3991+ snprintf(s, sizeof(s), _("%i Desktops"), tmp_desktops);
3992 else
3993- Esnprintf(s, sizeof(s), _("%i Desktop"), tmp_desktops);
3994+ snprintf(s, sizeof(s), _("%i Desktop"), tmp_desktops);
3995 DialogItemTextSetText(di, s);
3996
3997 di = slider = DialogAddItem(table, DITEM_SLIDER);
3998@@ -1271,10 +1271,10 @@
3999 EMapWindow(disp, awin);
4000
4001 if ((tmp_area_x > 1) || ((9 - tmp_area_y) > 1))
4002- Esnprintf(s, sizeof(s), _("%i x %i\nScreens in size"), tmp_area_x,
4003+ snprintf(s, sizeof(s), _("%i x %i\nScreens in size"), tmp_area_x,
4004 9 - tmp_area_y);
4005 else
4006- Esnprintf(s, sizeof(s), _("1\nScreen in size"));
4007+ snprintf(s, sizeof(s), _("1\nScreen in size"));
4008 DialogItemTextSetText(tmp_area_text, s);
4009 DialogDrawItems(tmp_area_dialog, tmp_area_text, 0, 0, 99999, 99999);
4010 }
4011@@ -1340,10 +1340,10 @@
4012 DialogItemSetPadding(di, 2, 2, 2, 2);
4013 DialogItemSetFill(di, 1, 0);
4014 if ((tmp_area_x > 1) || (tmp_area_y > 1))
4015- Esnprintf(s, sizeof(s), _("%i x %i\nScreens in size"), tmp_area_x,
4016+ snprintf(s, sizeof(s), _("%i x %i\nScreens in size"), tmp_area_x,
4017 9 - tmp_area_y);
4018 else
4019- Esnprintf(s, sizeof(s), _("1\nScreen in size"));
4020+ snprintf(s, sizeof(s), _("1\nScreen in size"));
4021 DialogItemTextSetText(di, s);
4022
4023 table2 = DialogAddItem(table, DITEM_TABLE);
4024@@ -2520,7 +2520,7 @@
4025 ImlibImage *im;
4026 Pixmap p2;
4027
4028- Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s", UserCacheDir(),
4029+ snprintf(s, sizeof(s), "%s/cached/bgsel/%s", UserCacheDir(),
4030 tmp_bg->name);
4031 p2 = ECreatePixmap(disp, root.win, 64, 48, root.depth);
4032 SetBackgroundTo(id, p2, tmp_bg, 0);
4033@@ -2636,7 +2636,7 @@
4034 ImlibColor icl;
4035 Background *bg;
4036
4037- Esnprintf(s, sizeof(s), "__NEWBG_%i\n", time(NULL));
4038+ snprintf(s, sizeof(s), "__NEWBG_%i\n", time(NULL));
4039 icl.r = tmp_bg_r;
4040 icl.g = tmp_bg_g;
4041 icl.b = tmp_bg_b;
4042@@ -2709,7 +2709,7 @@
4043 stmp = fullfileof(tmp_bg->bg.file);
4044 else
4045 stmp = duplicate(_("-NONE-"));
4046- Esnprintf(s, sizeof(s),
4047+ snprintf(s, sizeof(s),
4048 _
4049 ("Background definition information:\nName: %s\nFile: %s\n"),
4050 tmp_bg->name, stmp);
4051@@ -2831,7 +2831,7 @@
4052 stmp = fullfileof(tmp_bg->bg.file);
4053 else
4054 stmp = duplicate(_("-NONE-"));
4055- Esnprintf(s, sizeof(s),
4056+ snprintf(s, sizeof(s),
4057 _
4058 ("Background definition information:\nName: %s\nFile: %s\n"),
4059 tmp_bg->name, stmp);
4060@@ -2973,12 +2973,12 @@
4061 }
4062 else
4063 {
4064- Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s",
4065+ snprintf(s, sizeof(s), "%s/cached/bgsel/%s",
4066 UserCacheDir(), bglist[i]->name);
4067 im = ELoadImage(s);
4068 if (!im)
4069 {
4070- Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s",
4071+ snprintf(s, sizeof(s), "%s/cached/bgsel/%s",
4072 UserCacheDir(), bglist[i]->name);
4073 p2 = ECreatePixmap(disp, pmap, 64, 48, id->x.depth);
4074 SetBackgroundTo(id, p2, bglist[i], 0);
4075@@ -3088,7 +3088,7 @@
4076 stmp = fullfileof(tmp_bg->bg.file);
4077 else
4078 stmp = duplicate(_("-NONE-"));
4079- Esnprintf(s, sizeof(s),
4080+ snprintf(s, sizeof(s),
4081 _
4082 ("Background definition information:\nName: %s\nFile: %s\n"),
4083 tmp_bg->name, stmp);
4084@@ -3151,7 +3151,7 @@
4085 char s[256];
4086
4087 di = (DItem *) data;
4088- Esnprintf(s, sizeof(s), _("Unused backgrounds freed after %2i:%02i:%02i"),
4089+ snprintf(s, sizeof(s), _("Unused backgrounds freed after %2i:%02i:%02i"),
4090 tmp_bg_timeout / 3600,
4091 (tmp_bg_timeout / 60) - (60 * (tmp_bg_timeout / 3600)),
4092 (tmp_bg_timeout) - (60 * (tmp_bg_timeout / 60)));
4093@@ -3211,7 +3211,7 @@
4094 stmp = fullfileof(tmp_bg->bg.file);
4095 else
4096 stmp = duplicate(_("-NONE-"));
4097- Esnprintf(s, sizeof(s),
4098+ snprintf(s, sizeof(s),
4099 _
4100 ("Background definition information:\nName: %s\nFile: %s\n"),
4101 tmp_bg->name, stmp);
4102@@ -3455,7 +3455,7 @@
4103 {
4104 char s[1024];
4105
4106- Esnprintf(s, sizeof(s), "__NEWBG_%i\n", time(NULL));
4107+ snprintf(s, sizeof(s), "__NEWBG_%i\n", time(NULL));
4108 bg =
4109 CreateDesktopBG(s, NULL, NULL, 1, 1, 0, 0, 0, 0, NULL, 1, 512, 512,
4110 0, 0);
4111@@ -3724,7 +3724,7 @@
4112 DialogItemSetPadding(di, 2, 2, 2, 2);
4113 DialogItemSetFill(di, 1, 0);
4114 DialogItemSetAlign(di, 512, 512);
4115- Esnprintf(s, sizeof(s), _("Unused backgrounds freed after %2i:%02i:%02i"),
4116+ snprintf(s, sizeof(s), _("Unused backgrounds freed after %2i:%02i:%02i"),
4117 tmp_bg_timeout / 3600,
4118 (tmp_bg_timeout / 60) - (60 * (tmp_bg_timeout / 3600)),
4119 (tmp_bg_timeout) - (60 * (tmp_bg_timeout / 60)));
4120@@ -3834,7 +3834,7 @@
4121 stmp = fullfileof(tmp_bg->bg.file);
4122 else
4123 stmp = duplicate(_("-NONE-"));
4124- Esnprintf(s, sizeof(s),
4125+ snprintf(s, sizeof(s),
4126 _("Background definition information:\nName: %s\nFile: %s\n"),
4127 tmp_bg->name, stmp);
4128 Efree(stmp);
4129diff -Nru enlightenment-0.16.5/src/setup.c enlightenment-0.16.5.new/src/setup.c
4130--- enlightenment-0.16.5/src/setup.c Sun Jul 30 00:32:36 2000
4131+++ enlightenment-0.16.5.new/src/setup.c Fri Jul 20 05:31:07 2001
4132@@ -272,7 +272,7 @@
4133 if (NULL != dispstr)
4134 *dispstr = '\0';
4135 }
4136- Esnprintf(subdisplay + strlen(subdisplay), 10, ".%d",
4137+ snprintf(subdisplay + strlen(subdisplay), 10, ".%d",
4138 i);
4139 dstr = duplicate(subdisplay);
4140 disp = XOpenDisplay(dstr);
4141@@ -670,7 +670,7 @@
4142 char s[1024], ss[1024], *home;
4143
4144 EDBUG(6, "SetupDirs");
4145- Esnprintf(s, sizeof(s), "%s", UserEDir());
4146+ snprintf(s, sizeof(s), "%s", UserEDir());
4147 home = homedir(getuid());
4148 if (home)
4149 {
4150@@ -681,7 +681,7 @@
4151 {
4152 if (!isdir(s))
4153 {
4154- Esnprintf(ss, sizeof(ss), "%s.old", UserEDir());
4155+ snprintf(ss, sizeof(ss), "%s.old", UserEDir());
4156 mv(s, ss);
4157 md(s);
4158 }
4159@@ -690,37 +690,37 @@
4160 }
4161 else
4162 md(s);
4163- Esnprintf(s, sizeof(s), "%s/themes", UserEDir());
4164+ snprintf(s, sizeof(s), "%s/themes", UserEDir());
4165 if (!exists(s))
4166 md(s);
4167 else
4168 ChkDir(s);
4169- Esnprintf(s, sizeof(s), "%s/backgrounds", UserEDir());
4170+ snprintf(s, sizeof(s), "%s/backgrounds", UserEDir());
4171 if (!exists(s))
4172 md(s);
4173 else
4174 ChkDir(s);
4175- Esnprintf(s, sizeof(s), "%s/cached", UserCacheDir());
4176+ snprintf(s, sizeof(s), "%s/cached", UserCacheDir());
4177 if (!exists(s))
4178 md(s);
4179 else
4180 ChkDir(s);
4181- Esnprintf(s, sizeof(s), "%s/cached/img", UserCacheDir());
4182+ snprintf(s, sizeof(s), "%s/cached/img", UserCacheDir());
4183 if (!exists(s))
4184 md(s);
4185 else
4186 ChkDir(s);
4187- Esnprintf(s, sizeof(s), "%s/cached/cfg", UserCacheDir());
4188+ snprintf(s, sizeof(s), "%s/cached/cfg", UserCacheDir());
4189 if (!exists(s))
4190 md(s);
4191 else
4192 ChkDir(s);
4193- Esnprintf(s, sizeof(s), "%s/cached/bgsel", UserCacheDir());
4194+ snprintf(s, sizeof(s), "%s/cached/bgsel", UserCacheDir());
4195 if (!exists(s))
4196 md(s);
4197 else
4198 ChkDir(s);
4199- Esnprintf(s, sizeof(s), "%s/cached/pager", UserCacheDir());
4200+ snprintf(s, sizeof(s), "%s/cached/pager", UserCacheDir());
4201 if (!exists(s))
4202 md(s);
4203 else
4204@@ -743,7 +743,7 @@
4205 #endif
4206 Esetenv("EROOT", ENLIGHTENMENT_ROOT, 1);
4207 Esetenv("EBIN", ENLIGHTENMENT_BIN, 1);
4208- Esnprintf(s, sizeof(s), "%i", getpid());
4209+ snprintf(s, sizeof(s), "%i", getpid());
4210 Esetenv("EPID", s, 1);
4211 Esetenv("ETHEME", themepath, 1);
4212 Esetenv("ECONFDIR", UserEDir(), 1);
4213@@ -902,7 +902,7 @@
4214 if (i > 12)
4215 i = 1;
4216
4217- Esnprintf(s, sizeof(s), "pix/wait%i.png", i);
4218+ snprintf(s, sizeof(s), "pix/wait%i.png", i);
4219
4220 f = FindFile(s);
4221 im = NULL;
4222@@ -956,7 +956,7 @@
4223
4224 EDBUG(3, "SetupUserInitialization");
4225
4226- Esnprintf(file, sizeof(file), "%s/.initialized", UserEDir());
4227+ snprintf(file, sizeof(file), "%s/.initialized", UserEDir());
4228 if (isfile(file))
4229 {
4230 mode.firsttime = 0;
4231@@ -972,7 +972,7 @@
4232 fclose(f);
4233 if (fork())
4234 EDBUG_RETURN_;
4235- Esnprintf(file, sizeof(file), "exec %s/e_gen_menu", ENLIGHTENMENT_BIN);
4236+ snprintf(file, sizeof(file), "exec %s/e_gen_menu", ENLIGHTENMENT_BIN);
4237 execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file,
4238 NULL);
4239 exit(0);
4240diff -Nru enlightenment-0.16.5/src/snaps.c enlightenment-0.16.5.new/src/snaps.c
4241--- enlightenment-0.16.5/src/snaps.c Sun Jul 30 00:32:36 2000
4242+++ enlightenment-0.16.5.new/src/snaps.c Fri Jul 20 05:31:24 2001
4243@@ -36,10 +36,10 @@
4244 if (ewin->snap)
4245 return ewin->snap;
4246 if ((ewin->client.name) && (ewin->client.class))
4247- Esnprintf(buf, sizeof(buf), "%s.%s", ewin->client.name,
4248+ snprintf(buf, sizeof(buf), "%s.%s", ewin->client.name,
4249 ewin->client.class);
4250 else if (ewin->client.title)
4251- Esnprintf(buf, sizeof(buf), "TITLE.%s", ewin->client.title);
4252+ snprintf(buf, sizeof(buf), "TITLE.%s", ewin->client.title);
4253 else
4254 return NULL;
4255 sn = FindItem(buf, 0, LIST_FINDBY_BOTH, LIST_TYPE_SNAPSHOT);
4256@@ -64,10 +64,10 @@
4257 char buf[4096];
4258
4259 if ((ewin->client.name) && (ewin->client.class))
4260- Esnprintf(buf, sizeof(buf), "%s.%s", ewin->client.name,
4261+ snprintf(buf, sizeof(buf), "%s.%s", ewin->client.name,
4262 ewin->client.class);
4263 else if (ewin->client.title)
4264- Esnprintf(buf, sizeof(buf), "TITLE.%s", ewin->client.title);
4265+ snprintf(buf, sizeof(buf), "TITLE.%s", ewin->client.title);
4266 sn = NewSnapshot(buf);
4267 ListChangeItemID(LIST_TYPE_SNAPSHOT, sn, 1);
4268 if ((ewin->client.name) && (ewin->client.class))
4269@@ -816,10 +816,10 @@
4270 char buf[4096];
4271
4272 if ((ewin->client.name) && (ewin->client.class))
4273- Esnprintf(buf, sizeof(buf), "%s.%s", ewin->client.name,
4274+ snprintf(buf, sizeof(buf), "%s.%s", ewin->client.name,
4275 ewin->client.class);
4276 else if (ewin->client.title)
4277- Esnprintf(buf, sizeof(buf), "TITLE.%s", ewin->client.title);
4278+ snprintf(buf, sizeof(buf), "TITLE.%s", ewin->client.title);
4279 else
4280 return;
4281 if (ewin->snap)
4282@@ -922,7 +922,7 @@
4283 Efree(lst);
4284 }
4285 fclose(f);
4286- Esnprintf(buf, sizeof(buf), "%s.snapshots.%i", GetGenericSMFile(), root.scr);
4287+ snprintf(buf, sizeof(buf), "%s.snapshots.%i", GetGenericSMFile(), root.scr);
4288 rm(buf);
4289 mv(s, buf);
4290 if (!isfile(buf))
4291@@ -959,9 +959,9 @@
4292 FILE *f;
4293 int res_w, res_h;
4294
4295- Esnprintf(buf, sizeof(buf), "%s.snapshots.%i", GetSMFile(), root.scr);
4296+ snprintf(buf, sizeof(buf), "%s.snapshots.%i", GetSMFile(), root.scr);
4297 if (!exists(buf))
4298- Esnprintf(buf, sizeof(buf), "%s.snapshots.%i", GetGenericSMFile(),
4299+ snprintf(buf, sizeof(buf), "%s.snapshots.%i", GetGenericSMFile(),
4300 root.scr);
4301 #ifndef __EMX__
4302 f = fopen(buf, "r");
4303@@ -1240,7 +1240,7 @@
4304 return;
4305 if ((hint.res_name) && (hint.res_class))
4306 {
4307- Esnprintf(buf, sizeof(buf), "%s.%s", hint.res_name, hint.res_class);
4308+ snprintf(buf, sizeof(buf), "%s.%s", hint.res_name, hint.res_class);
4309 sn = FindItem(buf, 0, LIST_FINDBY_BOTH, LIST_TYPE_SNAPSHOT);
4310 }
4311 if (hint.res_name)
4312@@ -1266,7 +1266,7 @@
4313 return;
4314 if ((hint.res_name) && (hint.res_class))
4315 {
4316- Esnprintf(buf, sizeof(buf), "%s.%s", hint.res_name, hint.res_class);
4317+ snprintf(buf, sizeof(buf), "%s.%s", hint.res_name, hint.res_class);
4318 sn = FindItem(buf, 0, LIST_FINDBY_BOTH, LIST_TYPE_SNAPSHOT);
4319 }
4320 if (hint.res_name)
4321diff -Nru enlightenment-0.16.5/src/snprintf.c enlightenment-0.16.5.new/src/snprintf.c
4322--- enlightenment-0.16.5/src/snprintf.c Wed Jul 26 20:00:47 2000
4323+++ enlightenment-0.16.5.new/src/snprintf.c Fri Jul 20 05:31:04 2001
4324@@ -84,10 +84,10 @@
4325
4326 #ifdef HAVE_STDARGS
4327 int
4328-Esnprintf(char *str, size_t count, const char *fmt, ...)
4329+snprintf(char *str, size_t count, const char *fmt, ...)
4330 #else
4331 int
4332-Esnprintf(va_alist)
4333+snprintf(va_alist)
4334 va_dcl
4335 #endif
4336 {
4337diff -Nru enlightenment-0.16.5/src/startup.c enlightenment-0.16.5.new/src/startup.c
4338--- enlightenment-0.16.5/src/startup.c Fri Jul 28 19:23:35 2000
4339+++ enlightenment-0.16.5.new/src/startup.c Fri Jul 20 05:31:22 2001
4340@@ -47,7 +47,7 @@
4341 if (!exists(file))
4342 EDBUG_RETURN(0);
4343
4344- Esnprintf(tmp, 2048, "%s/estrt_%i",
4345+ snprintf(tmp, 2048, "%s/estrt_%i",
4346 (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR"),
4347 time(NULL));
4348 f1 = fopen(file, "r");
4349@@ -142,19 +142,19 @@
4350 EDBUG(6, "AddE");
4351 val = 0;
4352 h = homedir(getuid());
4353- Esnprintf(s, 1024, "%s/.xsession", h);
4354+ snprintf(s, 1024, "%s/.xsession", h);
4355 val |= AddEToFile(s);
4356- Esnprintf(s, 1024, "%s/.xinitrc", h);
4357+ snprintf(s, 1024, "%s/.xinitrc", h);
4358 val |= AddEToFile(s);
4359- Esnprintf(s, 1024, "%s/.Xclients", h);
4360+ snprintf(s, 1024, "%s/.Xclients", h);
4361 val |= AddEToFile(s);
4362 if (!val)
4363 {
4364- Esnprintf(s, 1024, "%s/.xsession", h);
4365+ snprintf(s, 1024, "%s/.xsession", h);
4366 CreateEFile(s);
4367- Esnprintf(s, 1024, "%s/.xinitrc", h);
4368+ snprintf(s, 1024, "%s/.xinitrc", h);
4369 CreateEFile(s);
4370- Esnprintf(s, 1024, "%s/.Xclients", h);
4371+ snprintf(s, 1024, "%s/.Xclients", h);
4372 CreateEFile(s);
4373 }
4374 if (h)
4375diff -Nru enlightenment-0.16.5/src/tclass.c enlightenment-0.16.5.new/src/tclass.c
4376--- enlightenment-0.16.5/src/tclass.c Fri Jul 28 19:23:35 2000
4377+++ enlightenment-0.16.5.new/src/tclass.c Fri Jul 20 05:31:00 2001
4378@@ -83,7 +83,7 @@
4379 {
4380 char stuff[255];
4381
4382- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
4383+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
4384 t->ref_count);
4385 DIALOG_OK(_("TextClass Error!"), stuff);
4386 EDBUG_RETURN_;
4387diff -Nru enlightenment-0.16.5/src/text.c enlightenment-0.16.5.new/src/text.c
4388--- enlightenment-0.16.5/src/text.c Fri Jul 28 19:23:35 2000
4389+++ enlightenment-0.16.5.new/src/text.c Fri Jul 20 05:31:19 2001
4390@@ -156,7 +156,7 @@
4391 {
4392 *ss = ' ';
4393 word(dup, 1, w);
4394- Esnprintf(s, sizeof(s), "ttfonts/%s.ttf", w);
4395+ snprintf(s, sizeof(s), "ttfonts/%s.ttf", w);
4396 word(dup, 2, w);
4397 ss = FindFile(s);
4398 if (ss)
4399diff -Nru enlightenment-0.16.5/src/theme.c enlightenment-0.16.5.new/src/theme.c
4400--- enlightenment-0.16.5/src/theme.c Wed Jul 26 20:00:47 2000
4401+++ enlightenment-0.16.5.new/src/theme.c Fri Jul 20 05:30:57 2001
4402@@ -56,7 +56,7 @@
4403 {
4404 if (!strcmp(str[i], "DEFAULT"))
4405 {
4406- Esnprintf(ss, sizeof(ss), "%s/%s", dir, str[i]);
4407+ snprintf(ss, sizeof(ss), "%s/%s", dir, str[i]);
4408 #ifndef __EMX__
4409 if (readlink(ss, s, sizeof(s)) > 0)
4410 {
4411@@ -64,7 +64,7 @@
4412 def = duplicate(s);
4413 else
4414 {
4415- Esnprintf(s, sizeof(s), "%s/%s", dir, s);
4416+ snprintf(s, sizeof(s), "%s/%s", dir, s);
4417 def = duplicate(s);
4418 }
4419 }
4420@@ -83,7 +83,7 @@
4421 {
4422 ok = 0;
4423
4424- Esnprintf(s, sizeof(s), "%s/%s", dir, str[i]);
4425+ snprintf(s, sizeof(s), "%s/%s", dir, str[i]);
4426 if ((isdir(s)) && (SanitiseThemeDir(s)))
4427 ok = 1;
4428 else if ((isfile(s)) && (FileExtension(s))
4429@@ -112,12 +112,12 @@
4430 NULL;
4431 int count = 0;
4432
4433- Esnprintf(s, sizeof(s), "%s/themes", UserEDir());
4434+ snprintf(s, sizeof(s), "%s/themes", UserEDir());
4435 def = append_merge_dir(s, &list, &count);
4436 #ifndef __EMX__
4437- Esnprintf(s, sizeof(s), "%s/themes", ENLIGHTENMENT_ROOT);
4438+ snprintf(s, sizeof(s), "%s/themes", ENLIGHTENMENT_ROOT);
4439 #else
4440- Esnprintf(s, sizeof(s), "%s/themes", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
4441+ snprintf(s, sizeof(s), "%s/themes", __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
4442 #endif
4443 def2 = append_merge_dir(s, &list, &count);
4444
4445@@ -141,7 +141,7 @@
4446 char *def = NULL;
4447 int count;
4448
4449- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", UserEDir());
4450+ snprintf(ss, sizeof(ss), "%s/themes/DEFAULT", UserEDir());
4451 #ifndef __EMX__
4452 count = readlink(ss, s, sizeof(s));
4453 if ((exists(ss)) && (count > 0))
4454@@ -151,7 +151,7 @@
4455 def = duplicate(s);
4456 else
4457 {
4458- Esnprintf(ss, sizeof(ss), "%s/themes/%s", UserEDir(), s);
4459+ snprintf(ss, sizeof(ss), "%s/themes/%s", UserEDir(), s);
4460 def = duplicate(ss);
4461 }
4462 }
4463@@ -162,9 +162,9 @@
4464 if (!def)
4465 {
4466 #ifndef __EMX__
4467- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", ENLIGHTENMENT_ROOT);
4468+ snprintf(ss, sizeof(ss), "%s/themes/DEFAULT", ENLIGHTENMENT_ROOT);
4469 #else
4470- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT",
4471+ snprintf(ss, sizeof(ss), "%s/themes/DEFAULT",
4472 __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
4473 #endif
4474 #ifndef __EMX__
4475@@ -176,7 +176,7 @@
4476 def = duplicate(s);
4477 else
4478 {
4479- Esnprintf(ss, sizeof(ss), "%s/themes/%s", ENLIGHTENMENT_ROOT,
4480+ snprintf(ss, sizeof(ss), "%s/themes/%s", ENLIGHTENMENT_ROOT,
4481 s);
4482 def = duplicate(ss);
4483 }
4484@@ -198,7 +198,7 @@
4485 */
4486 char ss[FILEPATH_LEN_MAX];
4487
4488- Esnprintf(ss, sizeof(ss), "%s/themes/DEFAULT", UserEDir());
4489+ snprintf(ss, sizeof(ss), "%s/themes/DEFAULT", UserEDir());
4490 if (exists(ss))
4491 rm(ss);
4492 if (theme)
4493@@ -241,14 +241,14 @@
4494 /* make the temp dir */
4495
4496 themename = fileof(theme);
4497- Esnprintf(th, sizeof(th), "%s/themes/%s", UserEDir(), themename);
4498+ snprintf(th, sizeof(th), "%s/themes/%s", UserEDir(), themename);
4499 Efree(themename);
4500 md(th);
4501 /* check magic numbers */
4502 if ((buf[0] == 31) && (buf[1] == 139))
4503 {
4504 /*gzipped tarball */
4505- Esnprintf(s, sizeof(s),
4506+ snprintf(s, sizeof(s),
4507 "gzip -d -c < %s | (cd %s ; tar -xf -)", theme, th);
4508 }
4509 else if ((buf[257] == 'u') && (buf[258] == 's')
4510@@ -256,7 +256,7 @@
4511 && (buf[261] == 'r'))
4512 {
4513 /*vanilla tarball */
4514- Esnprintf(s, sizeof(s), "(cd %s ; tar -xf %s)", th, theme);
4515+ snprintf(s, sizeof(s), "(cd %s ; tar -xf %s)", th, theme);
4516 }
4517 /* exec the untar if tarred */
4518 system(s);
4519@@ -270,9 +270,9 @@
4520 char sss[FILEPATH_LEN_MAX];
4521
4522 #ifndef __EMX__
4523- Esnprintf(sss, sizeof(sss), "/bin/rm -rf %s", themepath);
4524+ snprintf(sss, sizeof(sss), "/bin/rm -rf %s", themepath);
4525 #else
4526- Esnprintf(sss, sizeof(sss), "rm.exe -rf %s", themepath);
4527+ snprintf(sss, sizeof(sss), "rm.exe -rf %s", themepath);
4528 #endif
4529 system(sss);
4530 mustdel = 0;
4531@@ -294,9 +294,9 @@
4532 if (!theme[0])
4533 {
4534 #ifndef __EMX__
4535- Esnprintf(s, sizeof(s), "%s/themes/DEFAULT", ENLIGHTENMENT_ROOT);
4536+ snprintf(s, sizeof(s), "%s/themes/DEFAULT", ENLIGHTENMENT_ROOT);
4537 #else
4538- Esnprintf(s, sizeof(s), "%s/themes/DEFAULT",
4539+ snprintf(s, sizeof(s), "%s/themes/DEFAULT",
4540 __XOS2RedirRoot(ENLIGHTENMENT_ROOT));
4541 #endif
4542 EDBUG_RETURN(duplicate(s));
4543@@ -309,7 +309,7 @@
4544 ret = ExtractTheme(theme);
4545 if (!ret)
4546 {
4547- Esnprintf(s, sizeof(s), "%s/themes/%s", UserEDir(), theme);
4548+ snprintf(s, sizeof(s), "%s/themes/%s", UserEDir(), theme);
4549 if (exists(s))
4550 ret = ExtractTheme(s);
4551 else
4552@@ -317,9 +317,9 @@
4553 if (!ret)
4554 {
4555 #ifndef __EMX__
4556- Esnprintf(s, sizeof(s), "%s/themes/%s", ENLIGHTENMENT_ROOT, theme);
4557+ snprintf(s, sizeof(s), "%s/themes/%s", ENLIGHTENMENT_ROOT, theme);
4558 #else
4559- Esnprintf(s, sizeof(s), "%s/themes/%s",
4560+ snprintf(s, sizeof(s), "%s/themes/%s",
4561 __XOS2RedirRoot(ENLIGHTENMENT_ROOT), theme);
4562 #endif
4563 if (exists(s))
4564@@ -344,7 +344,7 @@
4565 if (!badtheme)
4566 return;
4567
4568- Esnprintf(s, sizeof(s),
4569+ snprintf(s, sizeof(s),
4570 _("The theme:\n" "%s\n"
4571 "Is a badly formed theme package and is thus not being used.\n"
4572 "Enlightenment has fallen back to using the DEFAULT theme.\n"
4573diff -Nru enlightenment-0.16.5/src/tooltips.c enlightenment-0.16.5.new/src/tooltips.c
4574--- enlightenment-0.16.5/src/tooltips.c Fri Jul 28 21:13:13 2000
4575+++ enlightenment-0.16.5.new/src/tooltips.c Fri Jul 20 05:31:16 2001
4576@@ -1046,7 +1046,7 @@
4577 {
4578 char stuff[255];
4579
4580- Esnprintf(stuff, sizeof(stuff), _("%u references remain\n"),
4581+ snprintf(stuff, sizeof(stuff), _("%u references remain\n"),
4582 tt->ref_count);
4583 DIALOG_OK(_("ToolTip Error!"), stuff);
4584 }
4585diff -Nru enlightenment-0.16.5/stamp-h enlightenment-0.16.5.new/stamp-h
4586--- enlightenment-0.16.5/stamp-h Thu Jan 1 01:00:00 1970
4587+++ enlightenment-0.16.5.new/stamp-h Fri Jul 20 05:11:30 2001
4588@@ -0,0 +1 @@
4589+timestamp
4590diff -Nru enlightenment-0.16.5/src/snprintf.c enlightenment-0.16.5.new/src/snprintf.c
4591--- enlightenment-0.16.5/src/snprintf.c Thu Aug 9 19:44:49 2001
4592+++ enlightenment-0.16.5.new/src/snprintf.c Thu Aug 9 19:47:30 2001
4593@@ -28,6 +28,8 @@
4594 *
4595 * so workaround...
4596 */
4597+#ifndef HAVE_SNPRINTF
4598+
4599 #ifdef __sgi
4600 #ifdef _NO_ANSIMODE
4601 #undef _NO_ANSIMODE
4602@@ -589,3 +591,5 @@
4603 *
4604 * The End
4605 */
4606+
4607+#endif /* HAVE_SNPRINTF */
Enlightenment Window Manager
This page took 0.782618 seconds and 4 git commands to generate.