From 59759cc88e81bc4a0dffb3d7d25abd776f1c9e75 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Fri, 26 Feb 2010 11:43:05 +0000
Subject: [PATCH] make current_stream file name ISO friendly.

---
 C/iopreds.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/C/iopreds.c b/C/iopreds.c
index 11dab9074..6044d8f06 100755
--- a/C/iopreds.c
+++ b/C/iopreds.c
@@ -2386,7 +2386,10 @@ p_open (void)
   st->linecount = 1;
   st->linepos = 0;
   st->u.file.name = Yap_LookupAtom (Yap_FileNameBuf);
-  st->u.file.user_name = file_name;
+  if (IsAtomTerm(Deref(ARG6)))
+    st->u.file.user_name = Deref(ARG6);
+  else
+    st->u.file.user_name = file_name;
   st->stream_putc = FilePutc;
   st->stream_wputc = put_wchar;
   st->stream_getc = PlGetc;
@@ -3201,10 +3204,7 @@ StreamName(int i)
     if (Stream[i].status & InMemory_Stream_f)
       return(MkAtomTerm(AtomCharsio));
     else {
-      if (yap_flags[LANGUAGE_MODE_FLAG] == ISO_CHARACTER_ESCAPES) {
-	return(Stream[i].u.file.user_name);
-      } else
-	return(MkAtomTerm(Stream[i].u.file.name));
+      return(Stream[i].u.file.user_name);
     }
 }