Commit d2aef827 authored by Jaromil's avatar Jaromil
Browse files

zenroom print new implementation based on old mutt

select using conf flag print=mutt

also added tests for print configurations for benchmarks

rough estimates:
```
make check-crypto         6.58s user 0.57s cpu 6.958 total
make check-crypto-stb     5.31s user 0.46s cpu 5.503 total
make check-crypto-mutt    5.33s user 0.47s cpu 5.522 total
```
parent 5bfb9fea
......@@ -177,13 +177,12 @@ check-crypto:
@echo "All CRYPTO tests passed"
@echo "-----------------------"
check-crypto-lw: test-exec := ./src/zenroom -c memmanager=\"lw\"
check-crypto-lw: test-exec := ./src/zenroom -c memmanager=lw
check-crypto-lw:
rm -f /tmp/zenroom-test-summary.txt
$(call determinism-tests,${test-exec})
$(call crypto-tests,${test-exec})
$(call zencode-tests,${test-exec})
$(call crypto-integration,${test-exec})
$(call zencode-integration,${test-exec})
cat /tmp/zenroom-test-summary.txt
@echo "-----------------------"
......@@ -191,6 +190,30 @@ check-crypto-lw:
@echo "-----------------------"
check-crypto-stb: test-exec := ./src/zenroom -c print=stb
check-crypto-stb:
rm -f /tmp/zenroom-test-summary.txt
$(call determinism-tests,${test-exec})
$(call crypto-tests,${test-exec})
$(call zencode-tests,${test-exec})
$(call zencode-integration,${test-exec})
cat /tmp/zenroom-test-summary.txt
@echo "-----------------------"
@echo "All CRYPTO tests passed with lw memory manager"
@echo "-----------------------"
check-crypto-mutt: test-exec := ./src/zenroom -c print=mutt
check-crypto-mutt:
rm -f /tmp/zenroom-test-summary.txt
$(call determinism-tests,${test-exec})
$(call crypto-tests,${test-exec})
$(call zencode-tests,${test-exec})
$(call zencode-integration,${test-exec})
cat /tmp/zenroom-test-summary.txt
@echo "-----------------------"
@echo "All CRYPTO tests passed with lw memory manager"
@echo "-----------------------"
check-crypto-debug: test-exec := valgrind --max-stackframe=5000000 ${pwd}/src/zenroom -d 3
check-crypto-debug:
rm -f /tmp/zenroom-test-summary.txt
......
......@@ -27,7 +27,7 @@ SOURCES := \
cli.o jutils.o zenroom.o zen_error.o \
lua_functions.o lua_modules.o lualibs_detected.o lua_shims.o \
encoding.o base58.o \
zen_memory.o lwmem.o \
zen_memory.o lwmem.o mutt_sprintf.o \
zen_io.o zen_parse.o repl.o zen_config.o \
zen_octet.o zen_ecp.o zen_ecp2.o zen_big.o \
zen_fp12.o zen_random.o zen_hash.o \
......
/*
* snprintf.c
* ripped from rsync sources by pts@inf.bme.hu at Thu Mar 7 18:16:00 CET 2002
* ripped from reTCP sources by pts@fazekas.hu at Tue Jun 11 14:47:01 CEST 2002
*
* Why does this .c file rock?
*
* -- minimal dependencies: only <stdarg.h> is included
* -- minimal dependencies: not even -lm is required
* -- can print floating point numbers
* -- can print `long long' and `long double'
* -- C99 semantics (NULL arg for vsnprintf OK, always returns the length
* that would have been printed)
* -- provides all vsnprintf(), snprintf(), vasprintf(), asprintf()
*/
/**** pts: sam2p-specific defines ****/
#include <mutt_sprintf.h>
#include <stdarg.h>
#include <stdlib.h> /* malloc() */
#undef HAVE_LONG_DOUBLE
#undef HAVE_C99_VSNPRINTF /* force local implementation */
#undef TEST_SNPRINTF
#undef DEBUG_SNPRINTF
#define NEED_SPRINTF 1
#define NEED_LONG_LONG 1
#define HAVE_LONG_LONG 1
/* vvv repeat prototypes in snprintf.h */
int mutt_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
int mutt_snprintf(char *str,size_t count,const char *fmt,...);
/*
* Copyright Patrick Powell 1995
* This code is based on code written by Patrick Powell (papowell@astart.com)
* It may be used for any purpose as long as this notice remains intact
* on all source code distributions
*/
/**************************************************************
* Original:
* Patrick Powell Tue Apr 11 09:48:21 PDT 1995
* A bombproof version of doprnt (dopr) included.
* Sigh. This sort of thing is always nasty do deal with. Note that
* the version here does not include floating point...
*
* snprintf() is used instead of sprintf() as it does limit checks
* for string length. This covers a nasty loophole.
*
* The other functions are there to prevent NULL pointers from
* causing nast effects.
*
* More Recently:
* Brandon Long <blong@fiction.net> 9/15/96 for mutt 0.43
* This was ugly. It is still ugly. I opted out of floating point
* numbers, but the formatter understands just about everything
* from the normal C string format, at least as far as I can tell from
* the Solaris 2.5 printf(3S) man page.
*
* Brandon Long <blong@fiction.net> 10/22/97 for mutt 0.87.1
* Ok, added some minimal floating point support, which means this
* probably requires libm on most operating systems. Don't yet
* support the exponent (e,E) and sigfig (g,G). Also, fmtint()
* was pretty badly broken, it just wasn't being exercised in ways
* which showed it, so that's been fixed. Also, formated the code
* to mutt conventions, and removed dead code left over from the
* original. Also, there is now a builtin-test, just compile with:
* gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
* and run snprintf for results.
*
* Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
* The PGP code was using unsigned hexadecimal formats.
* Unfortunately, unsigned formats simply didn't work.
*
* Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
* The original code assumed that both snprintf() and vsnprintf() were
* missing. Some systems only have snprintf() but not vsnprintf(), so
* the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
*
* Andrew Tridgell (tridge@samba.org) Oct 1998
* fixed handling of %.0f
* added test for HAVE_LONG_DOUBLE
*
* tridge@samba.org, idra@samba.org, April 2001
* got rid of fcvt code (twas buggy and made testing harder)
* added C99 semantics
*
**************************************************************/
// #if defined(HAVE_SNPRINTF) && defined(HAVE_VSNPRINTF) && defined(HAVE_C99_VSNPRINTF)
// /* only include stdio.h if we are not re-defining snprintf or vsnprintf */
#include <stdio.h>
// /* make the compiler happy with an empty file */
// void dummy_snprintf(void) {}
// #else
#if HAVE_LONG_DOUBLE && NEED_LONG_DOUBLE
#define LDOUBLE long double
#else
#define LDOUBLE double
#endif
#if HAVE_LONG_LONG && NEED_LONG_LONG
#define LLONG long long
#else
#define LLONG long
#endif
static size_t dopr(char *buffer, size_t maxlen, const char *format,
va_list args);
static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
char *value, int flags, int min, int max);
static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
LLONG value, int base, int min, int max, int flags);
static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
/*
* dopr(): poor man's version of doprintf
*/
/* format read states */
#define DP_S_DEFAULT 0
#define DP_S_FLAGS 1
#define DP_S_MIN 2
#define DP_S_DOT 3
#define DP_S_MAX 4
#define DP_S_MOD 5
#define DP_S_CONV 6
#define DP_S_DONE 7
/* format flags - Bits */
#define DP_F_MINUS (1 << 0)
#define DP_F_PLUS (1 << 1)
#define DP_F_SPACE (1 << 2)
#define DP_F_NUM (1 << 3)
#define DP_F_ZERO (1 << 4)
#define DP_F_UP (1 << 5)
#define DP_F_UNSIGNED (1 << 6)
/* Conversion Flags */
#define DP_C_SHORT 1
#define DP_C_LONG 2
#define DP_C_LDOUBLE 3
#define DP_C_LLONG 4
#define char_to_int(p) ((p)- '0')
#ifndef MAX
#define MAX(p,q) (((p) >= (q)) ? (p) : (q))
#endif
/**** pts ****/
#undef isdigit
#define isdigit(c) ((unsigned char)((c)-'0')<=(unsigned char)('9'-'0'))
static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args) {
char ch;
LLONG value;
char *strvalue;
int min;
int max;
int state;
int flags;
int cflags;
size_t currlen;
state = DP_S_DEFAULT;
currlen = flags = cflags = min = 0;
max = -1;
ch = *format++;
while (state != DP_S_DONE) {
if (ch == '\0')
state = DP_S_DONE;
switch(state) {
case DP_S_DEFAULT:
if (ch == '%')
state = DP_S_FLAGS;
else
dopr_outch (buffer, &currlen, maxlen, ch);
ch = *format++;
break;
case DP_S_FLAGS:
switch (ch) {
case '-':
flags |= DP_F_MINUS;
ch = *format++;
break;
case '+':
flags |= DP_F_PLUS;
ch = *format++;
break;
case ' ':
flags |= DP_F_SPACE;
ch = *format++;
break;
case '#':
flags |= DP_F_NUM;
ch = *format++;
break;
case '0':
flags |= DP_F_ZERO;
ch = *format++;
break;
default:
state = DP_S_MIN;
break;
}
break;
case DP_S_MIN:
if (isdigit((unsigned char)ch)) {
min = 10*min + char_to_int (ch);
ch = *format++;
} else if (ch == '*') {
min = va_arg (args, int);
ch = *format++;
state = DP_S_DOT;
} else {
state = DP_S_DOT;
}
break;
case DP_S_DOT:
if (ch == '.') {
state = DP_S_MAX;
ch = *format++;
} else {
state = DP_S_MOD;
}
break;
case DP_S_MAX:
if (isdigit((unsigned char)ch)) {
if (max < 0)
max = 0;
max = 10*max + char_to_int (ch);
ch = *format++;
} else if (ch == '*') {
max = va_arg (args, int);
ch = *format++;
state = DP_S_MOD;
} else {
state = DP_S_MOD;
}
break;
case DP_S_MOD:
switch (ch) {
case 'h':
cflags = DP_C_SHORT;
ch = *format++;
break;
case 'l':
cflags = DP_C_LONG;
ch = *format++;
if (ch == 'l') { /* It's a long long */
cflags = DP_C_LLONG;
ch = *format++;
}
break;
case 'L':
cflags = DP_C_LDOUBLE;
ch = *format++;
break;
default:
break;
}
state = DP_S_CONV;
break;
case DP_S_CONV:
switch (ch) {
case 'd':
case 'i':
if (cflags == DP_C_SHORT)
value = va_arg (args, int);
else if (cflags == DP_C_LONG)
value = va_arg (args, long int);
else if (cflags == DP_C_LLONG)
value = va_arg (args, LLONG);
else
value = va_arg (args, int);
fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
break;
case 'o':
flags |= DP_F_UNSIGNED;
if (cflags == DP_C_SHORT)
value = va_arg (args, unsigned int);
else if (cflags == DP_C_LONG)
value = (long)va_arg (args, unsigned long int);
else if (cflags == DP_C_LLONG)
value = (long)va_arg (args, unsigned LLONG);
else
value = (long)va_arg (args, unsigned int);
fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags);
break;
case 'u':
flags |= DP_F_UNSIGNED;
if (cflags == DP_C_SHORT)
value = va_arg (args, unsigned int);
else if (cflags == DP_C_LONG)
value = (long)va_arg (args, unsigned long int);
else if (cflags == DP_C_LLONG)
value = (LLONG)va_arg (args, unsigned LLONG);
else
value = (long)va_arg (args, unsigned int);
fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
break;
case 'X':
flags |= DP_F_UP;
case 'x':
flags |= DP_F_UNSIGNED;
if (cflags == DP_C_SHORT)
value = va_arg (args, unsigned int);
else if (cflags == DP_C_LONG)
value = (long)va_arg (args, unsigned long int);
else if (cflags == DP_C_LLONG)
value = (LLONG)va_arg (args, unsigned LLONG);
else
value = (long)va_arg (args, unsigned int);
fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags);
break;
case 'f':
if (cflags == DP_C_LDOUBLE)
va_arg (args, LDOUBLE);
else
va_arg (args, double);
break;
case 'E':
flags |= DP_F_UP;
case 'e':
if (cflags == DP_C_LDOUBLE)
va_arg (args, LDOUBLE);
else
va_arg (args, double);
break;
case 'G':
flags |= DP_F_UP;
case 'g':
if (cflags == DP_C_LDOUBLE)
va_arg (args, LDOUBLE);
else
va_arg (args, double);
break;
case 'c':
dopr_outch (buffer, &currlen, maxlen, (char)va_arg (args, int));
break;
case 's':
strvalue = va_arg (args, char *);
if (max == -1) {
/**** pts ****/
for (max = 0; strvalue[max]; ++max); /* strlen */
}
if (min > 0 && max >= 0 && min > max) max = min;
fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
break;
case 'p':
strvalue = (char*)(va_arg (args, void *));
fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
break;
case 'n':
if (cflags == DP_C_SHORT) {
short int *num;
num = va_arg (args, short int *);
*num = currlen;
} else if (cflags == DP_C_LONG) {
long int *num;
num = va_arg (args, long int *);
*num = (long int)currlen;
} else if (cflags == DP_C_LLONG) {
LLONG *num;
num = va_arg (args, LLONG *);
*num = (LLONG)currlen;
} else {
int *num;
num = va_arg (args, int *);
*num = currlen;
}
break;
case '%':
dopr_outch (buffer, &currlen, maxlen, ch);
break;
case 'w':
/* not supported yet, treat as next char */
ch = *format++;
break;
default:
/* Unknown, skip */
break;
}
ch = *format++;
state = DP_S_DEFAULT;
flags = cflags = min = 0;
max = -1;
break;
case DP_S_DONE:
break;
default:
/* hmm? */
break; /* some picky compilers need this */
}
}
if (maxlen != 0) {
if (currlen < maxlen - 1)
buffer[currlen] = '\0';
else if (maxlen > 0)
buffer[maxlen - 1] = '\0';
}
return currlen;
}
static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
char *value, int flags, int min, int max) {
int padlen, strln; /* amount to pad */
int cnt = 0;
#ifdef DEBUG_SNPRINTF
printf("fmtstr min=%d max=%d s=[%s]\n", min, max, value);
#endif
if (value == 0) {
value = "<NULL>";
}
for (strln = 0; value[strln]; ++strln); /* strlen */
padlen = min - strln;
if (padlen < 0)
padlen = 0;
if (flags & DP_F_MINUS)
padlen = -padlen; /* Left Justify */
while ((padlen > 0) && (cnt < max)) {
dopr_outch (buffer, currlen, maxlen, ' ');
--padlen;
++cnt;
}
while (*value && (cnt < max)) {
dopr_outch (buffer, currlen, maxlen, *value++);
++cnt;
}
while ((padlen < 0) && (cnt < max)) {
dopr_outch (buffer, currlen, maxlen, ' ');
++padlen;
++cnt;
}
}
/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */
static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
LLONG value, int base, int min, int max, int flags) {
int signvalue = 0;
unsigned LLONG uvalue;
char convert[22];
int place = 0;
int spadlen = 0; /* amount to space pad */
int zpadlen = 0; /* amount to zero pad */
int caps = 0;
if (max < 0)
max = 0;
uvalue = value;
if(!(flags & DP_F_UNSIGNED)) {
if( value < 0 ) {
signvalue = '-';
uvalue = -value;
} else {
if (flags & DP_F_PLUS) /* Do a sign (+/i) */
signvalue = '+';
else if (flags & DP_F_SPACE)
signvalue = ' ';
}
}
if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
do {
convert[place++] =
(caps? "0123456789ABCDEF":"0123456789abcdef")
[uvalue % (unsigned)base ];
uvalue = (uvalue / (unsigned)base );
} while(uvalue && (place < 22));
if (place == 22) place--;
convert[place] = 0;
zpadlen = max - place;
spadlen = min - MAX (max, place) - (signvalue ? 1 : 0);
if (zpadlen < 0) zpadlen = 0;
if (spadlen < 0) spadlen = 0;
if (flags & DP_F_ZERO) {
zpadlen = MAX(zpadlen, spadlen);
spadlen = 0;
}
if (flags & DP_F_MINUS)
spadlen = -spadlen; /* Left Justifty */
#ifdef DEBUG_SNPRINTF
printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n",
zpadlen, spadlen, min, max, place);
#endif
/* Spaces */
while (spadlen > 0) {
dopr_outch (buffer, currlen, maxlen, ' ');
--spadlen;
}
/* Sign */
if (signvalue)
dopr_outch (buffer, currlen, maxlen, (char)signvalue); /* pacify VC6.0 */
/* Zeros */
if (zpadlen > 0) {
while (zpadlen > 0) {
dopr_outch (buffer, currlen, maxlen, '0');
--zpadlen;
}
}
/* Digits */
while (place > 0)
dopr_outch (buffer, currlen, maxlen, convert[--place]);
/* Left Justified spaces */
while (spadlen < 0) {
dopr_outch (buffer, currlen, maxlen, ' ');
++spadlen;
}
}
static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) {
if (*currlen < maxlen) {
buffer[(*currlen)] = c;
}
(*currlen)++;
}
int mutt_vsnprintf (char *str, size_t count, const char *fmt, va_list args) {
return dopr(str, count, fmt, args);
}
int mutt_snprintf(char *str,size_t count,const char *fmt,...) {
size_t ret;
va_list ap;
va_start(ap, fmt);
ret = vsnprintf(str, count, fmt, ap);
va_end(ap);
return ret;
}
/*
* snprintf.h -- interface for our fixup vsnprintf() etc. functions
*/
#ifndef MUTT_SPRINTF_H
#define MUTT_SPRINTF_H 1
#include <stdlib.h>
#include <stdarg.h> /* ... */
int mutt_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
int mutt_snprintf(char *str, size_t count, const char *fmt, ...);
#endif /* snprintf.h */
......@@ -164,6 +164,7 @@ int zen_conf_parse(const char *configuration) {
if(curconf==PRINTF) {
if(strcasecmp(lex.string,"stb") == 0) zconf_printf = STB_PRINTF;
else if(strcasecmp(lex.string,"sys") == 0) zconf_printf = LIBC_PRINTF;
else if(strcasecmp(lex.string,"mutt") == 0) zconf_printf = MUTT_PRINTF;