Re: expand-file-name problem for eight-bit-control/graphic

[Kenichi Handa]

In article <address@hidden>, Richard Stallman <address@hidden> writes:
> I have a lot of doubts about this code, because it seems to encode and
> then decode the file name.  Since the arguments and values are both
> strings for use within Emacs, I think it is incorrect for
> expand-file-name to ever encode or decode a file name.

But, at least, we can't use build_string and make_string
blindly to reconstruct a file name.  So, how about the
attached change?

---
Ken'ichi HANDA
address@hidden

*** fileio.c.~1.474.~   Tue Mar 18 09:59:02 2003
--- fileio.c    Tue Mar 18 10:52:33 2003
***************
*** 992,997 ****
--- 992,1014 ----
  
  
  
+ /* Return a string made from NBYTES bytes at P.  If MULTIBYTE is
+    nonzero, the string is multibyte (it is assumed that the bytes are
+    in correct multibyte form).  If MULTIBYTE is zero, the string is
+    unibyte.  */
+ 
+ static Lisp_Object
+ bytes_to_string (unsigned char *p, int nbytes, int multibyte)
+ {
+   int nchars;
+ 
+   if (! multibyte)
+     return make_unibyte_string ((char *) p, nbytes);
+   nchars = multibyte_chars_in_text (p, nbytes);
+   return make_multibyte_string ((char *) p, nchars, nbytes);
+ }
+ 
+ 
  DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
         doc: /* Convert filename NAME to absolute, and canonicalize it.
  Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
***************
*** 1028,1033 ****
--- 1045,1051 ----
  #endif /* DOS_NT */
    int length;
    Lisp_Object handler;
+   int multibyte;
  
    CHECK_STRING (name);
  
***************
*** 1111,1116 ****
--- 1129,1135 ----
    name = FILE_SYSTEM_CASE (name);
  #endif
  
+   multibyte = STRING_MULTIBYTE (name);
    nm = SDATA (name);
  
  #ifdef DOS_NT
***************
*** 1275,1281 ****
        {
  #ifdef VMS
          if (index (nm, '/'))
!           return build_string (sys_translate_unix (nm));
  #endif /* VMS */
  #ifdef DOS_NT
          /* Make sure directories are all separated with / or \ as
--- 1294,1304 ----
        {
  #ifdef VMS
          if (index (nm, '/'))
!           {
!             nm = sys_translate_unix (nm);
!             length = strlen (nm);
!             return bytes_to_string (nm, length, multibyte);
!           }
  #endif /* VMS */
  #ifdef DOS_NT
          /* Make sure directories are all separated with / or \ as
***************
*** 1286,1299 ****
          if (IS_DIRECTORY_SEP (nm[1]))
            {
              if (strcmp (nm, SDATA (name)) != 0)
!               name = build_string (nm);
            }
          else
  #endif
          /* drive must be set, so this is okay */
          if (strcmp (nm - 2, SDATA (name)) != 0)
            {
!             name = make_string (nm - 2, p - nm + 2);
              SSET (name, 0, DRIVE_LETTER (drive));
              SSET (name, 1, ':');
            }
--- 1309,1322 ----
          if (IS_DIRECTORY_SEP (nm[1]))
            {
              if (strcmp (nm, SDATA (name)) != 0)
!               name = bytes_to_string (nm, strlen (nm), multibyte);
            }
          else
  #endif
          /* drive must be set, so this is okay */
          if (strcmp (nm - 2, SDATA (name)) != 0)
            {
!             name = bytes_to_string (nm, strlen (nm), multibyte);
              SSET (name, 0, DRIVE_LETTER (drive));
              SSET (name, 1, ':');
            }
***************
*** 1301,1307 ****
  #else /* not DOS_NT */
          if (nm == SDATA (name))
            return name;
!         return build_string (nm);
  #endif /* not DOS_NT */
        }
      }
--- 1324,1330 ----
  #else /* not DOS_NT */
          if (nm == SDATA (name))
            return name;
!         return bytes_to_string (nm, strlen (nm), multibyte);
  #endif /* not DOS_NT */
        }
      }
***************
*** 1670,1676 ****
    CORRECT_DIR_SEPS (target);
  #endif /* DOS_NT */
  
!   return make_string (target, o - target);
  }
  
  #if 0
--- 1693,1699 ----
    CORRECT_DIR_SEPS (target);
  #endif /* DOS_NT */
  
!   return bytes_to_string (target, o - target, multibyte);
  }
  
  #if 0