Implement a much more capable vuprintf()

New support as well as some buggy support fixed.

Still no floating point support if ever that would be desired.

Support (*):
* Flags: '-', '+', ' ', '#', '0'

* Width and precision: 'n', '.n', '*' and '.*'

* Length modifiers: 'hh', 'h', 'j', 'l', 'll', 't', 'z'

* Radix: 'c', 'd', 'i', 'n', 'o', 'p/P', 's', 'u', 'x/X'

(*) Provision exists to switch lesser-used stuff on or off or when
certain functionality isn't desired (bootloader?). The compulsory
radixes are everything but 'o', 'n', 'p/P' and 'x/X' with length
modifiers being optional. The default setup is 'l', 'z', 'c', 'd',
'p/P', 's', 'u', 'x/X'.

* Move fdprintf() to its own file. It was in a strange place.

* Make callers compatible and fix a couple snprintf() bugs while
at it.

Could smush it down in size but I'm gonna get over the binsize
neurosis and just the let optimizer do its thing.

Change-Id: Ibdc613a9b6775802c188b29b9dd46c568c94f7c3

1 files changed, 0 insertions, 267 deletions

diff --git a/firmware/common/format.c b/firmware/common/format.c
deleted file mode 100644
index 60c50cc..0000000
--- a/firmware/common/format.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 by Gary Czvitkovicz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <limits.h>
-#include <string.h>
-#include "file.h"
-#include "format.h"
-
-static const char hexdigit[] = "0123456789ABCDEF";
-
-void format(
-    /* call 'push()' for each output letter */
-    int (*push)(void *userp, unsigned char data),
-    void *userp,
-    const char *fmt,
-    va_list ap)
-{
-    char *str;
-    char tmpbuf[12], pad;
-    int ch, width, val, sign, precision;
-    long lval, lsign;
-    unsigned int uval;
-    unsigned long ulval;
-    size_t uszval;
-    ssize_t szval, szsign;
-    bool ok = true;
-
-    tmpbuf[sizeof tmpbuf - 1] = '\0';
-
-    while ((ch = *fmt++) != '\0' && ok)
-    {
-    if (ch == '%')
-    {
-        ch = *fmt++;
-        pad = ' ';
-        if (ch == '0')
-        pad = '0';
-
-        width = 0;
-        while (ch >= '0' && ch <= '9')
-        {
-        width = 10*width + ch - '0';
-        ch = *fmt++;
-        }
-        
-        precision = 0;
-        if(ch == '.')
-        {
-            ch = *fmt++;
-            while (ch >= '0' && ch <= '9')
-            {
-                precision = 10*precision + ch - '0';
-                ch = *fmt++;
-            }
-        } else {
-            precision = INT_MAX;
-        }
-
-        str = tmpbuf + sizeof tmpbuf - 1;
-        switch (ch)
-        {
-        case 'c':
-            *--str = va_arg (ap, int);
-            break;
-
-        case 's':
-            str = va_arg (ap, char*);
-            break;
-
-        case 'd':
-            val = sign = va_arg (ap, int);
-            if (val < 0)
-            val = -val;
-            do
-            {
-            *--str = (val % 10) + '0';
-            val /= 10;
-            }
-            while (val > 0);
-            if (sign < 0)
-            *--str = '-';
-            break;
-
-        case 'u':
-            uval = va_arg(ap, unsigned int);
-            do
-            {
-            *--str = (uval % 10) + '0';
-            uval /= 10;
-            }
-            while (uval > 0);
-            break;
-        case 'p':
-        case 'P':
-            /* for pointers prepend 0x and act like 'X' */
-            push(userp, '0');
-            push(userp, 'x');
-            /* fall through */
-        case 'x':
-        case 'X':
-            pad='0';
-            uval = va_arg (ap, int);
-            do
-            {
-            *--str = hexdigit[uval & 0xf];
-            uval >>= 4;
-            }
-            while (uval);
-            break;
-
-        case 'l':
-            ch = *fmt++;
-            switch(ch) {
-                case 'x':
-                case 'X':
-                    pad='0';
-                    ulval = va_arg (ap, long);
-                    do
-                    {
-                        *--str = hexdigit[ulval & 0xf];
-                        ulval >>= 4;
-                    }
-                    while (ulval);
-                    break;
-                case 'd':
-                    lval = lsign = va_arg (ap, long);
-                    if (lval < 0)
-                        lval = -lval;
-                    do
-                    {
-                        *--str = (lval % 10) + '0';
-                        lval /= 10;
-                    }
-                    while (lval > 0);
-                    if (lsign < 0)
-                        *--str = '-';
-                    break;
-
-                case 'u':
-                    ulval = va_arg(ap, unsigned long);
-                    do
-                    {
-                        *--str = (ulval % 10) + '0';
-                        ulval /= 10;
-                    }
-                    while (ulval > 0);
-                    break;
-
-                default:
-                    *--str = 'l';
-                    *--str = ch;
-            }
-
-            break;
-
-        case 'z':
-            ch = *fmt++;
-            switch(ch) {
-                case 'd':
-                    szval = szsign = va_arg (ap, ssize_t);
-                    if (szval < 0)
-                        szval = -szval;
-                    do
-                    {
-                        *--str = (szval % 10) + '0';
-                        szval /= 10;
-                    }
-                    while (szval > 0);
-                    if (szsign < 0)
-                        *--str = '-';
-                    break;
-
-                case 'u':
-                    uszval = va_arg(ap, size_t);
-                    do
-                    {
-                        *--str = (uszval % 10) + '0';
-                        uszval /= 10;
-                    }
-                    while (uszval > 0);
-                    break;
-
-                default:
-                    *--str = 'z';
-                    *--str = ch;
-            }
-
-            break;
-
-        default:
-            *--str = ch;
-            break;
-        }
-
-        if (width > 0)
-        {
-        width -= strlen (str);
-        while (width-- > 0 && ok)
-            ok=push(userp, pad);
-        }
-        while (*str != '\0' && ok && precision--)
-                ok=push(userp, *str++);
-    }
-    else
-        ok=push(userp, ch);
-    }
-}
-
-struct for_fprintf {
-    int fd;    /* where to store it */
-    int bytes; /* amount stored */
-};
-
-static int fprfunc(void *pr, unsigned char letter)
-{
-    struct for_fprintf *fpr  = (struct for_fprintf *)pr;
-    int rc = write(fpr->fd, &letter, 1);
-    
-    if(rc > 0) {
-        fpr->bytes++; /* count them */
-        return true;  /* we are ok */
-    }
-
-    return false; /* failure */
-}
-
-
-int fdprintf(int fd, const char *fmt, ...)
-{
-    va_list ap;
-    struct for_fprintf fpr;
-
-    fpr.fd=fd;
-    fpr.bytes=0;
-
-    va_start(ap, fmt);
-    format(fprfunc, &fpr, fmt, ap);
-    va_end(ap);
-
-    return fpr.bytes; /* return 0 on error */
-}
-
-void vuprintf(int (*push)(void *userp, unsigned char data), void *userp, const char *fmt, va_list ap)
-{
-    format(push, userp, fmt, ap);
-}