From d5c36d66e4e50fc3c6ab76e3ebe5af46d1ef44e1 Mon Sep 17 00:00:00 2001 From: Olaf Barthel Date: Sat, 2 Apr 2005 18:02:54 +0000 Subject: [PATCH] - We now call IsInteractive() rather than send a type ACTION_DISK_INFO to a likely console handler file's MsgPort. git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14911 87f5fb63-7c3d-0410-a384-fd976d0f7a62 --- library/changes | 4 +--- library/stdio_fdhookentry.c | 24 ++---------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/library/changes b/library/changes index 357b03a..211a517 100644 --- a/library/changes +++ b/library/changes @@ -30,9 +30,7 @@ the "real" ones were closed and only their former aliases remain. - Invoking fstat() on what maps to a con-handler stream now produces - information identifying it as a character special file. Side-effect: - if the input/output went to a CON:/AUTO window, that window will - pop open and stay open. + information identifying it as a character special file. c.lib 1.190 (25.3.2005) diff --git a/library/stdio_fdhookentry.c b/library/stdio_fdhookentry.c index 6fb70d4..15a70df 100644 --- a/library/stdio_fdhookentry.c +++ b/library/stdio_fdhookentry.c @@ -1,5 +1,5 @@ /* - * $Id: stdio_fdhookentry.c,v 1.26 2005-04-02 13:25:53 obarthel Exp $ + * $Id: stdio_fdhookentry.c,v 1.27 2005-04-02 18:02:54 obarthel Exp $ * * :ts=4 * @@ -52,16 +52,6 @@ /****************************************************************************/ -#ifndef ID_CON -#define ID_CON (0x434F4E00L) -#endif /* ID_CON */ - -#ifndef ID_RAWCON -#define ID_RAWCON (0x52415700L) -#endif /* ID_RAWCON */ - -/****************************************************************************/ - int __fd_hook_entry( struct fd * fd, @@ -581,7 +571,6 @@ __fd_hook_entry( if(CANNOT __safe_examine_file_handle(file,fam->fam_FileInfo)) { - D_S(struct InfoData,id); LONG error; /* So that didn't work. Did the file system simply fail to @@ -598,16 +587,7 @@ __fd_hook_entry( /* OK, let's have another look at this file. Could it be a console stream? */ - if(CANNOT DoPkt(fh->fh_Type,ACTION_DISK_INFO,MKBADDR(id), 0,0,0,0)) - { - SHOWMSG("couldn't examine the file"); - - fam->fam_Error = __translate_io_error_to_errno(IoErr()); - goto out; - } - - if(id->id_DiskType != ID_CON && - id->id_DiskType != ID_RAWCON) + if(NOT IsInteractive(file)) { SHOWMSG("whatever it is, we don't know");