bug#48902: 28.0.50; Directory names containing apostrophes and backticks cause problems

[naofumi@yasufuku.dev <naofumi@yasufuku.dev>]

[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]

On Tuesday, June 08, 2021 20:18 CEST, Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Mattias Engdegård <mattiase@acm.org>
> > Date: Tue, 8 Jun 2021 19:45:22 +0200
> > Cc: 48902@debbugs.gnu.org, Alan Third <alan@idiocy.org>,
> >  Rudolf Adamkovič <salutis@me.com>, naofumi@yasufuku.dev
> >
> > The quick fix of reverting to stringWithUTF8String: will work, but the real problem is that we have no control of the encodedness of lisp strings being passed around.
>
> The usual technique in these cases is to keep Lisp strings unencoded,
> encode them when passing to the low-level C functions, and pass to
> those functions only the pointer to the string's data.
>
> In those rare cases when you really need to pass a Lisp string that is
> an encoded file name, call the argument "encoded_file" or somesuch.
> But these cases should be rare exceptions.
>
>

I agree that [NSString stringWithLispString:] is working as expected,
and it is not the real problem.

For example, another patch using STRING_SET_MULTIBYTE() is here.
This looks still just a quick fix and bit weired, though..

attachments:
0001-Fix-to-show-images-with-non-ascii-filename-STRING_SET_MULTIBYTE.patch
image-non-ascii-filename-STRING_SET_MULTIBYTE-macos.png
image-non-ascii-filename-STRING_SET_MULTIBYTE-linux.png

On the other hand, I cannot find out that non-UTF-8 filename coding is
really needed on macOS.  It might be over-engineered thing, and just an overhead.

Regards,
--Naofumi

[-- Attachment #2: image-non-ascii-filename-STRING_SET_MULTIBYTE-macos.png --]
[-- Type: image/png, Size: 234036 bytes --]

[-- Attachment #3: 0001-Fix-to-show-images-with-non-ascii-filename-STRING_SET_MULTIBYTE.patch --]
[-- Type: application/octet-stream, Size: 1676 bytes --]

From 0b18100ada3a16e667684383150c4f4d7848e5ce Mon Sep 17 00:00:00 2001
From: Naofumi Yasufuku <naofumi@yasufuku.dev>
Date: Wed, 9 Jun 2021 02:10:43 +0900
Subject: [PATCH] Fix to show images with non-ascii filename on macOS

* src/image.c (image_find_image_fd): Indicate 'file_found' Lisp_String
as multibyte if 'file' or 'search_path' is multibyte Lisp_String.
Without this special care, string_to_multibyte() call in
[NSString stringWithLispString:]  attempts to convert the multibyte
filename (UTF-8 by default) to multybyte string unintentionally.
(Bug#48902)
* src/nsimage.m ([EmacsImage allocInitFromFile:]): Remove redundant
ENCODE_FILE() which is done by image_find_image_fd().
---
 src/image.c   | 2 ++
 src/nsimage.m | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/image.c b/src/image.c
index b34dc3e916..f7204af873 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3156,6 +3156,8 @@ image_find_image_fd (Lisp_Object file, int *pfd)
   if (fd >= 0 || fd == -2)
     {
       file_found = ENCODE_FILE (file_found);
+      if (STRING_MULTIBYTE (search_path) || STRING_MULTIBYTE (file))
+	STRING_SET_MULTIBYTE (file_found);
       if (fd == -2)
 	{
 	  /* The file exists locally, but has a file name handler.
diff --git a/src/nsimage.m b/src/nsimage.m
index fa81a41a51..5e5960de90 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -259,7 +259,6 @@ + (instancetype)allocInitFromFile: (Lisp_Object)file
   found = image_find_image_file (file);
   if (!STRINGP (found))
     return nil;
-  found = ENCODE_FILE (found);
 
   image = [[EmacsImage alloc] initByReferencingFile:
                      [NSString stringWithLispString: found]];
-- 
2.31.1


[-- Attachment #4: image-non-ascii-filename-STRING_SET_MULTIBYTE-linux.png --]
[-- Type: image/png, Size: 82170 bytes --]