From 594cc262f4404feab6ab437dacc010f6d1f6263f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 18 Mar 2026 14:04:51 +0000 Subject: nvmutil: move lib files to lib/ only keep nvmutil.c in main Signed-off-by: Leah Rowe --- util/nvmutil/num.c | 103 ----------------------------------------------------- 1 file changed, 103 deletions(-) delete mode 100644 util/nvmutil/num.c (limited to 'util/nvmutil/num.c') diff --git a/util/nvmutil/num.c b/util/nvmutil/num.c deleted file mode 100644 index ab68fcde..00000000 --- a/util/nvmutil/num.c +++ /dev/null @@ -1,103 +0,0 @@ -/* SPDX-License-Identifier: MIT - * - * Copyright (c) 2026 Leah Rowe - * - * Numerical functions. - */ - -#ifdef __OpenBSD__ -#include -#endif -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "include/common.h" - -unsigned short -hextonum(char ch_s) -{ - unsigned char ch; - - ch = (unsigned char)ch_s; - - if ((unsigned int)(ch - '0') <= 9) - return ch - '0'; - - ch |= 0x20; - - if ((unsigned int)(ch - 'a') <= 5) - return ch - 'a' + 10; - - if (ch == '?' || ch == 'x') - return (unsigned short)rlong() & 0xf; - - return 16; /* invalid character */ -} - -/* - * Portable random - * number generator - */ -unsigned long -rlong(void) -{ -#if (defined(__OpenBSD__) && (OpenBSD) >= 201) || \ - defined(__FreeBSD__) || \ - defined(__NetBSD__) || defined(__APPLE__) - - unsigned long rval; - arc4random_buf(&rval, sizeof(unsigned long)); - - return rval; -#else - int fd; - - long nr; - - unsigned long rval; - - fd = open("/dev/urandom", O_RDONLY | O_BINARY); - -#ifdef __OpenBSD__ - if (fd < 0) /* old openbsd */ - fd = open("/dev/arandom", O_RDONLY | O_BINARY); -#endif - - if (fd < 0) - fd = open("/dev/random", O_RDONLY | O_BINARY); - - if (fd < 0) - err(errno, "can't open random device"); - - nr = rw_file_exact(fd, (unsigned char *)&rval, - sizeof(unsigned long), 0, IO_READ, LOOP_EAGAIN, - LOOP_EINTR, MAX_ZERO_RW_RETRY, OFF_ERR); - - if (x_i_close(fd) < 0) - err(errno, "Can't close randomness fd"); - - if (nr != sizeof(unsigned long)) - err(errno, "Incomplete read from random device"); - - return rval; -#endif -} - -void -check_bin(unsigned long a, const char *a_name) -{ - if (a > 1) - err(EINVAL, "%s must be 0 or 1, but is %lu", - a_name, (unsigned long)a); -} -- cgit v1.2.1