Partially sync files.el from XEmacs 21.5 for wildcard support.

[sxemacs] / src / fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index bae112a..4a15934 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -35,6 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #ifdef FILE_CODING
 #include "mule/file-coding.h"
 #endif
+#include "ent/ent.h"
 
 #ifdef HAVE_LIBGEN_H           /* Must come before sysfile.h */
 #include <libgen.h>
@@ -1034,7 +1035,7 @@ See also the function `substitute-in-file-name'.
                        file_name_as_directory((char *)target, (char *)newdir, tlen);
        }
 
-       xstrncat((char *)target, (char *)nm, tlen);
+       xstrncat((char *)target, (char *)nm, tlen-1);
 
        /* ASSERT (IS_DIRECTORY_SEP (target[0])) if not VMS */
 
@@ -1544,7 +1545,7 @@ A prefix arg makes KEEP-TIME non-nil.
                                 O_RDONLY | OPEN_BINARY, 0);
        if (ifd < 0) {
                report_file_error("Opening input file", list1(filename));
-               return;
+               goto end;
        }
        record_unwind_protect(close_file_unwind, make_int(ifd));
 
@@ -1617,6 +1618,7 @@ A prefix arg makes KEEP-TIME non-nil.
                unbind_to(speccount, Qnil);
        }
 
+end:
        UNGCPRO;
        return Qnil;
 }