From 9ebb55c50870cc136da18715cc1a53db5c3f8431 Mon Sep 17 00:00:00 2001 From: hpa Date: Wed, 15 Dec 2004 21:56:04 +0000 Subject: [PATCH] Adjust the interface to syslxmod.c so the DOS installer doesn't need printf(). --- dos/Makefile | 2 +- dos/printf.c | 297 ------------------------------------------------------ dos/syslinux.c | 11 +- mtools/syslinux.c | 4 +- syslinux.h | 2 +- syslxmod.c | 22 ++-- unix/syslinux.c | 4 +- win32/syslinux.c | 3 +- 8 files changed, 29 insertions(+), 316 deletions(-) delete mode 100644 dos/printf.c diff --git a/dos/Makefile b/dos/Makefile index b46a35f..b54098a 100644 --- a/dos/Makefile +++ b/dos/Makefile @@ -6,7 +6,7 @@ INCLUDES = -include code16.h -I. -I.. -I../libfat CFLAGS = -W -Wall -ffreestanding $(OPTFLAGS) $(INCLUDES) LDFLAGS = -T com16.ld -SRCS = syslinux.c printf.c conio.c skipatou.c atou.c malloc.c free.c \ +SRCS = syslinux.c conio.c skipatou.c atou.c malloc.c free.c \ ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c \ $(wildcard ../libfat/*.c) OBJS = crt0.o memcpy.o memset.o $(patsubst %.c,%.o,$(notdir $(SRCS))) diff --git a/dos/printf.c b/dos/printf.c deleted file mode 100644 index efd63cf..0000000 --- a/dos/printf.c +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Oh, it's a waste of space, but oh-so-yummy for debugging. It's just - * initialization code anyway, so it doesn't take up space when we're - * actually running. This version of printf() does not include 64-bit - * support. "Live with it." - * - * Most of this code was shamelessly snarfed from the Linux kernel, then - * modified. - * - * FIX THIS: Replace printf() implementation with BSD/MIT-licensed one - * from klibc - */ - -#include -#include -#include "mystuff.h" - -static int strnlen(const char *s, int maxlen) -{ - const char *es = s; - while ( *es && maxlen ) { - es++; maxlen--; - } - - return (es-s); -} - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ - -#define do_div(n,base) ({ \ -int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ -__res; }) - -static char * number(char * str, long num, int base, int size, int precision - ,int type) -{ - char c,sign,tmp[66]; - const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; - int i; - - if (type & LARGE) - digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++]='0'; - else while (num != 0) - tmp[i++] = digits[do_div(num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - *str++ = ' '; - if (sign) - *str++ = sign; - if (type & SPECIAL) { - if (base==8) - *str++ = '0'; - else if (base==16) { - *str++ = '0'; - *str++ = digits[33]; - } - } - if (!(type & LEFT)) - while (size-- > 0) - *str++ = c; - while (i < precision--) - *str++ = '0'; - while (i-- > 0) - *str++ = tmp[i]; - while (size-- > 0) - *str++ = ' '; - return str; -} - -/* Forward decl. needed for IP address printing stuff... */ -int sprintf(char * buf, const char *fmt, ...); - -int vsprintf(char *buf, const char *fmt, va_list args) -{ - int len; - unsigned long num; - int i, base; - char * str; - const char *s; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier; /* 'h', 'l', or 'L' for integer fields */ - - for (str=buf ; *fmt ; ++fmt) { - if (*fmt != '%') { - *str++ = *fmt; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_atou(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (isdigit(*fmt)) - precision = skip_atou(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') { - qualifier = *fmt; - ++fmt; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': - if (!(flags & LEFT)) - while (--field_width > 0) - *str++ = ' '; - *str++ = (unsigned char) va_arg(args, int); - while (--field_width > 0) - *str++ = ' '; - continue; - - case 's': - s = va_arg(args, char *); - len = strnlen(s, precision); - - if (!(flags & LEFT)) - while (len < field_width--) - *str++ = ' '; - for (i = 0; i < len; ++i) - *str++ = *s++; - while (len < field_width--) - *str++ = ' '; - continue; - - case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, - (unsigned long) va_arg(args, void *), 16, - field_width, precision, flags); - continue; - - - case 'n': - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = (str - buf); - } else { - int * ip = va_arg(args, int *); - *ip = (str - buf); - } - continue; - - case '%': - *str++ = '%'; - continue; - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - *str++ = '%'; - if (*fmt) - *str++ = *fmt; - else - --fmt; - continue; - } - if (qualifier == 'l') - num = va_arg(args, unsigned long); - else if (qualifier == 'h') { - num = (unsigned short) va_arg(args, int); - if (flags & SIGN) - num = (short) num; - } else if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - str = number(str, num, base, field_width, precision, flags); - } - *str = '\0'; - return str-buf; -} - -int sprintf(char * buf, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=vsprintf(buf,fmt,args); - va_end(args); - return i; -} - -int printf(const char *fmt, ...) -{ - char printf_buf[1024]; - va_list args; - int printed; - - va_start(args, fmt); - printed = vsprintf(printf_buf, fmt, args); - va_end(args); - - puts(printf_buf); - - return printed; -} diff --git a/dos/syslinux.c b/dos/syslinux.c index 820e1cb..ba6590c 100644 --- a/dos/syslinux.c +++ b/dos/syslinux.c @@ -30,13 +30,15 @@ const char *program = "syslinux"; /* Name of program */ void __attribute__((noreturn)) usage(void) { - fprintf(stderr, "Usage: %s [-sf] drive:\n", program); + puts("Usage: syslinux [-sf] drive:\n"); exit(1); } void __attribute__((noreturn)) die(const char *msg) { - fprintf(stderr, "%s: %s\n", program, msg); + puts("syslinux: "); + puts(msg); + putchar('\n'); exit(1); } @@ -149,6 +151,7 @@ int main(int argc, char *argv[]) int32_t ldlinux_cluster; int nsectors; char *device = NULL; + const char *errmsg; (void)argc; /* Unused */ @@ -190,7 +193,9 @@ int main(int argc, char *argv[]) /* * Check to see that what we got was indeed an MS-DOS boot sector/superblock */ - if(!syslinux_check_bootsect(sectbuf,device)) { + if(!syslinux_check_bootsect(sectbuf,&errmsg)) { + puts(errmsg); + putchar('\n'); exit(1); } diff --git a/mtools/syslinux.c b/mtools/syslinux.c index d29108e..004bca3 100644 --- a/mtools/syslinux.c +++ b/mtools/syslinux.c @@ -136,6 +136,7 @@ int main(int argc, char *argv[]) libfat_sector_t s, *secp, sectors[65]; /* 65 is maximum possible */ int32_t ldlinux_cluster; int nsectors; + const char *errmsg; (void)argc; /* Unused */ @@ -192,7 +193,8 @@ int main(int argc, char *argv[]) /* * Check to see that what we got was indeed an MS-DOS boot sector/superblock */ - if( !syslinux_check_bootsect(sectbuf,device) ) { + if( !syslinux_check_bootsect(sectbuf,&errmsg) ) { + fprintf(stderr, "%s: %s\n", program, errmsg); exit(1); } diff --git a/syslinux.h b/syslinux.h index 1dde5ae..dd555a9 100644 --- a/syslinux.h +++ b/syslinux.h @@ -31,7 +31,7 @@ void syslinux_make_stupid(void); void syslinux_make_bootsect(void *); /* Check to see that what we got was indeed an MS-DOS boot sector/superblock */ -int syslinux_check_bootsect(const void *bs, const char *device); +int syslinux_check_bootsect(const void *bs, const char **errmsg); /* This patches the boot sector and ldlinux.sys based on a sector map */ int syslinux_patch(const uint32_t *sectors, int nsectors); diff --git a/syslxmod.c b/syslxmod.c index 1f83743..a429c2b 100644 --- a/syslxmod.c +++ b/syslxmod.c @@ -121,12 +121,14 @@ void syslinux_make_bootsect(void *bs) * Check to see that what we got was indeed an MS-DOS boot sector/superblock; * Return 0 if bad and 1 if OK. */ -int syslinux_check_bootsect(const void *bs, const char *device) +int syslinux_check_bootsect(const void *bs, const char **errmsg) { int veryold; unsigned int sectors, clusters; const unsigned char *sectbuf = bs; + *errmsg = 0; + /*** FIX: Handle FAT32 ***/ if ( sectbuf[bsBootSignature] == 0x29 ) { @@ -140,21 +142,20 @@ int syslinux_check_bootsect(const void *bs, const char *device) if ( !memcmp(sectbuf+bsFileSysType, "FAT12 ", 8) ) { if ( clusters > 4086 ) { - fprintf(stderr, "%s: ERROR: FAT12 but claims more than 4086 clusters\n", - device); + *errmsg = "FAT12 but claims more than 4086 clusters"; return 0; } } else if ( !memcmp(sectbuf+bsFileSysType, "FAT16 ", 8) ) { if ( clusters <= 4086 ) { - fprintf(stderr, "%s: ERROR: FAT16 but claims less than 4086 clusters\n", - device); + *errmsg = "FAT16 but claims less than 4086 clusters"; return 0; } } else if ( !memcmp(sectbuf+bsFileSysType, "FAT ", 8) ) { /* OS/2 sets up the filesystem as just `FAT'. */ } else { - fprintf(stderr, "%s: filesystem type \"%8.8s\" not supported\n", - device, sectbuf+bsFileSysType); + static char fserr[] = "filesystem type \"????????\" not supported"; + memcpy(fserr+17, sectbuf+bsFileSysType, 8); + *errmsg = fserr; return 0; } } else { @@ -162,8 +163,8 @@ int syslinux_check_bootsect(const void *bs, const char *device) if ( sectbuf[bsSecPerClust] & (sectbuf[bsSecPerClust] - 1) || sectbuf[bsSecPerClust] == 0 ) { - fprintf(stderr, "%s: This doesn't look like a FAT filesystem\n", - device); + *errmsg = "this doesn't look like a FAT filesystem"; + return 0; } sectors = get_16(sectbuf+bsSectors); @@ -172,8 +173,7 @@ int syslinux_check_bootsect(const void *bs, const char *device) } if ( get_16(sectbuf+bsBytesPerSec) != 512 ) { - fprintf(stderr, "%s: Sector sizes other than 512 not supported\n", - device); + *errmsg = "sector sizes other than 512 not supported"; return 0; } diff --git a/unix/syslinux.c b/unix/syslinux.c index e5041cd..362fcc3 100644 --- a/unix/syslinux.c +++ b/unix/syslinux.c @@ -177,6 +177,7 @@ int main(int argc, char *argv[]) libfat_sector_t s, *secp, sectors[65]; /* 65 is maximum possible */ int32_t ldlinux_cluster; int nsectors; + const char *errmsg; (void)argc; /* Unused */ @@ -239,7 +240,8 @@ int main(int argc, char *argv[]) /* * Check to see that what we got was indeed an MS-DOS boot sector/superblock */ - if(!syslinux_check_bootsect(sectbuf,device)) { + if(!syslinux_check_bootsect(sectbuf,&errmsg)) { + fprintf(stderr, "%s: %s\n", device, errmsg); exit(1); } diff --git a/win32/syslinux.c b/win32/syslinux.c index 0b6b192..68ebb10 100644 --- a/win32/syslinux.c +++ b/win32/syslinux.c @@ -167,7 +167,8 @@ int main(int argc, char *argv[]) } /* Check to see that what we got was indeed an MS-DOS boot sector/superblock */ - if(!syslinux_check_bootsect(sectbuf,drive)) { + if(!syslinux_check_bootsect(sectbuf,&errmsg)) { + fprintf(stderr, "%s\n", errmsg); exit(1); } -- 2.7.4