cwfs: fix listen filedescriptor leaks

[plan9front.git] / sys / src / cmd / xd.c

diff --git a/sys/src/cmd/xd.c b/sys/src/cmd/xd.c
index 71726569b7c1e6ee8da346bdea607e23a9033b40..76d08df444ace6159eededde7fbb69705d094ce2 100644 (file)
--- a/sys/src/cmd/xd.c
+++ b/sys/src/cmd/xd.c
@@ -58,6 +58,13 @@ char *afmt[2][3] = {
 Biobuf bin;
 Biobuf bout;
 
+int
+flushout(Biobufhdr *bp, void *v, long n)
+{
+       Bflush(&bout);
+       return read(bp->fid, v, n);
+}
+
 void
 main(int argc, char *argv[])
 {
@@ -206,6 +213,7 @@ xd(char *name, int title)
                bp = &bin;
                Binit(bp, fd, OREAD);
        }
+       if(flush) Biofn(bp, flushout);
        Blethal(bp, nil);
        if(title)
                xprint("%s\n", name);
@@ -237,15 +245,11 @@ xd(char *name, int title)
                        xprint(ap->afmt, addr);
                        (*ap->fn)(ap->fmt);
                        xprint("\n", 0);
-                       if(flush)
-                               Bflush(&bout);
                }
                addr += ndata;
                if(ndata<16){
                        xprint(afmt[0][abase], addr);
                        xprint("\n", 0);
-                       if(flush)
-                               Bflush(&bout);
                        break;
                }
        }