modify for use within /bin/sh

[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 3e0d504..ea1f68a 100644 (file)
--- a/usr/src/usr.bin/printf/printf.c
+++ b/usr/src/usr.bin/printf/printf.c
@@ -2,31 +2,35 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * 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
- * 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
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
  */
 

+#if ! defined(BUILTIN) && ! defined(SHELL)

 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1989 The Regents of the University of California.\n\
  All rights reserved.\n";
 #endif /* not lint */
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1989 The Regents of the University of California.\n\
  All rights reserved.\n";
 #endif /* not lint */

+#endif

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)printf.c   5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)printf.c   5.11 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+

 #include <sys/types.h>
 #include <sys/types.h>

+#include <errno.h>
+#ifndef SHELL

 #include <stdio.h>
 #include <stdio.h>

+#endif
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef SHELL
+#define main printfcmd
+#define err error
+#include "/usr/src/devel/sh/bltin/bltin.h"
+#endif

 
 #define PF(f, func) { \
        if (fieldwidth) \
 
 #define PF(f, func) { \
        if (fieldwidth) \


@@ -40,22 +44,37 @@ static char sccsid[] = "@(#)printf.c        5.5 (Berkeley) %G%";
                (void)printf(f, func); \
 }
 
                (void)printf(f, func); \
 }
 

-char **gargv;
+static int      asciicode __P((void));
+#ifndef SHELL
+static void     err __P((const char *fmt, ...));
+#endif
+static void     escape __P((char *));
+static int      getchr __P((void));
+static double   getdouble __P((void));
+static int      getint __P((void));
+static long     getlong __P((void));
+static char    *getstr __P((void));
+static char    *mklong __P((char *, int));

 
 

+static char **gargv;
+
+int
+#ifdef BUILTIN
+progprintf(argc, argv)
+#else

 main(argc, argv)
 main(argc, argv)

