enlightenment-use_sys_snprintf.patch

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