mirror of
https://github.com/opnsense/src.git
synced 2026-05-27 20:02:43 -04:00
Merge commit2f57ecae4bThis is a new major release with a number of changes and extensions: - Limited the number of temporary numbers and made the space for them static so that allocating more space for them cannot fail. - Allowed integers with non-zero scale to be used with power, places, and shift operators. - Added greatest common divisor and least common multiple to lib2.bc. - Made bc and dc UTF-8 capable. - Added the ability for users to have bc and dc quit on SIGINT. - Added the ability for users to disable prompt and TTY mode by environment variables. - Added the ability for users to redefine keywords. - Added dc's modular exponentiation and divmod to bc. - Added the ability to assign strings to variables and array elements and pass them to functions in bc. - Added dc's asciify command and stream printing to bc. - Added bitwise and, or, xor, left shift, right shift, reverse, left rotate, right rotate, and mod functions to lib2.bc. - Added the functions s2u(x) and s2un(x,n), to lib2.bc. MFC after: 1 week (cherry picked from commit44d4804d19) vendor/bc: update to upstream version 5.0.2 (cherry picked from commita60ef1802a) (cherry picked from commit662087dfd0) contrib/bc: remove files ommitted from the release A number of files have been removed from the release distribution of this bc implementation. They were mostly relevant for pre release testing and benchmarking to identify regressions. The Markdown sources of the man pages are only relevant for combinations of build options not used in FreeBSD and need non-default conversion tools (available as ports in FreeBSD). All the omitted files can be found in the upstream git repository, and they are fetched when building this software as a port. But they have never been used in the FreeBSD base system. (cherry picked from commitea31d1a5c4) Remove files that were checked in with wrong .gitattributes These files will be added back in updated form, but are only relevant for the Windows platform, anyway. (cherry picked from commitd6c323eda2) contrib/bc: merge version 5.1.0 from vendor branch This version adds options and functions that allow to print numbers in the open interval (-1 .. 1) with or without a leading 0 digit. Additionally, an option has been added to prevent line wrap and allows to print arbitrarily long results on a single line. Merge commit '5d58a51571721190681c50d4bd3a1f45e6282d72' (cherry picked from commitd43fa8ef53) contrib/bc: update to version 5.1.1 Merge commit '6f49f5cdde1c62c4e5a743e895f3afe592b5c0e5' (cherry picked from commita30efc5ca7) contrib/bc: temporarily disconnect the tests for 5.0.2 The tests that come with version 5.0.2 have been extended to cover the line editing functions. It has been found that these tests generate false negative results in FreeBSD, most likely due to an issue in the pexpect functionality used. These history tests are skipped on systems that do not have python and py-pexpect installed (and thus are unlikely to cause CI test failures), but in order to not cause irritating failures on systems were these packages are in fact installed, I temporarily disconnect them. I had planned to skip this version due to the issue with the history tests, but some committer has asked me to go ahead since the currently used version 5.0.0 contains a macro name that collides with a project he is working on. No MFC of this version is planned. A version 5.0.3 is expected to be released soon, and that version will allow to reconnect the tests and will be MFCed. (cherry picked from commitf774652b0e) Add back Windows only VCXProj files (cherry picked from commitded0d3d486) contrib/bc: re-enable tests after the import of version 5.1.0 The tests have been fixed to not write any data outside of the temporary work directory provided by the test framework. MFC after: 3 days (cherry picked from commitb8d895faf4) Revert erroneous commitded0d3d486These files came from a prior commit to contrib/bc and seem to have been placed in the top of the source tree by a failed git rebase. Reported by: markj (cherry picked from commitf902ca97bd)
177 lines
5.3 KiB
C
177 lines
5.3 KiB
C
/*
|
|
* *****************************************************************************
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*
|
|
* Copyright (c) 2018-2021 Gavin D. Howard and contributors.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright notice, this
|
|
* list of conditions and the following disclaimer.
|
|
*
|
|
* * Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* *****************************************************************************
|
|
*
|
|
* Definitions for implementing buffered I/O on my own terms.
|
|
*
|
|
*/
|
|
|
|
#ifndef BC_FILE_H
|
|
#define BC_FILE_H
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <vector.h>
|
|
|
|
#define BC_FILE_ULL_LENGTH (21)
|
|
|
|
/// The file struct.
|
|
typedef struct BcFile {
|
|
|
|
// The actual file descriptor.
|
|
int fd;
|
|
|
|
// The buffer for the file.
|
|
char *buf;
|
|
|
|
// The length (number of actual chars) in the buffer.
|
|
size_t len;
|
|
|
|
// The capacity (max number of chars) of the buffer.
|
|
size_t cap;
|
|
|
|
} BcFile;
|
|
|
|
#if BC_ENABLE_HISTORY
|
|
|
|
/// Types of flushing. These are important because of history and printing
|
|
/// strings without newlines, something that users could use as their own
|
|
/// prompts.
|
|
typedef enum BcFlushType {
|
|
|
|
/// Do not clear the stored partial line, but don't add to it.
|
|
BC_FLUSH_NO_EXTRAS_NO_CLEAR,
|
|
|
|
/// Do not clear the stored partial line and add to it.
|
|
BC_FLUSH_SAVE_EXTRAS_NO_CLEAR,
|
|
|
|
/// Clear the stored partial line and do not save the new stuff either.
|
|
BC_FLUSH_NO_EXTRAS_CLEAR,
|
|
|
|
/// Clear the stored partial line, but save the new stuff.
|
|
BC_FLUSH_SAVE_EXTRAS_CLEAR,
|
|
|
|
} BcFlushType;
|
|
|
|
#else // BC_ENABLE_HISTORY
|
|
|
|
// These make sure that the BcFlushType parameter disappears if history is not
|
|
// used.
|
|
|
|
#define bc_file_putchar(f, t, c) bc_file_putchar(f, c)
|
|
#define bc_file_flushErr(f, t) bc_file_flushErr(f)
|
|
#define bc_file_flush(f, t) bc_file_flush(f)
|
|
#define bc_file_write(f, t, b, n) bc_file_write(f, b, n)
|
|
#define bc_file_puts(f, t, s) bc_file_puts(f, s)
|
|
|
|
#endif // BC_ENABLE_HISTORY
|
|
|
|
/**
|
|
* Initialize a file.
|
|
* @param f The file to initialize.
|
|
* @param fd The file descriptor.
|
|
* @param buf The buffer for the file.
|
|
* @param cap The capacity of the buffer.
|
|
*/
|
|
void bc_file_init(BcFile *f, int fd, char *buf, size_t cap);
|
|
|
|
/**
|
|
* Frees a file, including flushing it.
|
|
* @param f The file to free.
|
|
*/
|
|
void bc_file_free(BcFile *f);
|
|
|
|
/**
|
|
* Print a char into the file.
|
|
* @param f The file to print to.
|
|
* @param type The flush type.
|
|
* @param c The character to write.
|
|
*/
|
|
void bc_file_putchar(BcFile *restrict f, BcFlushType type, uchar c);
|
|
|
|
/**
|
|
* Flush and return an error if it failed. This is meant to be used when needing
|
|
* to flush in error situations when an error is already in flight. It would be
|
|
* a very bad deal to throw another error.
|
|
* @param f The file to flush.
|
|
* @param type The flush type.
|
|
* @return A status indicating if an error occurred.
|
|
*/
|
|
BcStatus bc_file_flushErr(BcFile *restrict f, BcFlushType type);
|
|
|
|
/**
|
|
* Flush and throw an error on failure.
|
|
* @param f The file to flush.
|
|
* @param type The flush type.
|
|
*/
|
|
void bc_file_flush(BcFile *restrict f, BcFlushType type);
|
|
|
|
/**
|
|
* Write the contents of buf to the file.
|
|
* @param f The file to flush.
|
|
* @param type The flush type.
|
|
* @param buf The buffer whose contents will be written to the file.
|
|
* @param n The length of buf.
|
|
*/
|
|
void bc_file_write(BcFile *restrict f, BcFlushType type,
|
|
const char *buf, size_t n);
|
|
|
|
/**
|
|
* Write to the file like fprintf would. This is very rudimentary.
|
|
* @param f The file to flush.
|
|
* @param fmt The format string.
|
|
*/
|
|
void bc_file_printf(BcFile *restrict f, const char *fmt, ...);
|
|
|
|
/**
|
|
* Write to the file like vfprintf would. This is very rudimentary.
|
|
* @param f The file to flush.
|
|
* @param fmt The format string.
|
|
*/
|
|
void bc_file_vprintf(BcFile *restrict f, const char *fmt, va_list args);
|
|
|
|
/**
|
|
* Write str to the file.
|
|
* @param f The file to flush.
|
|
* @param type The flush type.
|
|
* @param str The string to write to the file.
|
|
*/
|
|
void bc_file_puts(BcFile *restrict f, BcFlushType type, const char *str);
|
|
|
|
#if BC_ENABLE_HISTORY
|
|
|
|
// Some constant flush types for ease of use.
|
|
extern const BcFlushType bc_flush_none;
|
|
extern const BcFlushType bc_flush_err;
|
|
extern const BcFlushType bc_flush_save;
|
|
|
|
#endif // BC_ENABLE_HISTORY
|
|
|
|
#endif // BC_FILE_H
|