95639a80ef
Inputting fractional non-decimal numbers has never worked correctly in our OpenBSD-derived dc(1). It truncates the input to a number of decimal places equal to the number of hexadecimal (or whatever base) places given on the input. That's unacceptable, because many numbers require more precision to represent in base 10 than in their original bases. Fix this bug by using as many decimal places as needed to represent the input, up to the maximum of the global scale factor. This has one mildly surprising side effect: the scale of a number entered in non-decimal mode will no longer necessarily equal the number of hexadecimal (or whatever base) places given on the input. I think that's an acceptable behavior change, given that inputting fractional non-decimal numbers never worked in the first place, and the man page doesn't specify whether trailing zeros on the input should affect a number's scale. PR: 206230 Reported by: nibbana@gmx.us Reviewed by: pfg Differential Revision: https://reviews.freebsd.org/D13336
143 lines
2.7 KiB
C
143 lines
2.7 KiB
C
/* $OpenBSD: mem.c,v 1.6 2014/12/01 13:13:00 deraadt Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <err.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "extern.h"
|
|
|
|
struct number *
|
|
new_number(void)
|
|
{
|
|
struct number *n;
|
|
|
|
n = bmalloc(sizeof(*n));
|
|
n->scale = 0;
|
|
n->number = BN_new();
|
|
if (n->number == NULL)
|
|
err(1, NULL);
|
|
return (n);
|
|
}
|
|
|
|
void
|
|
free_number(struct number *n)
|
|
{
|
|
|
|
BN_free(n->number);
|
|
free(n);
|
|
}
|
|
|
|
/*
|
|
* Divide dividend by divisor, returning the result. Retain bscale places of
|
|
* precision.
|
|
* The result must be freed when no longer in use
|
|
*/
|
|
struct number *
|
|
div_number(struct number *dividend, struct number *divisor, u_int bscale)
|
|
{
|
|
struct number *quotient;
|
|
BN_CTX *ctx;
|
|
u_int scale;
|
|
|
|
quotient = new_number();
|
|
quotient->scale = bscale;
|
|
scale = max(divisor->scale, dividend->scale);
|
|
|
|
if (BN_is_zero(divisor->number))
|
|
warnx("divide by zero");
|
|
else {
|
|
normalize(divisor, scale);
|
|
normalize(dividend, scale + quotient->scale);
|
|
|
|
ctx = BN_CTX_new();
|
|
bn_checkp(ctx);
|
|
bn_check(BN_div(quotient->number, NULL, dividend->number,
|
|
divisor->number, ctx));
|
|
BN_CTX_free(ctx);
|
|
}
|
|
return (quotient);
|
|
}
|
|
|
|
struct number *
|
|
dup_number(const struct number *a)
|
|
{
|
|
struct number *n;
|
|
|
|
n = bmalloc(sizeof(*n));
|
|
n->scale = a->scale;
|
|
n->number = BN_dup(a->number);
|
|
bn_checkp(n->number);
|
|
return (n);
|
|
}
|
|
|
|
void *
|
|
bmalloc(size_t sz)
|
|
{
|
|
void *p;
|
|
|
|
p = malloc(sz);
|
|
if (p == NULL)
|
|
err(1, NULL);
|
|
return (p);
|
|
}
|
|
|
|
void *
|
|
breallocarray(void *p, size_t nmemb, size_t size)
|
|
{
|
|
void *q;
|
|
|
|
q = reallocarray(p, nmemb, size);
|
|
if (q == NULL)
|
|
err(1, NULL);
|
|
return (q);
|
|
}
|
|
|
|
char *
|
|
bstrdup(const char *p)
|
|
{
|
|
char *q;
|
|
|
|
q = strdup(p);
|
|
if (q == NULL)
|
|
err(1, NULL);
|
|
return (q);
|
|
}
|
|
|
|
void
|
|
bn_check(int x) \
|
|
{
|
|
|
|
if (x == 0)
|
|
err(1, "big number failure %lx", ERR_get_error());
|
|
}
|
|
|
|
void
|
|
bn_checkp(const void *p) \
|
|
{
|
|
|
|
if (p == NULL)
|
|
err(1, "allocation failure %lx", ERR_get_error());
|
|
}
|