*** util.e.orig	2009-11-16 16:57:20.000000000 -0800
--- util.e	2011-01-05 09:32:58.000000000 -0800
***************
*** 32,35 ****
--- 32,36 ----
  extern int	UtilStrCpyN ARGS_DECL((char *pszDest, int nMaxDestSz,
  				char *pszSrc));
+ extern int	UtilStrCpy ARGS_DECL((char *pszDest, char *pszSrc));
  extern void	UtilLeftTrim ARGS_DECL((char *pszStr));
  extern void	UtilRightTrim ARGS_DECL((char *pszStr));
*** util.c.orig	2009-11-16 16:57:20.000000000 -0800
--- util.c	2011-01-05 09:32:58.000000000 -0800
***************
*** 77,80 ****
--- 77,94 ----
  }
  
+ int UtilStrCpy(pszDest, pszSrc)
+    char *pszDest, *pszSrc;
+    /* safe copy byte by byte from pszSrc to pszDest */
+ {
+    int len=0;
+ 
+    if (pszDest == NULL || pszSrc == NULL) return 0;
+ 
+    while (((*pszDest++)=(*pszSrc++)) != '\0') {
+       len++;
+    }
+    return len;
+ }
+ 
  void UtilLeftTrim(pszStr)
     char *pszStr;
*** auxtext.c.orig	2009-11-16 16:57:16.000000000 -0800
--- auxtext.c	2011-01-05 09:32:58.000000000 -0800
***************
*** 2030,2034 ****
        if (*s == '"') {
           if (s[1] == '"') {
!             strcpy(s, s+1);
           } else {
              break;
--- 2030,2034 ----
        if (*s == '"') {
           if (s[1] == '"') {
!             UtilStrCpy(s, s+1);
           } else {
              break;
***************
*** 2038,2042 ****
              if (s[2] >= '0' && s[2] <= '7' && s[3] >= '0' && s[3] <= '7') {
                 *s = (char)(((s[1]-'0')<<6)+((s[2]-'0')<<3)+(s[3]-'0'));
!                strcpy(s+1, s+4);
              } else {
                 sprintf(gszMsgBox,
--- 2038,2042 ----
              if (s[2] >= '0' && s[2] <= '7' && s[3] >= '0' && s[3] <= '7') {
                 *s = (char)(((s[1]-'0')<<6)+((s[2]-'0')<<3)+(s[3]-'0'));
!                UtilStrCpy(s+1, s+4);
              } else {
                 sprintf(gszMsgBox,
***************
*** 2048,2055 ****
                    Msg(gszMsgBox);
                 }
!                strcpy(s, s+1);
              }
           } else {
!             strcpy(s, s+1);
           }
        }
--- 2048,2055 ----
                    Msg(gszMsgBox);
                 }
!                UtilStrCpy(s, s+1);
              }
           } else {
!             UtilStrCpy(s, s+1);
           }
        }
*** names.c.orig	2009-11-16 16:57:18.000000000 -0800
--- names.c	2011-01-05 09:32:58.000000000 -0800
***************
*** 116,120 ****
     for ( ; *s1 != '\0' && *s1 != ':'; s1++) {
        if (*s1 == '\\') {
!          strcpy(s1, s1+1);
        } else {
           *s2++ = *s1;
--- 116,120 ----
     for ( ; *s1 != '\0' && *s1 != ':'; s1++) {
        if (*s1 == '\\') {
!          UtilStrCpy(s1, s1+1);
        } else {
           *s2++ = *s1;