# HG changeset patch
# User boisy
# Date 1046728762 0
# Node ID b8608857a4a25d7a7089ec20c9272ad4df81cc1a
# Parent  3894be93958b1b8781f78b2c6443c68b36bef9e5
Fixed header problem

diff -r 3894be93958b -r b8608857a4a2 level1/cmds/dump.asm
--- a/level1/cmds/dump.asm	Thu Feb 27 14:56:21 2003 +0000
+++ b/level1/cmds/dump.asm	Mon Mar 03 21:59:22 2003 +0000
@@ -20,6 +20,8 @@
 *        Removed -d option                              BGP 03/01/17
 *        Narrow screen now shows properly, only dumps   BGP 03/01/21
 *        16 bits worth of address data to make room.
+*        Fixed bug where header would be shown even if  BGP 03/03/03
+*        there was no data in a file.
 
          nam   Dump
          ttl   Show file contents in hex
@@ -31,7 +33,7 @@
 * Tweakable options
 DOSCSIZ  set   1	1 = include SS.ScSiz code, 0 = leave out
 DOHELP   set   0	1 = include help message, 0 = leave out
-BufSz    set   80        
+BUFSZ    set   80        
 
 tylg     set   Prgrm+Objct
 atrv     set   ReEnt+rev
@@ -238,7 +240,11 @@
          ENDC
 flpag    tstb            
          bne   nohed     
-         leax  caret,pcr
+         lbsr  iseof
+         bcc   flpag2
+         ldx   <D.Prm    
+         rts
+flpag2   leax  caret,pcr
          lbsr  print     
          ldb   #16       
          leax  title,pcr 
@@ -262,9 +268,11 @@
          lda   #3        
          mul             
          addd  #2        
+         IFNE  DOSCSIZ
          tst   <narrow
          beq   leayit
          subd  #4
+         ENDC
 leayit   leay  d,x       
          sty   <D.Txt    
          lda   #C$SPAC   
@@ -273,10 +281,12 @@
          decb            
          bpl   clbuf     
          ldb   #D.Adr    
+         IFNE  DOSCSIZ
          tst   <narrow
          beq   adlop
          incb				we skip first two bytes ...
          incb				... if on a narrow screen
+         ENDC
 adlop    lda   b,u       
          lbsr  onbyt     
          incb            
@@ -293,10 +303,12 @@
          lbsr  onchr     
          decb
          ble   enlin     
+         IFNE  DOSCSIZ
          tst   <narrow
          bne   onlin
+         ENDC
          lda   #C$SPAC   
-         bsr   savec     
+         lbsr  savec     
          bra   onlin     
 enlin    lda   #C$CR     
          ldx   <D.Txt    
@@ -322,12 +334,9 @@
          bcs   reded     
          tfr   y,d       
 reded    rts             
-redad    ldd   <D.End    
-         ldx   <D.Beg    
-         subd  <D.Beg    
-         bne   setct     
-         coma            
-         ldb   #E$EOF    
+
+redad    bsr   iseofm
+         bcc   setct
          rts             
 setct    subd  <D.Len    
          bcs   redof     
@@ -338,6 +347,7 @@
          leay  d,x       
          sty   <D.Beg    
          rts             
+
 eofck    cmpb  #E$EOF    
          orcc  #Carry    
          lbne  DoExit     
@@ -345,6 +355,25 @@
          ldx   <D.Prm    
          rts
 
+iseof    tst   <D.Mem    
+         bne   iseofm
+         lda   <D.Opn
+         ldb   #SS.EOF
+         os9   I$GetStt
+         cmpb  #E$EOF
+         beq   iseofex
+         clrb
+iseofok  rts
+iseofex  orcc  #Carry
+         ldb   #E$EOF
+         rts
+iseofm   ldd   <D.End
+         ldx   <D.Beg    
+         subd  <D.Beg    
+         beq   iseofex
+         andcc  #^Carry
+         rts             
+
 onibl    anda  #15       
          cmpa  #9        
          bls   nocom