+#endif

        int argc;
        char **argv;
 {
        static char *skip1, *skip2;
        register char *format, *fmt, *start;
        register int end, fieldwidth, precision;
        int argc;
        char **argv;
 {
        static char *skip1, *skip2;
        register char *format, *fmt, *start;
        register int end, fieldwidth, precision;

-       char convch, nextch, *getstr(), *index(), *mklong();
-       double getdouble();
-       long getlong();
+       char convch, nextch;

 
        if (argc < 2) {
 
        if (argc < 2) {

-               fprintf(stderr, "usage: printf format [arg ...]\n");
-               exit(1);
+               (void)fprintf(stderr, "usage: printf format [arg ...]\n");
+               return (1);

        }
 
        /*
        }
 
        /*


@@ -78,21 +97,25 @@ next:               for (start = fmt;; ++fmt) {
                        if (!*fmt) {
                                /* avoid infinite loop */
                                if (end == 1) {
                        if (!*fmt) {
                                /* avoid infinite loop */
                                if (end == 1) {

-                                       fprintf(stderr,
-                                           "printf: missing format character.\n");
-                                       exit(1);
+                                       err("missing format character");
+                                       return (1);

                                }
                                end = 1;
                                if (fmt > start)
                                        (void)printf("%s", start);
                                if (!*gargv)
                                }
                                end = 1;
                                if (fmt > start)
                                        (void)printf("%s", start);
                                if (!*gargv)

-                                       exit(0);
+                                       return (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 */
                }
 
                /* skip to field width */


@@ -108,8 +131,8 @@ next:               for (start = fmt;; ++fmt) {
                /* skip to conversion char */
                for (; index(skip2, *fmt); ++fmt);
                if (!*fmt) {
                /* skip to conversion char */
                for (; index(skip2, *fmt); ++fmt);
                if (!*fmt) {

-                       fprintf(stderr, "printf: missing format character.\n");
-                       exit(1);
+                       err("missing format character");
+                       return (1);

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


@@ -117,47 +140,54 @@ next:             for (start = fmt;; ++fmt) {
                *fmt = '\0';
                switch(convch) {
                case 'c': {
                *fmt = '\0';
                switch(convch) {
                case 'c': {

-                       char p = getchr();
+                       char p;
+
+                       p = getchr();

                        PF(start, p);
                        break;
                }
                case 's': {
                        PF(start, p);
                        break;
                }
                case 's': {

-                       char *p = getstr();
+                       char *p;
+
+                       p = getstr();

                        PF(start, p);
                        break;
                }
                case 'd': case 'i': case 'o': case 'u': case 'x': case 'X': {
                        PF(start, p);
                        break;
                }
                case 'd': case 'i': case 'o': case 'u': case 'x': case 'X': {

-                       char *f = mklong(start, convch);
-                       long p = getlong();
+                       long p;
+                       char *f;
+                       
+                       if ((f = mklong(start, convch)) == NULL)
+                               return (1);
+                       p = getlong();

                        PF(f, p);
                        break;
                }
                case 'e': case 'E': case 'f': case 'g': case 'G': {
                        PF(f, p);
                        break;
                }
                case 'e': case 'E': case 'f': case 'g': case 'G': {

-                       double p = getdouble();
+                       double p;
+
+                       p = getdouble();

                        PF(start, p);
                        break;
                }
                default:
                        PF(start, p);
                        break;
                }
                default:

-                       fprintf(stderr, "printf: illegal format character.\n");
-                       exit(1);
+                       err("illegal format character.\n");
+                       return (1);

                }
                *fmt = nextch;
        }
        /* NOTREACHED */
 }
 
                }
                *fmt = nextch;
        }
        /* NOTREACHED */
 }
 

-char *
+static char *

 mklong(str, ch)
 mklong(str, ch)

-       char *str, ch;
+       char *str;
+       int ch;

 {
 {

+       static char copy[64];

        int len;
        int len;

-       char *copy, *malloc();

 
        len = strlen(str) + 2;
 
        len = strlen(str) + 2;

-       if (!(copy = malloc((u_int)len))) {     /* never freed; XXX */
-               fprintf(stderr, "printf: out of memory.\n");
-               exit(1);
-       }

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


@@ -165,6 +195,7 @@ mklong(str, ch)
        return(copy);
 }
 
        return(copy);
 }
 

+static void

 escape(fmt)
        register char *fmt;
 {
 escape(fmt)
        register char *fmt;
 {


@@ -225,14 +256,15 @@ escape(fmt)
        *store = '\0';
 }
 
        *store = '\0';
 }
 

+static int

 getchr()
 {
        if (!*gargv)
 getchr()
 {
        if (!*gargv)

-               return((int)'\0');
+               return('\0');

        return((int)**gargv++);
 }
 
        return((int)**gargv++);
 }
 

-char *
+static char *

 getstr()
 {
        if (!*gargv)
 getstr()
 {
        if (!*gargv)


@@ -240,43 +272,41 @@ getstr()
        return(*gargv++);
 }
 
        return(*gargv++);
 }
 

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

 getint()
 {
        if (!*gargv)
                return(0);
 getint()
 {
        if (!*gargv)
                return(0);

-       if (index(number, **gargv))
+       if (index(Number, **gargv))

                return(atoi(*gargv++));
        return(asciicode());
 }
 
                return(atoi(*gargv++));
        return(asciicode());
 }
 

-long
+static long

 getlong()
 {
 getlong()
 {

-       long atol();
-

        if (!*gargv)
                return((long)0);
        if (!*gargv)
                return((long)0);

-       if (index(number, **gargv))
-               return(atol(*gargv++));
+       if (index(Number, **gargv))
+               return(strtol(*gargv++, (char **)NULL, 0));

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

-double
+static double

 getdouble()
 {
 getdouble()
 {

-       double atof();
-

        if (!*gargv)
                return((double)0);
        if (!*gargv)
                return((double)0);

-       if (index(number, **gargv))
+       if (index(Number, **gargv))

                return(atof(*gargv++));
        return((double)asciicode());
 }
 
                return(atof(*gargv++));
        return((double)asciicode());
 }
 

+static int

 asciicode()
 {
 asciicode()
 {

-       register char ch;
+       register int ch;

 
        ch = **gargv;
        if (ch == '\'' || ch == '"')
 
        ch = **gargv;
        if (ch == '\'' || ch == '"')


@@ -284,3 +314,32 @@ asciicode()
        ++gargv;
        return(ch);
 }
        ++gargv;
        return(ch);
 }

+
+#ifndef SHELL
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+static void
+#if __STDC__
+err(const char *fmt, ...)
+#else
+err(fmt, va_alist)
+       char *fmt;
+       va_dcl
+#endif
+{
+       va_list ap;
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       (void)fprintf(stderr, "printf: ");
+       (void)vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       (void)fprintf(stderr, "\n");
+}
+#endif /* !SHELL */