From 1e726581efcb9e0482f7f9538139a202f5740e1e Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 14 Nov 2018 18:46:16 -0700
Subject: [PATCH] io: TCP port does not count as a file-stream port

---
 racket/src/io/demo.rkt             |  6 +++---
 racket/src/io/network/tcp-port.rkt |  4 ++++
 racket/src/io/port/fd-port.rkt     | 11 +++++++----
 racket/src/io/port/file-stream.rkt |  7 ++++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/racket/src/io/demo.rkt b/racket/src/io/demo.rkt
index 5370dbaab2..3e696a7f7e 100644
--- a/racket/src/io/demo.rkt
+++ b/racket/src/io/demo.rkt
@@ -15,9 +15,6 @@
 (current-directory (host:path->string (host:current-directory)))
 (set-string->number?! string->number)
 
-(get-machine-info)
-(exit)
-
 (define-syntax-rule (test expect rhs)
   (let ([e expect]
         [v rhs])
@@ -686,6 +683,9 @@
 (test l (sync l))
 (define-values (tai tao) (tcp-accept l))
 
+(test #f (file-stream-port? i))
+(test #f (file-stream-port? o))
+
 (test 6 (write-string "hello\n" to))
 (flush-output to)
 (test "hello" (read-line tai))
diff --git a/racket/src/io/network/tcp-port.rkt b/racket/src/io/network/tcp-port.rkt
index e74d2fde24..3feb48de2a 100644
--- a/racket/src/io/network/tcp-port.rkt
+++ b/racket/src/io/network/tcp-port.rkt
@@ -22,10 +22,12 @@
         (lambda (fd name)
           (open-input-fd fd name
                          #:extra-data (tcp-data #f #t)
+                         #:file-stream? #f
 			 #:network-error? #t))
         (lambda (fd name)
           (open-output-fd fd name
                           #:extra-data (tcp-data #t #f)
+                          #:file-stream? #f
 			  #:network-error? #t)))))
 
 (define (open-input-output-tcp fd name #:close? [close? #t])
@@ -40,6 +42,7 @@
                     (unless (tcp-data-abandon-in? extra-data)
                       (rktio_socket_shutdown rktio fd RKTIO_SHUTDOWN_READ)))
                   #:fd-refcount refcount
+                  #:file-stream? #f
 		  #:network-error? #t)
    (open-output-fd fd name
                    #:extra-data extra-data
@@ -50,6 +53,7 @@
                        (rktio_socket_shutdown rktio fd RKTIO_SHUTDOWN_WRITE)))
                    #:fd-refcount refcount
                    #:buffer-mode 'block
+                   #:file-stream? #f
 		   #:network-error? #t)))
 
 (define (port-tcp-data p)
diff --git a/racket/src/io/port/fd-port.rkt b/racket/src/io/port/fd-port.rkt
index ae263d4bf6..05418038fd 100644
--- a/racket/src/io/port/fd-port.rkt
+++ b/racket/src/io/port/fd-port.rkt
@@ -24,8 +24,9 @@
          fd-port-fd
          maybe-fd-data-extra)
 
-(struct fd-data (fd extra input?)
-  #:property prop:file-stream (lambda (fdd) (fd-data-fd fdd))
+(struct fd-data (fd extra input? file-stream?)
+  #:property prop:file-stream (lambda (fdd) (and (fd-data-file-stream? fdd)
+                                                 (fd-data-fd fdd)))
   #:property prop:data-place-message (lambda (port)
                                        (lambda ()
                                          (fd-port->place-message port))))
@@ -62,11 +63,12 @@
                        #:on-close [on-close void]
                        #:fd-refcount [fd-refcount (box 1)]
                        #:custodian [cust (current-custodian)]
+                       #:file-stream? [file-stream? #t]
 		       #:network-error? [network-error? #f])
   (define-values (port buffer-control)
     (open-input-peek-via-read
      #:name name
-     #:data (fd-data fd extra-data #t)
+     #:data (fd-data fd extra-data #t file-stream?)
      #:read-in
      ;; in atomic mode
      (lambda (dest-bstr start end copy?)
@@ -108,6 +110,7 @@
                         #:on-close [on-close void]
                         #:plumber [plumber (current-plumber)]
                         #:custodian [cust (current-custodian)]
+                        #:file-stream? [file-stream? #t]
 			#:network-error? [network-error? #f])
   (define buffer (make-bytes 4096))
   (define buffer-start 0)
@@ -175,7 +178,7 @@
   (define port
     (make-core-output-port
      #:name name
-     #:data (fd-output-data fd extra-data #f
+     #:data (fd-output-data fd extra-data #f file-stream?
                             ;; Flush function needed for `file-truncate`:
                             (lambda ()
                               (atomically
diff --git a/racket/src/io/port/file-stream.rkt b/racket/src/io/port/file-stream.rkt
index 763797893f..337e3886aa 100644
--- a/racket/src/io/port/file-stream.rkt
+++ b/racket/src/io/port/file-stream.rkt
@@ -7,12 +7,12 @@
          file-stream-ref
          file-stream-port?)
 
-;; Property value should be a funciton that returns a file descriptor
+;; Property value should be a function that returns a file descriptor
 (define-values (prop:file-stream file-stream? file-stream-ref)
   (make-struct-type-property 'file-stream))
 
 (define (file-stream-port? p)
-  (file-stream?
+  (file-stream-ref
    (core-port-data
     (cond
       [(input-port? p) (->core-input-port p)]
@@ -20,4 +20,5 @@
       [else
        (raise-argument-error 'file-stream-port?
                              "port?"
-                             p)]))))
+                             p)]))
+   #f))