(Fexpand_file_name): Fix previous change.

2 files changed, 12 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 607cc02fa25..3c67529536c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-21  Kenichi Handa  <handa@etlken2>
+
+        * fileio.c (Fexpand_file_name): Fix previous change.
+
 2003-03-19  Kenichi Handa  <handa@etlken2>
 
         * fileio.c (Ffile_name_directory): Reconstruct file name by
diff --git a/src/fileio.c b/src/fileio.c
index a75a0e22b75..4f85aa1d6ad 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1289,20 +1289,20 @@ See also the function `substitute-in-file-name'.  */)
           if (IS_DIRECTORY_SEP (nm[1]))
             {
               if (strcmp (nm, SDATA (name)) != 0)
-                name
-                  = make_specified_string (nm, -1, strlen (nm),
-                                           STRING_MULTIBYTE (name));
+                name = make_specified_string (nm, -1, strlen (nm),
+                                              STRING_MULTIBYTE (name));
             }
           else
 #endif
           /* drive must be set, so this is okay */
           if (strcmp (nm - 2, SDATA (name)) != 0)
             {
-              name
-                = make_specified_string (nm, -1, strlen (nm),
-                                         STRING_MULTIBYTE (name));
-              SSET (name, 0, DRIVE_LETTER (drive));
-              SSET (name, 1, ':');
+              char temp[] = " :";
+
+              name = make_specified_string (nm, -1, p - nm,
+                                            STRING_MULTIBYTE (name));
+              temp[0] = DRIVE_LETTER (drive);
+              name = concat2 (build_string (temp), name);
             }
           return name;
 #else /* not DOS_NT */