From: Kenichi Handa <handa@m17n.org>
Cc: emacs-devel@gnu.org
Subject: Re: expand-file-name problem for eight-bit-control/graphic
Date: Tue, 18 Mar 2003 22:24:50 +0900 (JST) [thread overview]
Message-ID: <200303181324.WAA28495@etlken.m17n.org> (raw)
In-Reply-To: <200303180203.LAA27619@etlken.m17n.org> (message from Kenichi Handa on Tue, 18 Mar 2003 11:03:35 +0900 (JST))
I wrote:
> But, at least, we can't use build_string and make_string
> blindly to reconstruct a file name. So, how about the
> attached change?
I found that several other functions in fileio.c have the
same problem as expand-file-name. They all do something
like this:
str = SDATA (filename);
...
if (STRING_MULTIBYTE (filename))
return make_string (beg, p - beg);
return make_unibyte_string (beg, p - beg);
and make_string will return a unibyte string if FILENAME
originally contains eight-bit-control/graphics.
Another bug is in read-file-name. It doesn't decode
homedir.
Here's a new patch which replaces the previous one.
I think this fix is important because nowadays people more
often encounter, for instance, utf-8 filenames in latin-1
locale or vice versa.
---
Ken'ichi HANDA
handa@m17n.org
*** fileio.c.~1.474.~ Tue Mar 18 09:59:02 2003
--- fileio.c Tue Mar 18 22:09:35 2003
***************
*** 235,240 ****
--- 235,258 ----
Lisp_Object *, struct coding_system *));
static int e_write P_ ((int, Lisp_Object, int, int, struct coding_system *));
+ static Lisp_Object build_file_name P_ ((const unsigned char *, int, int));
+
+ /* 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
+ build_file_name (const 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);
+ }
+
\f
void
report_file_error (string, data)
***************
*** 447,455 ****
CORRECT_DIR_SEPS (beg);
#endif /* DOS_NT */
! if (STRING_MULTIBYTE (filename))
! return make_string (beg, p - beg);
! return make_unibyte_string (beg, p - beg);
}
DEFUN ("file-name-nondirectory", Ffile_name_nondirectory,
--- 465,471 ----
CORRECT_DIR_SEPS (beg);
#endif /* DOS_NT */
! return build_file_name (beg, p - beg, STRING_MULTIBYTE (filename));
}
DEFUN ("file-name-nondirectory", Ffile_name_nondirectory,
***************
*** 488,496 ****
)
p--;
! if (STRING_MULTIBYTE (filename))
! return make_string (p, end - p);
! return make_unibyte_string (p, end - p);
}
DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory,
--- 504,510 ----
)
p--;
! return build_file_name (p, end - p, STRING_MULTIBYTE (filename));
}
DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory,
***************
*** 631,637 ****
return call2 (handler, Qfile_name_as_directory, file);
buf = (char *) alloca (SBYTES (file) + 10);
! return build_string (file_name_as_directory (buf, SDATA (file)));
}
\f
/*
--- 645,652 ----
return call2 (handler, Qfile_name_as_directory, file);
buf = (char *) alloca (SBYTES (file) + 10);
! file_name_as_directory (buf, SDATA (file));
! return build_file_name (buf, strlen (buf), STRING_MULTIBYTE (file));
}
\f
/*
***************
*** 831,837 ****
buf = (char *) alloca (SBYTES (directory) + 20);
#endif
directory_file_name (SDATA (directory), buf);
! return build_string (buf);
}
static char make_temp_name_tbl[64] =
--- 846,852 ----
buf = (char *) alloca (SBYTES (directory) + 20);
#endif
directory_file_name (SDATA (directory), buf);
! return build_file_name (buf, strlen (buf), STRING_MULTIBYTE (directory));
}
static char make_temp_name_tbl[64] =
***************
*** 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
--- 1290,1300 ----
{
#ifdef VMS
if (index (nm, '/'))
! {
! nm = sys_translate_unix (nm);
! return build_file_name (nm, strlen (nm),
! STRING_MULTIBYTE (name));
! }
#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, ':');
}
--- 1305,1320 ----
if (IS_DIRECTORY_SEP (nm[1]))
{
if (strcmp (nm, SDATA (name)) != 0)
! name
! = build_file_name (nm, strlen (nm), STRING_MULTIBYTE (name));
}
else
#endif
/* drive must be set, so this is okay */
if (strcmp (nm - 2, SDATA (name)) != 0)
{
! name
! = build_file_name (nm, strlen (nm), STRING_MULTIBYTE (name));
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 */
}
}
--- 1322,1328 ----
#else /* not DOS_NT */
if (nm == SDATA (name))
return name;
! return build_file_name (nm, strlen (nm), STRING_MULTIBYTE (name));
#endif /* not DOS_NT */
}
}
***************
*** 1670,1676 ****
CORRECT_DIR_SEPS (target);
#endif /* DOS_NT */
! return make_string (target, o - target);
}
#if 0
--- 1691,1697 ----
CORRECT_DIR_SEPS (target);
#endif /* DOS_NT */
! return build_file_name (target, o - target, STRING_MULTIBYTE (name));
}
#if 0
***************
*** 2101,2107 ****
}
#ifdef VMS
! return build_string (nm);
#else
/* See if any variables are substituted into the string
--- 2122,2128 ----
}
#ifdef VMS
! return build_file_name (nm, strlen (nm), STRING_MULTIBYTE (filename));
#else
/* See if any variables are substituted into the string
***************
*** 2244,2252 ****
xnm = p;
#endif
! if (STRING_MULTIBYTE (filename))
! return make_string (xnm, x - xnm);
! return make_unibyte_string (xnm, x - xnm);
badsubst:
error ("Bad format environment-variable substitution");
--- 2265,2271 ----
xnm = p;
#endif
! return build_file_name (xnm, x - xnm, STRING_MULTIBYTE (filename));
badsubst:
error ("Bad format environment-variable substitution");
***************
*** 6023,6028 ****
--- 6042,6048 ----
Lisp_Object val, insdef, tem;
struct gcpro gcpro1, gcpro2;
register char *homedir;
+ Lisp_Object decoded_homedir;
int replace_in_history = 0;
int add_to_history = 0;
int count;
***************
*** 6045,6069 ****
CORRECT_DIR_SEPS (homedir);
}
#endif
if (homedir != 0
&& STRINGP (dir)
! && !strncmp (homedir, SDATA (dir), strlen (homedir))
! && IS_DIRECTORY_SEP (SREF (dir, strlen (homedir))))
{
! dir = make_string (SDATA (dir) + strlen (homedir) - 1,
! SBYTES (dir) - strlen (homedir) + 1);
! SSET (dir, 0, '~');
}
/* Likewise for default_filename. */
if (homedir != 0
&& STRINGP (default_filename)
! && !strncmp (homedir, SDATA (default_filename), strlen (homedir))
! && IS_DIRECTORY_SEP (SREF (default_filename, strlen (homedir))))
{
default_filename
! = make_string (SDATA (default_filename) + strlen (homedir) - 1,
! SBYTES (default_filename) - strlen (homedir) + 1);
! SSET (default_filename, 0, '~');
}
if (!NILP (default_filename))
{
--- 6065,6093 ----
CORRECT_DIR_SEPS (homedir);
}
#endif
+ if (homedir != 0)
+ decoded_homedir
+ = DECODE_FILE (make_unibyte_string (homedir, strlen (homedir)));
if (homedir != 0
&& STRINGP (dir)
! && !strncmp (SDATA (decoded_homedir), SDATA (dir),
! SBYTES (decoded_homedir))
! && IS_DIRECTORY_SEP (SREF (dir, SBYTES (decoded_homedir))))
{
! dir = Fsubstring (dir, make_number (SCHARS (decoded_homedir) + 1), Qnil);
! dir = concat2 (build_string ("~"), dir);
}
/* Likewise for default_filename. */
if (homedir != 0
&& STRINGP (default_filename)
! && !strncmp (SDATA (decoded_homedir), SDATA (default_filename),
! SBYTES (decoded_homedir))
! && IS_DIRECTORY_SEP (SREF (default_filename, SBYTES (decoded_homedir))))
{
default_filename
! = Fsubstring (default_filename,
! make_number (SCHARS (decoded_homedir) + 1), Qnil);
! default_filename = concat2 (build_string ("~"), default_filename);
}
if (!NILP (default_filename))
{
next prev parent reply other threads:[~2003-03-18 13:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-13 7:47 expand-file-name problem for eight-bit-control/graphic Kenichi Handa
2003-03-15 6:54 ` Richard Stallman
2003-03-18 2:03 ` Kenichi Handa
2003-03-18 13:24 ` Kenichi Handa [this message]
2003-03-19 13:36 ` Richard Stallman
2003-03-20 18:49 ` Juanma Barranquero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200303181324.WAA28495@etlken.m17n.org \
--to=handa@m17n.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.