BSD 4_1_snap release

[unix-history] / usr / src / lib / libI77uc / wrtfmt.c

diff --git a/usr/src/lib/libI77uc/wrtfmt.c b/usr/src/lib/libI77uc/wrtfmt.c
index 4036b0d..c0a738f 100644 (file)
--- a/usr/src/lib/libI77uc/wrtfmt.c
+++ b/usr/src/lib/libI77uc/wrtfmt.c
@@ -1,9 +1,11 @@
 /*
 /*

+char id_wrtfmt[] = "@(#)wrtfmt.c       1.3";
+ *

  * formatted write routines
  */
 
 #include "fio.h"
  * formatted write routines
  */
 
 #include "fio.h"

-#include "fmt.h"
+#include "format.h"

 
 extern char *icvt();
 
 
 extern char *icvt();
 


@@ -34,7 +36,7 @@ w_ed(p,ptr,len) char *ptr; struct syl *p; ftnlen len;
        case F:
                return(wrt_F(ptr,p->p1,p->p2,len));
        default:
        case F:
                return(wrt_F(ptr,p->p1,p->p2,len));
        default:

-               return(errno=100);
+               return(errno=F_ERFMT);

        }
 }
 
        }
 }
 


@@ -65,7 +67,7 @@ w_ned(p,ptr) char *ptr; struct syl *p;
        case H:
                return(wrt_H(p->p1,p->p2));
        default:
        case H:
                return(wrt_H(p->p1,p->p2));
        default:

-               return(errno=100);
+               return(errno=F_ERFMT);

        }
 }
 
        }
 }
 


@@ -262,7 +264,7 @@ wrt_F(p,w,d,len) ufloat *p; ftnlen len;
        PUT('.')
        for(i=0; i< -dp && i<d; i++) PUT('0')
        for(;i<d;i++)
        PUT('.')
        for(i=0; i< -dp && i<d; i++) PUT('0')
        for(;i<d;i++)

-       {       if(x==0.0) PUT(' ')     /* exactly zero */
+       {       if(x==0.0 && !cblank) PUT(' ')  /* exactly zero */

                else if(*s) PUT(*s++)
                else PUT('0')
        }
                else if(*s) PUT(*s++)
                else PUT('0')
        }