enlightenment-use_sys_snprintf.patch

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