X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=printf.c;h=d579a9b4e49069fd5e915588058e7db36cf62ec6;hb=063c1f54eae3e1dcb8dd5c00ba9bf802357d3cb9;hp=5be3a67cb696340b192ecb0d9efcbcc48df23df1;hpb=3fe39dce5d1a0b0946878c66bbd7f694c5aa38ea;p=oweals%2Fbusybox.git diff --git a/printf.c b/printf.c index 5be3a67cb..d579a9b4e 100644 --- a/printf.c +++ b/printf.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* printf - format and print data Copyright (C) 90, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. @@ -42,26 +43,23 @@ to convert all of the given arguments. David MacKenzie */ - + // 19990508 Busy Boxed! Dave Cinege -#include "internal.h" #include #include #include -#include -#include #include #include #include #include #include -#include +#include "busybox.h" #ifndef S_IFMT -# define S_IFMT 0170000 +static const int S_IFMT = 0170000; #endif #if !defined(S_ISBLK) && defined(S_IFBLK) # define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) @@ -84,444 +82,374 @@ #if !defined(S_ISSOCK) && defined(S_IFSOCK) # define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) #endif -#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ +#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ # define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) # define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) #endif -#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */ +#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */ # define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) #endif #define IN_CTYPE_DOMAIN(c) 1 -#ifdef isblank -# define ISBLANK(c) (IN_CTYPE_DOMAIN (c) && isblank (c)) -#else -# define ISBLANK(c) ((c) == ' ' || (c) == '\t') -#endif -#ifdef isgraph -# define ISGRAPH(c) (IN_CTYPE_DOMAIN (c) && isgraph (c)) -#else -# define ISGRAPH(c) (IN_CTYPE_DOMAIN (c) && isprint (c) && !isspace (c)) -#endif - -#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) -#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) -#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) -#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c)) -#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) -#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (c)) -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) -#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) #define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) #define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) -#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) +#define ISDIGIT(c) (((unsigned char) (c)) - '0' <= 9) #define isodigit(c) ((c) >= '0' && (c) <= '7') #define hextobin(c) ((c)>='a'&&(c)<='f' ? (c)-'a'+10 : (c)>='A'&&(c)<='F' ? (c)-'A'+10 : (c)-'0') #define octtobin(c) ((c) - '0') -static double xstrtod __P ((char *s)); -static int print_esc __P ((char *escstart)); -static int print_formatted __P ((char *format, int argc, char **argv)); -static long xstrtol __P ((char *s)); -static unsigned long xstrtoul __P ((char *s)); -static void print_direc __P ((char *start, size_t length, int field_width, int precision, char *argument)); -static void print_esc_char __P ((int c)); -static void print_esc_string __P ((char *str)); -static void verify __P ((char *s, char *end)); +static double xstrtod __P((char *s)); +static int print_esc __P((char *escstart)); +static int print_formatted __P((char *format, int argc, char **argv)); +static long xstrtol __P((char *s)); +static unsigned long xstrtoul __P((char *s)); +static void print_direc +__P( + + (char *start, size_t length, int field_width, int precision, + char *argument)); +static void print_esc_char __P((int c)); +static void print_esc_string __P((char *str)); +static void verify __P((char *s, char *end)); /* The value to return to the calling program. */ static int exit_status; -static const char printf_usage[] = "printf format [argument...]\n"; - -int -printf_main(int argc, char** argv) +int printf_main(int argc, char **argv) { - char *format; - int args_used; - - exit_status = 0; - if ( **(argv+1) == '-' ) { - usage (printf_usage); - } - - format = argv[1]; - argc -= 2; - argv += 2; - - do - { - args_used = print_formatted (format, argc, argv); - argc -= args_used; - argv += args_used; - } - while (args_used > 0 && argc > 0); + char *format; + int args_used; + + exit_status = 0; + if (argc <= 1 || **(argv + 1) == '-') { + show_usage(); + } + + format = argv[1]; + argc -= 2; + argv += 2; + + do { + args_used = print_formatted(format, argc, argv); + argc -= args_used; + argv += args_used; + } + while (args_used > 0 && argc > 0); /* if (argc > 0) fprintf(stderr, "excess args ignored"); */ - exit (exit_status); + return(exit_status); } /* Print the text in FORMAT, using ARGV (with ARGC elements) for arguments to any `%' directives. Return the number of elements of ARGV used. */ -static int -print_formatted (char *format, int argc, char **argv) +static int print_formatted(char *format, int argc, char **argv) { - int save_argc = argc; /* Preserve original value. */ - char *f; /* Pointer into `format'. */ - char *direc_start; /* Start of % directive. */ - size_t direc_length; /* Length of % directive. */ - int field_width; /* Arg to first '*', or -1 if none. */ - int precision; /* Arg to second '*', or -1 if none. */ - - for (f = format; *f; ++f) - { - switch (*f) - { - case '%': - direc_start = f++; - direc_length = 1; - field_width = precision = -1; - if (*f == '%') - { - putchar ('%'); - break; - } - if (*f == 'b') - { - if (argc > 0) - { - print_esc_string (*argv); - ++argv; - --argc; - } - break; - } - if (strchr ("-+ #", *f)) - { - ++f; - ++direc_length; - } - if (*f == '*') - { - ++f; - ++direc_length; - if (argc > 0) - { - field_width = xstrtoul (*argv); - ++argv; - --argc; - } - else - field_width = 0; - } - else - while (ISDIGIT (*f)) - { - ++f; - ++direc_length; - } - if (*f == '.') - { - ++f; - ++direc_length; - if (*f == '*') - { - ++f; - ++direc_length; - if (argc > 0) - { - precision = xstrtoul (*argv); - ++argv; - --argc; - } - else - precision = 0; + int save_argc = argc; /* Preserve original value. */ + char *f; /* Pointer into `format'. */ + char *direc_start; /* Start of % directive. */ + size_t direc_length; /* Length of % directive. */ + int field_width; /* Arg to first '*', or -1 if none. */ + int precision; /* Arg to second '*', or -1 if none. */ + + for (f = format; *f; ++f) { + switch (*f) { + case '%': + direc_start = f++; + direc_length = 1; + field_width = precision = -1; + if (*f == '%') { + putchar('%'); + break; + } + if (*f == 'b') { + if (argc > 0) { + print_esc_string(*argv); + ++argv; + --argc; + } + break; + } + if (strchr("-+ #", *f)) { + ++f; + ++direc_length; + } + if (*f == '*') { + ++f; + ++direc_length; + if (argc > 0) { + field_width = xstrtoul(*argv); + ++argv; + --argc; + } else + field_width = 0; + } else + while (ISDIGIT(*f)) { + ++f; + ++direc_length; + } + if (*f == '.') { + ++f; + ++direc_length; + if (*f == '*') { + ++f; + ++direc_length; + if (argc > 0) { + precision = xstrtoul(*argv); + ++argv; + --argc; + } else + precision = 0; + } else + while (ISDIGIT(*f)) { + ++f; + ++direc_length; + } + } + if (*f == 'l' || *f == 'L' || *f == 'h') { + ++f; + ++direc_length; + } + /* + if (!strchr ("diouxXfeEgGcs", *f)) + fprintf(stderr, "%%%c: invalid directive", *f); + */ + ++direc_length; + if (argc > 0) { + print_direc(direc_start, direc_length, field_width, + precision, *argv); + ++argv; + --argc; + } else + print_direc(direc_start, direc_length, field_width, + precision, ""); + break; + + case '\\': + f += print_esc(f); + break; + + default: + putchar(*f); } - else - while (ISDIGIT (*f)) - { - ++f; - ++direc_length; - } - } - if (*f == 'l' || *f == 'L' || *f == 'h') - { - ++f; - ++direc_length; - } - /* - if (!strchr ("diouxXfeEgGcs", *f)) - fprintf(stderr, "%%%c: invalid directive", *f); - */ - ++direc_length; - if (argc > 0) - { - print_direc (direc_start, direc_length, field_width, - precision, *argv); - ++argv; - --argc; - } - else - print_direc (direc_start, direc_length, field_width, - precision, ""); - break; - - case '\\': - f += print_esc (f); - break; - - default: - putchar (*f); } - } - return save_argc - argc; + return save_argc - argc; } /* Print a \ escape sequence starting at ESCSTART. Return the number of characters in the escape sequence besides the backslash. */ -static int -print_esc (char *escstart) +static int print_esc(char *escstart) { - register char *p = escstart + 1; - int esc_value = 0; /* Value of \nnn escape. */ - int esc_length; /* Length of \nnn escape. */ - - /* \0ooo and \xhhh escapes have maximum length of 3 chars. */ - if (*p == 'x') - { - for (esc_length = 0, ++p; - esc_length < 3 && ISXDIGIT (*p); - ++esc_length, ++p) - esc_value = esc_value * 16 + hextobin (*p); + register char *p = escstart + 1; + int esc_value = 0; /* Value of \nnn escape. */ + int esc_length; /* Length of \nnn escape. */ + + /* \0ooo and \xhhh escapes have maximum length of 3 chars. */ + if (*p == 'x') { + for (esc_length = 0, ++p; + esc_length < 3 && ISXDIGIT(*p); ++esc_length, ++p) + esc_value = esc_value * 16 + hextobin(*p); /* if (esc_length == 0) fprintf(stderr, "missing hex in esc"); */ - putchar (esc_value); - } - else if (*p == '0') - { - for (esc_length = 0, ++p; - esc_length < 3 && isodigit (*p); - ++esc_length, ++p) - esc_value = esc_value * 8 + octtobin (*p); - putchar (esc_value); - } - else if (strchr ("\"\\abcfnrtv", *p)) - print_esc_char (*p++); + putchar(esc_value); + } else if (*p == '0') { + for (esc_length = 0, ++p; + esc_length < 3 && isodigit(*p); ++esc_length, ++p) + esc_value = esc_value * 8 + octtobin(*p); + putchar(esc_value); + } else if (strchr("\"\\abcfnrtv", *p)) + print_esc_char(*p++); /* else fprintf(stderr, "\\%c: invalid esc", *p); */ - return p - escstart - 1; + return p - escstart - 1; } /* Output a single-character \ escape. */ -static void -print_esc_char (int c) +static void print_esc_char(int c) { - switch (c) - { - case 'a': /* Alert. */ - putchar (7); - break; - case 'b': /* Backspace. */ - putchar (8); - break; - case 'c': /* Cancel the rest of the output. */ - exit (0); - break; - case 'f': /* Form feed. */ - putchar (12); - break; - case 'n': /* New line. */ - putchar (10); - break; - case 'r': /* Carriage return. */ - putchar (13); - break; - case 't': /* Horizontal tab. */ - putchar (9); - break; - case 'v': /* Vertical tab. */ - putchar (11); - break; - default: - putchar (c); - break; - } + switch (c) { + case 'a': /* Alert. */ + putchar(7); + break; + case 'b': /* Backspace. */ + putchar(8); + break; + case 'c': /* Cancel the rest of the output. */ + exit(0); + break; + case 'f': /* Form feed. */ + putchar(12); + break; + case 'n': /* New line. */ + putchar(10); + break; + case 'r': /* Carriage return. */ + putchar(13); + break; + case 't': /* Horizontal tab. */ + putchar(9); + break; + case 'v': /* Vertical tab. */ + putchar(11); + break; + default: + putchar(c); + break; + } } /* Print string STR, evaluating \ escapes. */ -static void -print_esc_string (char *str) +static void print_esc_string(char *str) { - for (; *str; str++) - if (*str == '\\') - str += print_esc (str); - else - putchar (*str); + for (; *str; str++) + if (*str == '\\') + str += print_esc(str); + else + putchar(*str); } static void -print_direc (char *start, size_t length, int field_width, int precision, char *argument) +print_direc(char *start, size_t length, int field_width, int precision, + char *argument) { - char *p; /* Null-terminated copy of % directive. */ - - p = xmalloc ((unsigned) (length + 1)); - strncpy (p, start, length); - p[length] = 0; - - switch (p[length - 1]) - { - case 'd': - case 'i': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtol (argument)); - else - printf (p, precision, xstrtol (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtol (argument)); - else - printf (p, field_width, precision, xstrtol (argument)); - } - break; - - case 'o': - case 'u': - case 'x': - case 'X': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtoul (argument)); - else - printf (p, precision, xstrtoul (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtoul (argument)); - else - printf (p, field_width, precision, xstrtoul (argument)); - } - break; - - case 'f': - case 'e': - case 'E': - case 'g': - case 'G': - if (field_width < 0) - { - if (precision < 0) - printf (p, xstrtod (argument)); - else - printf (p, precision, xstrtod (argument)); - } - else - { - if (precision < 0) - printf (p, field_width, xstrtod (argument)); - else - printf (p, field_width, precision, xstrtod (argument)); - } - break; - - case 'c': - printf (p, *argument); - break; - - case 's': - if (field_width < 0) - { - if (precision < 0) - printf (p, argument); - else - printf (p, precision, argument); - } - else - { - if (precision < 0) - printf (p, field_width, argument); - else - printf (p, field_width, precision, argument); + char *p; /* Null-terminated copy of % directive. */ + + p = xmalloc((unsigned) (length + 1)); + strncpy(p, start, length); + p[length] = 0; + + switch (p[length - 1]) { + case 'd': + case 'i': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtol(argument)); + else + printf(p, precision, xstrtol(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtol(argument)); + else + printf(p, field_width, precision, xstrtol(argument)); + } + break; + + case 'o': + case 'u': + case 'x': + case 'X': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtoul(argument)); + else + printf(p, precision, xstrtoul(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtoul(argument)); + else + printf(p, field_width, precision, xstrtoul(argument)); + } + break; + + case 'f': + case 'e': + case 'E': + case 'g': + case 'G': + if (field_width < 0) { + if (precision < 0) + printf(p, xstrtod(argument)); + else + printf(p, precision, xstrtod(argument)); + } else { + if (precision < 0) + printf(p, field_width, xstrtod(argument)); + else + printf(p, field_width, precision, xstrtod(argument)); + } + break; + + case 'c': + printf(p, *argument); + break; + + case 's': + if (field_width < 0) { + if (precision < 0) + printf(p, argument); + else + printf(p, precision, argument); + } else { + if (precision < 0) + printf(p, field_width, argument); + else + printf(p, field_width, precision, argument); + } + break; } - break; - } - free (p); + free(p); } -static unsigned long -xstrtoul (char *s) +static unsigned long xstrtoul(char *s) { - char *end; - unsigned long val; + char *end; + unsigned long val; - errno = 0; - val = strtoul (s, &end, 0); - verify (s, end); - return val; + errno = 0; + val = strtoul(s, &end, 0); + verify(s, end); + return val; } -static long -xstrtol (char *s) +static long xstrtol(char *s) { - char *end; - long val; + char *end; + long val; - errno = 0; - val = strtol (s, &end, 0); - verify (s, end); - return val; + errno = 0; + val = strtol(s, &end, 0); + verify(s, end); + return val; } -static double -xstrtod (char *s) +static double xstrtod(char *s) { - char *end; - double val; + char *end; + double val; - errno = 0; - val = strtod (s, &end); - verify (s, end); - return val; + errno = 0; + val = strtod(s, &end); + verify(s, end); + return val; } -static void -verify (char *s, char *end) +static void verify(char *s, char *end) { - if (errno) - { - fprintf(stderr, "%s", s); - exit_status = 1; - } - else if (*end) - { - /* - if (s == end) - fprintf(stderr, "%s: expected numeric", s); - else - fprintf(stderr, "%s: not completely converted", s); - */ - exit_status = 1; - } + if (errno) { + fprintf(stderr, "%s", s); + exit_status = 1; + } else if (*end) { + /* + if (s == end) + fprintf(stderr, "%s: expected numeric", s); + else + fprintf(stderr, "%s: not completely converted", s); + */ + exit_status = 1; + } } -