BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / printf / printf.c

diff --git a/usr/src/usr.bin/printf/printf.c b/usr/src/usr.bin/printf/printf.c
index 4b6529c..58dcaa9 100644 (file)
--- a/usr/src/usr.bin/printf/printf.c
+++ b/usr/src/usr.bin/printf/printf.c
@@ -3,12 +3,14 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. Neither the name of the University nor the names of its
+ * contributors may be used to endorse or promote products derived

  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED


@@ -22,7 +24,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)printf.c   5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)printf.c   5.9 (Berkeley) 6/1/90";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -31,13 +33,13 @@ static char sccsid[] = "@(#)printf.c        5.3 (Berkeley) %G%";
 #define PF(f, func) { \
        if (fieldwidth) \
                if (precision) \
 #define PF(f, func) { \
        if (fieldwidth) \
                if (precision) \

-                       cnt += printf(f, fieldwidth, precision, func); \
+                       (void)printf(f, fieldwidth, precision, func); \

                else \
                else \

-                       cnt += printf(f, fieldwidth, func); \
+                       (void)printf(f, fieldwidth, func); \

        else if (precision) \
        else if (precision) \

-               cnt += printf(f, precision, func); \
+               (void)printf(f, precision, func); \

        else \
        else \

-               cnt += printf(f, func); \
+               (void)printf(f, func); \

 }
 
 char **gargv;
 }
 
 char **gargv;


@@ -48,14 +50,14 @@ main(argc, argv)
 {
        static char *skip1, *skip2;
        register char *format, *fmt, *start;
 {
        static char *skip1, *skip2;
        register char *format, *fmt, *start;

-       register int end, cnt, fieldwidth, precision;
+       register int end, fieldwidth, precision;

        char convch, nextch, *getstr(), *index(), *mklong();
        double getdouble();
        long getlong();
 
        if (argc < 2) {
                fprintf(stderr, "usage: printf format [arg ...]\n");
        char convch, nextch, *getstr(), *index(), *mklong();
        double getdouble();
        long getlong();
 
        if (argc < 2) {
                fprintf(stderr, "usage: printf format [arg ...]\n");

-               exit(0);
+               exit(1);

        }
 
        /*
        }
 
        /*


@@ -71,7 +73,7 @@ main(argc, argv)
 
        escape(fmt = format = *++argv);         /* backslash interpretation */
        gargv = ++argv;
 
        escape(fmt = format = *++argv);         /* backslash interpretation */
        gargv = ++argv;

-       for (cnt = 0;;) {
+       for (;;) {

                end = 0;
                /* find next format specification */
 next:          for (start = fmt;; ++fmt) {
                end = 0;
                /* find next format specification */
 next:          for (start = fmt;; ++fmt) {


@@ -80,36 +82,41 @@ next:               for (start = fmt;; ++fmt) {
                                if (end == 1) {
                                        fprintf(stderr,
                                            "printf: missing format character.\n");
                                if (end == 1) {
                                        fprintf(stderr,
                                            "printf: missing format character.\n");

-                                       exit(0);
+                                       exit(1);

                                }
                                end = 1;
                                if (fmt > start)
                                }
                                end = 1;
                                if (fmt > start)

-                                       cnt += printf("%s", start);
+                                       (void)printf("%s", start);

                                if (!*gargv)
                                if (!*gargv)

-                                       exit(cnt);
+                                       exit(0);

                                fmt = format;
                                goto next;
                        }
                        /* %% prints a % */
                                fmt = format;
                                goto next;
                        }
                        /* %% prints a % */

-                       if (*fmt == '%' && *++fmt != '%')
-                               break;
+                       if (*fmt == '%') {
+                               if (*++fmt != '%')
+                                       break;
+                               *fmt++ = '\0';
+                               (void)printf("%s", start);
+                               goto next;
+                       }

                }
 
                /* skip to field width */
                for (; index(skip1, *fmt); ++fmt);
                }
 
                /* skip to field width */
                for (; index(skip1, *fmt); ++fmt);

-               if (*fmt == '*')
-                       fieldwidth = getint();
-               /* skip to possible '.' */
+               fieldwidth = *fmt == '*' ? getint() : 0;
+
+               /* skip to possible '.', get following precision */

                for (; index(skip2, *fmt); ++fmt);
                if (*fmt == '.')
                        ++fmt;
                for (; index(skip2, *fmt); ++fmt);
                if (*fmt == '.')
                        ++fmt;

-               if (*fmt == '*')
-                       precision = getint();
+               precision = *fmt == '*' ? getint() : 0;
+

                /* skip to conversion char */
                for (; index(skip2, *fmt); ++fmt);
                if (!*fmt) {
                        fprintf(stderr, "printf: missing format character.\n");
                /* skip to conversion char */
                for (; index(skip2, *fmt); ++fmt);
                if (!*fmt) {
                        fprintf(stderr, "printf: missing format character.\n");

-                       exit(-1);
+                       exit(1);

                }
 
                convch = *fmt;
                }
 
                convch = *fmt;


@@ -139,7 +146,7 @@ next:               for (start = fmt;; ++fmt) {
                }
                default:
                        fprintf(stderr, "printf: illegal format character.\n");
                }
                default:
                        fprintf(stderr, "printf: illegal format character.\n");

-                       exit(-1);
+                       exit(1);

                }
                *fmt = nextch;
        }
                }
                *fmt = nextch;
        }


@@ -156,7 +163,7 @@ mklong(str, ch)
        len = strlen(str) + 2;
        if (!(copy = malloc((u_int)len))) {     /* never freed; XXX */
                fprintf(stderr, "printf: out of memory.\n");
        len = strlen(str) + 2;
        if (!(copy = malloc((u_int)len))) {     /* never freed; XXX */
                fprintf(stderr, "printf: out of memory.\n");

-               exit(-1);
+               exit(1);

        }
        bcopy(str, copy, len - 3);
        copy[len - 3] = 'l';
        }
        bcopy(str, copy, len - 3);
        copy[len - 3] = 'l';


@@ -240,7 +247,7 @@ getstr()
        return(*gargv++);
 }
 
        return(*gargv++);
 }
 

-static char *number = "+-0123456789";
+static char *number = "+-.0123456789";

 getint()
 {
        if (!*gargv)
 getint()
 {
        if (!*gargv)


@@ -258,7 +265,7 @@ getlong()
        if (!*gargv)
                return((long)0);
        if (index(number, **gargv))
        if (!*gargv)
                return((long)0);
        if (index(number, **gargv))

-               return(atol(*gargv++));
+               return(strtol(*gargv++, (char **)NULL, 0));

        return((long)asciicode());
 }
 
        return((long)asciicode());
 }