From 21ceafbaacbfec47bc26f6c500847fd09c3924e0 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 20 Apr 2018 17:46:03 -0700 Subject: [PATCH] Remove BSD dd. Bug: N/A Test: builds Change-Id: Id80364241434abfc216149b4ce7440cef700abef --- toolbox/Android.bp | 28 +- toolbox/bsd-compatibility.h | 84 --- toolbox/tools.h | 1 - toolbox/upstream-netbsd/bin/dd/args.c | 391 ------------ toolbox/upstream-netbsd/bin/dd/conv.c | 283 --------- toolbox/upstream-netbsd/bin/dd/dd.c | 598 ------------------ toolbox/upstream-netbsd/bin/dd/dd.h | 127 ---- toolbox/upstream-netbsd/bin/dd/dd_hostops.c | 53 -- toolbox/upstream-netbsd/bin/dd/extern.h | 82 --- toolbox/upstream-netbsd/bin/dd/misc.c | 342 ---------- toolbox/upstream-netbsd/bin/dd/position.c | 185 ------ toolbox/upstream-netbsd/include/namespace.h | 0 toolbox/upstream-netbsd/include/sys/extattr.h | 0 toolbox/upstream-netbsd/include/util.h | 0 .../upstream-netbsd/lib/libc/gen/getbsize.c | 118 ---- .../lib/libc/gen/humanize_number.c | 161 ----- .../lib/libc/stdlib/strsuftoll.c | 249 -------- .../upstream-netbsd/lib/libc/string/swab.c | 80 --- .../lib/libutil/raise_default_signal.c | 117 ---- 19 files changed, 1 insertion(+), 2898 deletions(-) delete mode 100644 toolbox/bsd-compatibility.h delete mode 100644 toolbox/upstream-netbsd/bin/dd/args.c delete mode 100644 toolbox/upstream-netbsd/bin/dd/conv.c delete mode 100644 toolbox/upstream-netbsd/bin/dd/dd.c delete mode 100644 toolbox/upstream-netbsd/bin/dd/dd.h delete mode 100644 toolbox/upstream-netbsd/bin/dd/dd_hostops.c delete mode 100644 toolbox/upstream-netbsd/bin/dd/extern.h delete mode 100644 toolbox/upstream-netbsd/bin/dd/misc.c delete mode 100644 toolbox/upstream-netbsd/bin/dd/position.c delete mode 100644 toolbox/upstream-netbsd/include/namespace.h delete mode 100644 toolbox/upstream-netbsd/include/sys/extattr.h delete mode 100644 toolbox/upstream-netbsd/include/util.h delete mode 100644 toolbox/upstream-netbsd/lib/libc/gen/getbsize.c delete mode 100644 toolbox/upstream-netbsd/lib/libc/gen/humanize_number.c delete mode 100644 toolbox/upstream-netbsd/lib/libc/stdlib/strsuftoll.c delete mode 100644 toolbox/upstream-netbsd/lib/libc/string/swab.c delete mode 100644 toolbox/upstream-netbsd/lib/libutil/raise_default_signal.c diff --git a/toolbox/Android.bp b/toolbox/Android.bp index c6d4d9b84..232dd6332 100644 --- a/toolbox/Android.bp +++ b/toolbox/Android.bp @@ -5,32 +5,8 @@ cc_defaults { "-Werror", "-Wno-unused-parameter", "-Wno-unused-const-variable", - "-include bsd-compatibility.h", "-D_FILE_OFFSET_BITS=64", - ], - local_include_dirs: ["upstream-netbsd/include/"], -} - -cc_library_static { - name: "libtoolbox_dd", - defaults: ["toolbox_defaults"], - vendor_available: true, - srcs: [ - "upstream-netbsd/bin/dd/args.c", - "upstream-netbsd/bin/dd/conv.c", - "upstream-netbsd/bin/dd/dd.c", - "upstream-netbsd/bin/dd/dd_hostops.c", - "upstream-netbsd/bin/dd/misc.c", - "upstream-netbsd/bin/dd/position.c", - "upstream-netbsd/lib/libc/gen/getbsize.c", - "upstream-netbsd/lib/libc/gen/humanize_number.c", - "upstream-netbsd/lib/libc/stdlib/strsuftoll.c", - "upstream-netbsd/lib/libc/string/swab.c", - "upstream-netbsd/lib/libutil/raise_default_signal.c", - ], - cflags: [ - "-Dmain=dd_main", - "-DNO_CONV", + "-DWITHOUT_NLS", ], } @@ -55,10 +31,8 @@ cc_defaults { generated_headers: [ "toolbox_input_labels", ], - whole_static_libs: ["libtoolbox_dd"], shared_libs: [ "libbase", - "libcutils", ], static_libs: ["libpropertyinfoparser"], diff --git a/toolbox/bsd-compatibility.h b/toolbox/bsd-compatibility.h deleted file mode 100644 index 7c3ddd452..000000000 --- a/toolbox/bsd-compatibility.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2014, The Android Open Source Project - * All rights reserved. - * - * 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 OWNER 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. - */ - -#include -#include - -/* We want chown to support user.group as well as user:group. */ -#define SUPPORT_DOT - -/* We don't localize /system/bin! */ -#define WITHOUT_NLS - -// NetBSD uses _DIAGASSERT to null-check arguments and the like. -#include -#define _DIAGASSERT(e) ((e) ? (void) 0 : __assert2(__FILE__, __LINE__, __func__, #e)) - -// TODO: update our to support this properly. -#define __type_fit(t, a) (0 == 0) - -// TODO: should this be in our ? -#define __arraycount(a) (sizeof(a) / sizeof((a)[0])) - -// This at least matches GNU dd(1) behavior. -#define SIGINFO SIGUSR1 - -#define S_ISWHT(x) false - -__BEGIN_DECLS - -/* From NetBSD . */ -#define HN_DECIMAL 0x01 -#define HN_NOSPACE 0x02 -#define HN_B 0x04 -#define HN_DIVISOR_1000 0x08 -#define HN_GETSCALE 0x10 -#define HN_AUTOSCALE 0x20 -int humanize_number(char *, size_t, int64_t, const char *, int, int); -int dehumanize_number(const char *, int64_t *); -char *getbsize(int *, long *); -long long strsuftoll(const char *, const char *, long long, long long); -long long strsuftollx(const char *, const char *, long long, long long, - char *, size_t); - -/* From NetBSD . */ -void strmode(mode_t, char*); - -/* From NetBSD . */ -#define MAXBSIZE 65536 - -/* From NetBSD . */ -#define DEFFILEMODE (S_IRUSR | S_IWUSR) - -/* From NetBSD . */ -void swab(const void * __restrict, void * __restrict, ssize_t); - -/* From NetBSD . */ -int raise_default_signal(int); - -__END_DECLS diff --git a/toolbox/tools.h b/toolbox/tools.h index 505f5281b..3d4bc3e12 100644 --- a/toolbox/tools.h +++ b/toolbox/tools.h @@ -1,4 +1,3 @@ -TOOL(dd) TOOL(getevent) TOOL(getprop) TOOL(newfs_msdos) diff --git a/toolbox/upstream-netbsd/bin/dd/args.c b/toolbox/upstream-netbsd/bin/dd/args.c deleted file mode 100644 index 207e30081..000000000 --- a/toolbox/upstream-netbsd/bin/dd/args.c +++ /dev/null @@ -1,391 +0,0 @@ -/* $NetBSD: args.c,v 1.38 2013/07/17 12:55:48 christos Exp $ */ - -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: args.c,v 1.38 2013/07/17 12:55:48 christos Exp $"); -#endif -#endif /* not lint */ - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "dd.h" -#include "extern.h" - -static int c_arg(const void *, const void *); - -#ifdef NO_MSGFMT -static void f_msgfmt(char *) __dead; -#else -static void f_msgfmt(char *); -#endif /* NO_MSGFMT */ - -#ifdef NO_CONV -static void f_conv(char *) __dead; -#else -static void f_conv(char *); -static int c_conv(const void *, const void *); -#endif /* NO_CONV */ - -static void f_bs(char *); -static void f_cbs(char *); -static void f_count(char *); -static void f_files(char *); -static void f_ibs(char *); -static void f_if(char *); -static void f_obs(char *); -static void f_of(char *); -static void f_seek(char *); -static void f_skip(char *); -static void f_progress(char *); - -static const struct arg { - const char *name; - void (*f)(char *); - u_int set, noset; -} args[] = { - /* the array needs to be sorted by the first column so - bsearch() can be used to find commands quickly */ - { "bs", f_bs, C_BS, C_BS|C_IBS|C_OBS|C_OSYNC }, - { "cbs", f_cbs, C_CBS, C_CBS }, - { "conv", f_conv, 0, 0 }, - { "count", f_count, C_COUNT, C_COUNT }, - { "files", f_files, C_FILES, C_FILES }, - { "ibs", f_ibs, C_IBS, C_BS|C_IBS }, - { "if", f_if, C_IF, C_IF }, - { "iseek", f_skip, C_SKIP, C_SKIP }, - { "msgfmt", f_msgfmt, 0, 0 }, - { "obs", f_obs, C_OBS, C_BS|C_OBS }, - { "of", f_of, C_OF, C_OF }, - { "oseek", f_seek, C_SEEK, C_SEEK }, - { "progress", f_progress, 0, 0 }, - { "seek", f_seek, C_SEEK, C_SEEK }, - { "skip", f_skip, C_SKIP, C_SKIP }, -}; - -/* - * args -- parse JCL syntax of dd. - */ -void -jcl(char **argv) -{ - struct arg *ap, tmp; - char *oper, *arg; - - in.dbsz = out.dbsz = 512; - - while ((oper = *++argv) != NULL) { - if ((oper = strdup(oper)) == NULL) { - errx(EXIT_FAILURE, - "unable to allocate space for the argument %s", - *argv); - /* NOTREACHED */ - } - if ((arg = strchr(oper, '=')) == NULL) { - errx(EXIT_FAILURE, "unknown operand %s", oper); - /* NOTREACHED */ - } - *arg++ = '\0'; - if (!*arg) { - errx(EXIT_FAILURE, "no value specified for %s", oper); - /* NOTREACHED */ - } - tmp.name = oper; - if (!(ap = bsearch(&tmp, args, - __arraycount(args), sizeof(*args), c_arg))) { - errx(EXIT_FAILURE, "unknown operand %s", tmp.name); - /* NOTREACHED */ - } - if (ddflags & ap->noset) { - errx(EXIT_FAILURE, - "%s: illegal argument combination or already set", - tmp.name); - /* NOTREACHED */ - } - ddflags |= ap->set; - ap->f(arg); - } - - /* Final sanity checks. */ - - if (ddflags & C_BS) { - /* - * Bs is turned off by any conversion -- we assume the user - * just wanted to set both the input and output block sizes - * and didn't want the bs semantics, so we don't warn. - */ - if (ddflags & (C_BLOCK | C_LCASE | C_SWAB | C_UCASE | - C_UNBLOCK | C_OSYNC | C_ASCII | C_EBCDIC | C_SPARSE)) { - ddflags &= ~C_BS; - ddflags |= C_IBS|C_OBS; - } - - /* Bs supersedes ibs and obs. */ - if (ddflags & C_BS && ddflags & (C_IBS|C_OBS)) - warnx("bs supersedes ibs and obs"); - } - - /* - * Ascii/ebcdic and cbs implies block/unblock. - * Block/unblock requires cbs and vice-versa. - */ - if (ddflags & (C_BLOCK|C_UNBLOCK)) { - if (!(ddflags & C_CBS)) { - errx(EXIT_FAILURE, "record operations require cbs"); - /* NOTREACHED */ - } - cfunc = ddflags & C_BLOCK ? block : unblock; - } else if (ddflags & C_CBS) { - if (ddflags & (C_ASCII|C_EBCDIC)) { - if (ddflags & C_ASCII) { - ddflags |= C_UNBLOCK; - cfunc = unblock; - } else { - ddflags |= C_BLOCK; - cfunc = block; - } - } else { - errx(EXIT_FAILURE, - "cbs meaningless if not doing record operations"); - /* NOTREACHED */ - } - } else - cfunc = def; - - /* Read, write and seek calls take off_t as arguments. - * - * The following check is not done because an off_t is a quad - * for current NetBSD implementations. - * - * if (in.offset > INT_MAX/in.dbsz || out.offset > INT_MAX/out.dbsz) - * errx(1, "seek offsets cannot be larger than %d", INT_MAX); - */ -} - -static int -c_arg(const void *a, const void *b) -{ - - return (strcmp(((const struct arg *)a)->name, - ((const struct arg *)b)->name)); -} - -static void -f_bs(char *arg) -{ - - in.dbsz = out.dbsz = strsuftoll("block size", arg, 1, UINT_MAX); -} - -static void -f_cbs(char *arg) -{ - - cbsz = strsuftoll("conversion record size", arg, 1, UINT_MAX); -} - -static void -f_count(char *arg) -{ - - cpy_cnt = strsuftoll("block count", arg, 0, LLONG_MAX); - if (!cpy_cnt) - terminate(0); -} - -static void -f_files(char *arg) -{ - - files_cnt = (u_int)strsuftoll("file count", arg, 0, UINT_MAX); - if (!files_cnt) - terminate(0); -} - -static void -f_ibs(char *arg) -{ - - if (!(ddflags & C_BS)) - in.dbsz = strsuftoll("input block size", arg, 1, UINT_MAX); -} - -static void -f_if(char *arg) -{ - - in.name = arg; -} - -#ifdef NO_MSGFMT -/* Build a small version (i.e. for a ramdisk root) */ -static void -f_msgfmt(char *arg) -{ - - errx(EXIT_FAILURE, "msgfmt option disabled"); - /* NOTREACHED */ -} -#else /* NO_MSGFMT */ -static void -f_msgfmt(char *arg) -{ - - /* - * If the format string is not valid, dd_write_msg() will print - * an error and exit. - */ - dd_write_msg(arg, 0); - - msgfmt = arg; -} -#endif /* NO_MSGFMT */ - -static void -f_obs(char *arg) -{ - - if (!(ddflags & C_BS)) - out.dbsz = strsuftoll("output block size", arg, 1, UINT_MAX); -} - -static void -f_of(char *arg) -{ - - out.name = arg; -} - -static void -f_seek(char *arg) -{ - - out.offset = strsuftoll("seek blocks", arg, 0, LLONG_MAX); -} - -static void -f_skip(char *arg) -{ - - in.offset = strsuftoll("skip blocks", arg, 0, LLONG_MAX); -} - -static void -f_progress(char *arg) -{ - - progress = strsuftoll("progress blocks", arg, 0, LLONG_MAX); -} - -#ifdef NO_CONV -/* Build a small version (i.e. for a ramdisk root) */ -static void -f_conv(char *arg) -{ - - errx(EXIT_FAILURE, "conv option disabled"); - /* NOTREACHED */ -} -#else /* NO_CONV */ - -static const struct conv { - const char *name; - u_int set, noset; - const u_char *ctab; -} clist[] = { - { "ascii", C_ASCII, C_EBCDIC, e2a_POSIX }, - { "block", C_BLOCK, C_UNBLOCK, NULL }, - { "ebcdic", C_EBCDIC, C_ASCII, a2e_POSIX }, - { "ibm", C_EBCDIC, C_ASCII, a2ibm_POSIX }, - { "lcase", C_LCASE, C_UCASE, NULL }, - { "noerror", C_NOERROR, 0, NULL }, - { "notrunc", C_NOTRUNC, 0, NULL }, - { "oldascii", C_ASCII, C_EBCDIC, e2a_32V }, - { "oldebcdic", C_EBCDIC, C_ASCII, a2e_32V }, - { "oldibm", C_EBCDIC, C_ASCII, a2ibm_32V }, - { "osync", C_OSYNC, C_BS, NULL }, - { "sparse", C_SPARSE, 0, NULL }, - { "swab", C_SWAB, 0, NULL }, - { "sync", C_SYNC, 0, NULL }, - { "ucase", C_UCASE, C_LCASE, NULL }, - { "unblock", C_UNBLOCK, C_BLOCK, NULL }, - /* If you add items to this table, be sure to add the - * conversions to the C_BS check in the jcl routine above. - */ -}; - -static void -f_conv(char *arg) -{ - struct conv *cp, tmp; - - while (arg != NULL) { - tmp.name = strsep(&arg, ","); - if (!(cp = bsearch(&tmp, clist, - __arraycount(clist), sizeof(*clist), c_conv))) { - errx(EXIT_FAILURE, "unknown conversion %s", tmp.name); - /* NOTREACHED */ - } - if (ddflags & cp->noset) { - errx(EXIT_FAILURE, - "%s: illegal conversion combination", tmp.name); - /* NOTREACHED */ - } - ddflags |= cp->set; - if (cp->ctab) - ctab = cp->ctab; - } -} - -static int -c_conv(const void *a, const void *b) -{ - - return (strcmp(((const struct conv *)a)->name, - ((const struct conv *)b)->name)); -} - -#endif /* NO_CONV */ diff --git a/toolbox/upstream-netbsd/bin/dd/conv.c b/toolbox/upstream-netbsd/bin/dd/conv.c deleted file mode 100644 index d4a8a0952..000000000 --- a/toolbox/upstream-netbsd/bin/dd/conv.c +++ /dev/null @@ -1,283 +0,0 @@ -/* $NetBSD: conv.c,v 1.17 2003/08/07 09:05:10 agc Exp $ */ - -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: conv.c,v 1.17 2003/08/07 09:05:10 agc Exp $"); -#endif -#endif /* not lint */ - -#include -#include - -#include -#include -#include - -#include "dd.h" -#include "extern.h" - -/* - * def -- - * Copy input to output. Input is buffered until reaches obs, and then - * output until less than obs remains. Only a single buffer is used. - * Worst case buffer calculation is (ibs + obs - 1). - */ -void -def(void) -{ - uint64_t cnt; - u_char *inp; - const u_char *t; - - if ((t = ctab) != NULL) - for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp) - *inp = t[*inp]; - - /* Make the output buffer look right. */ - out.dbp = in.dbp; - out.dbcnt = in.dbcnt; - - if (in.dbcnt >= out.dbsz) { - /* If the output buffer is full, write it. */ - dd_out(0); - - /* - * Ddout copies the leftover output to the beginning of - * the buffer and resets the output buffer. Reset the - * input buffer to match it. - */ - in.dbp = out.dbp; - in.dbcnt = out.dbcnt; - } -} - -void -def_close(void) -{ - - /* Just update the count, everything is already in the buffer. */ - if (in.dbcnt) - out.dbcnt = in.dbcnt; -} - -#ifdef NO_CONV -/* Build a smaller version (i.e. for a miniroot) */ -/* These can not be called, but just in case... */ -static const char no_block[] = "unblock and -DNO_CONV?"; -void block(void) { errx(EXIT_FAILURE, "%s", no_block + 2); } -void block_close(void) { errx(EXIT_FAILURE, "%s", no_block + 2); } -void unblock(void) { errx(EXIT_FAILURE, "%s", no_block); } -void unblock_close(void) { errx(EXIT_FAILURE, "%s", no_block); } -#else /* NO_CONV */ - -/* - * Copy variable length newline terminated records with a max size cbsz - * bytes to output. Records less than cbs are padded with spaces. - * - * max in buffer: MAX(ibs, cbsz) - * max out buffer: obs + cbsz - */ -void -block(void) -{ - static int intrunc; - int ch = 0; /* pacify gcc */ - uint64_t cnt, maxlen; - u_char *inp, *outp; - const u_char *t; - - /* - * Record truncation can cross block boundaries. If currently in a - * truncation state, keep tossing characters until reach a newline. - * Start at the beginning of the buffer, as the input buffer is always - * left empty. - */ - if (intrunc) { - for (inp = in.db, cnt = in.dbrcnt; - cnt && *inp++ != '\n'; --cnt); - if (!cnt) { - in.dbcnt = 0; - in.dbp = in.db; - return; - } - intrunc = 0; - /* Adjust the input buffer numbers. */ - in.dbcnt = cnt - 1; - in.dbp = inp + cnt - 1; - } - - /* - * Copy records (max cbsz size chunks) into the output buffer. The - * translation is done as we copy into the output buffer. - */ - for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) { - maxlen = MIN(cbsz, in.dbcnt); - if ((t = ctab) != NULL) - for (cnt = 0; - cnt < maxlen && (ch = *inp++) != '\n'; ++cnt) - *outp++ = t[ch]; - else - for (cnt = 0; - cnt < maxlen && (ch = *inp++) != '\n'; ++cnt) - *outp++ = ch; - /* - * Check for short record without a newline. Reassemble the - * input block. - */ - if (ch != '\n' && in.dbcnt < cbsz) { - (void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt); - break; - } - - /* Adjust the input buffer numbers. */ - in.dbcnt -= cnt; - if (ch == '\n') - --in.dbcnt; - - /* Pad short records with spaces. */ - if (cnt < cbsz) - (void)memset(outp, ctab ? ctab[' '] : ' ', cbsz - cnt); - else { - /* - * If the next character wouldn't have ended the - * block, it's a truncation. - */ - if (!in.dbcnt || *inp != '\n') - ++st.trunc; - - /* Toss characters to a newline. */ - for (; in.dbcnt && *inp++ != '\n'; --in.dbcnt); - if (!in.dbcnt) - intrunc = 1; - else - --in.dbcnt; - } - - /* Adjust output buffer numbers. */ - out.dbp += cbsz; - if ((out.dbcnt += cbsz) >= out.dbsz) - dd_out(0); - outp = out.dbp; - } - in.dbp = in.db + in.dbcnt; -} - -void -block_close(void) -{ - - /* - * Copy any remaining data into the output buffer and pad to a record. - * Don't worry about truncation or translation, the input buffer is - * always empty when truncating, and no characters have been added for - * translation. The bottom line is that anything left in the input - * buffer is a truncated record. Anything left in the output buffer - * just wasn't big enough. - */ - if (in.dbcnt) { - ++st.trunc; - (void)memmove(out.dbp, in.dbp - in.dbcnt, in.dbcnt); - (void)memset(out.dbp + in.dbcnt, - ctab ? ctab[' '] : ' ', cbsz - in.dbcnt); - out.dbcnt += cbsz; - } -} - -/* - * Convert fixed length (cbsz) records to variable length. Deletes any - * trailing blanks and appends a newline. - * - * max in buffer: MAX(ibs, cbsz) + cbsz - * max out buffer: obs + cbsz - */ -void -unblock(void) -{ - uint64_t cnt; - u_char *inp; - const u_char *t; - - /* Translation and case conversion. */ - if ((t = ctab) != NULL) - for (cnt = in.dbrcnt, inp = in.dbp - 1; cnt--; inp--) - *inp = t[*inp]; - /* - * Copy records (max cbsz size chunks) into the output buffer. The - * translation has to already be done or we might not recognize the - * spaces. - */ - for (inp = in.db; in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) { - for (t = inp + cbsz - 1; t >= inp && *t == ' '; --t); - if (t >= inp) { - cnt = t - inp + 1; - (void)memmove(out.dbp, inp, cnt); - out.dbp += cnt; - out.dbcnt += cnt; - } - ++out.dbcnt; - *out.dbp++ = '\n'; - if (out.dbcnt >= out.dbsz) - dd_out(0); - } - if (in.dbcnt) - (void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt); - in.dbp = in.db + in.dbcnt; -} - -void -unblock_close(void) -{ - uint64_t cnt; - u_char *t; - - if (in.dbcnt) { - warnx("%s: short input record", in.name); - for (t = in.db + in.dbcnt - 1; t >= in.db && *t == ' '; --t); - if (t >= in.db) { - cnt = t - in.db + 1; - (void)memmove(out.dbp, in.db, cnt); - out.dbp += cnt; - out.dbcnt += cnt; - } - ++out.dbcnt; - *out.dbp++ = '\n'; - } -} - -#endif /* NO_CONV */ diff --git a/toolbox/upstream-netbsd/bin/dd/dd.c b/toolbox/upstream-netbsd/bin/dd/dd.c deleted file mode 100644 index 03d080cd4..000000000 --- a/toolbox/upstream-netbsd/bin/dd/dd.c +++ /dev/null @@ -1,598 +0,0 @@ -/* $NetBSD: dd.c,v 1.49 2012/02/21 01:49:01 matt Exp $ */ - -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include -#ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1991, 1993, 1994\ - The Regents of the University of California. All rights reserved."); -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: dd.c,v 1.49 2012/02/21 01:49:01 matt Exp $"); -#endif -#endif /* not lint */ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "dd.h" -#include "extern.h" - -static void dd_close(void); -static void dd_in(void); -static void getfdtype(IO *); -static void redup_clean_fd(IO *); -static void setup(void); - -int main(int, char *[]); - -IO in, out; /* input/output state */ -STAT st; /* statistics */ -void (*cfunc)(void); /* conversion function */ -uint64_t cpy_cnt; /* # of blocks to copy */ -static off_t pending = 0; /* pending seek if sparse */ -u_int ddflags; /* conversion options */ -uint64_t cbsz; /* conversion block size */ -u_int files_cnt = 1; /* # of files to copy */ -uint64_t progress = 0; /* display sign of life */ -const u_char *ctab; /* conversion table */ -sigset_t infoset; /* a set blocking SIGINFO */ -const char *msgfmt = "posix"; /* default summary() message format */ - -/* - * Ops for stdin/stdout and crunch'd dd. These are always host ops. - */ -static const struct ddfops ddfops_stdfd = { - .op_open = open, - .op_close = close, - .op_fcntl = fcntl, - .op_ioctl = ioctl, - .op_fstat = fstat, - .op_fsync = fsync, - .op_ftruncate = ftruncate, - .op_lseek = lseek, - .op_read = read, - .op_write = write, -}; -extern const struct ddfops ddfops_prog; - -int -main(int argc, char *argv[]) -{ - int ch; - - setprogname(argv[0]); - (void)setlocale(LC_ALL, ""); - - while ((ch = getopt(argc, argv, "")) != -1) { - switch (ch) { - default: - errx(EXIT_FAILURE, "usage: dd [operand ...]"); - /* NOTREACHED */ - } - } - argc -= (optind - 1); - argv += (optind - 1); - - jcl(argv); -#ifndef CRUNCHOPS - if (ddfops_prog.op_init && ddfops_prog.op_init() == -1) - err(1, "prog init"); -#endif - setup(); - - (void)signal(SIGINFO, summaryx); - (void)signal(SIGINT, terminate); - (void)sigemptyset(&infoset); - (void)sigaddset(&infoset, SIGINFO); - - (void)atexit(summary); - - while (files_cnt--) - dd_in(); - - dd_close(); - exit(0); - /* NOTREACHED */ -} - -static void -setup(void) -{ -#ifdef CRUNCHOPS - const struct ddfops *prog_ops = &ddfops_stdfd; -#else - const struct ddfops *prog_ops = &ddfops_prog; -#endif - - if (in.name == NULL) { - in.name = "stdin"; - in.fd = STDIN_FILENO; - in.ops = &ddfops_stdfd; - } else { - in.ops = prog_ops; - in.fd = ddop_open(in, in.name, O_RDONLY, 0); - if (in.fd < 0) - err(EXIT_FAILURE, "%s", in.name); - /* NOTREACHED */ - - /* Ensure in.fd is outside the stdio descriptor range */ - redup_clean_fd(&in); - } - - getfdtype(&in); - - if (files_cnt > 1 && !(in.flags & ISTAPE)) { - errx(EXIT_FAILURE, "files is not supported for non-tape devices"); - /* NOTREACHED */ - } - - if (out.name == NULL) { - /* No way to check for read access here. */ - out.fd = STDOUT_FILENO; - out.name = "stdout"; - out.ops = &ddfops_stdfd; - } else { - out.ops = prog_ops; -#define OFLAGS \ - (O_CREAT | (ddflags & (C_SEEK | C_NOTRUNC) ? 0 : O_TRUNC)) - out.fd = ddop_open(out, out.name, O_RDWR | OFLAGS, DEFFILEMODE); - /* - * May not have read access, so try again with write only. - * Without read we may have a problem if output also does - * not support seeks. - */ - if (out.fd < 0) { - out.fd = ddop_open(out, out.name, O_WRONLY | OFLAGS, - DEFFILEMODE); - out.flags |= NOREAD; - } - if (out.fd < 0) { - err(EXIT_FAILURE, "%s", out.name); - /* NOTREACHED */ - } - - /* Ensure out.fd is outside the stdio descriptor range */ - redup_clean_fd(&out); - } - - getfdtype(&out); - - /* - * Allocate space for the input and output buffers. If not doing - * record oriented I/O, only need a single buffer. - */ - if (!(ddflags & (C_BLOCK|C_UNBLOCK))) { - size_t dbsz = out.dbsz; - if (!(ddflags & C_BS)) - dbsz += in.dbsz - 1; - if ((in.db = malloc(dbsz)) == NULL) { - err(EXIT_FAILURE, NULL); - /* NOTREACHED */ - } - out.db = in.db; - } else if ((in.db = - malloc((u_int)(MAX(in.dbsz, cbsz) + cbsz))) == NULL || - (out.db = malloc((u_int)(out.dbsz + cbsz))) == NULL) { - err(EXIT_FAILURE, NULL); - /* NOTREACHED */ - } - in.dbp = in.db; - out.dbp = out.db; - - /* Position the input/output streams. */ - if (in.offset) - pos_in(); - if (out.offset) - pos_out(); - - /* - * Truncate the output file; ignore errors because it fails on some - * kinds of output files, tapes, for example. - */ - if ((ddflags & (C_OF | C_SEEK | C_NOTRUNC)) == (C_OF | C_SEEK)) - (void)ddop_ftruncate(out, out.fd, (off_t)out.offset * out.dbsz); - - /* - * If converting case at the same time as another conversion, build a - * table that does both at once. If just converting case, use the - * built-in tables. - */ - if (ddflags & (C_LCASE|C_UCASE)) { -#ifdef NO_CONV - /* Should not get here, but just in case... */ - errx(EXIT_FAILURE, "case conv and -DNO_CONV"); - /* NOTREACHED */ -#else /* NO_CONV */ - u_int cnt; - - if (ddflags & C_ASCII || ddflags & C_EBCDIC) { - if (ddflags & C_LCASE) { - for (cnt = 0; cnt < 256; ++cnt) - casetab[cnt] = tolower(ctab[cnt]); - } else { - for (cnt = 0; cnt < 256; ++cnt) - casetab[cnt] = toupper(ctab[cnt]); - } - } else { - if (ddflags & C_LCASE) { - for (cnt = 0; cnt < 256; ++cnt) - casetab[cnt] = tolower(cnt); - } else { - for (cnt = 0; cnt < 256; ++cnt) - casetab[cnt] = toupper(cnt); - } - } - - ctab = casetab; -#endif /* NO_CONV */ - } - - (void)gettimeofday(&st.start, NULL); /* Statistics timestamp. */ -} - -static void -getfdtype(IO *io) -{ - struct mtget mt; - struct stat sb; - - if (io->ops->op_fstat(io->fd, &sb)) { - err(EXIT_FAILURE, "%s", io->name); - /* NOTREACHED */ - } - if (S_ISCHR(sb.st_mode)) - io->flags |= io->ops->op_ioctl(io->fd, MTIOCGET, &mt) - ? ISCHR : ISTAPE; - else if (io->ops->op_lseek(io->fd, (off_t)0, SEEK_CUR) == -1 - && errno == ESPIPE) - io->flags |= ISPIPE; /* XXX fixed in 4.4BSD */ -} - -/* - * Move the parameter file descriptor to a descriptor that is outside the - * stdio descriptor range, if necessary. This is required to avoid - * accidentally outputting completion or error messages into the - * output file that were intended for the tty. - */ -static void -redup_clean_fd(IO *io) -{ - int fd = io->fd; - int newfd; - - if (fd != STDIN_FILENO && fd != STDOUT_FILENO && - fd != STDERR_FILENO) - /* File descriptor is ok, return immediately. */ - return; - - /* - * 3 is the first descriptor greater than STD*_FILENO. Any - * free descriptor valued 3 or above is acceptable... - */ - newfd = io->ops->op_fcntl(fd, F_DUPFD, 3); - if (newfd < 0) { - err(EXIT_FAILURE, "dupfd IO"); - /* NOTREACHED */ - } - - io->ops->op_close(fd); - io->fd = newfd; -} - -static void -dd_in(void) -{ - int flags; - int64_t n; - - for (flags = ddflags;;) { - if (cpy_cnt && (st.in_full + st.in_part) >= cpy_cnt) - return; - - /* - * Clear the buffer first if doing "sync" on input. - * If doing block operations use spaces. This will - * affect not only the C_NOERROR case, but also the - * last partial input block which should be padded - * with zero and not garbage. - */ - if (flags & C_SYNC) { - if (flags & (C_BLOCK|C_UNBLOCK)) - (void)memset(in.dbp, ' ', in.dbsz); - else - (void)memset(in.dbp, 0, in.dbsz); - } - - n = ddop_read(in, in.fd, in.dbp, in.dbsz); - if (n == 0) { - in.dbrcnt = 0; - return; - } - - /* Read error. */ - if (n < 0) { - - /* - * If noerror not specified, die. POSIX requires that - * the warning message be followed by an I/O display. - */ - if (!(flags & C_NOERROR)) { - err(EXIT_FAILURE, "%s", in.name); - /* NOTREACHED */ - } - warn("%s", in.name); - summary(); - - /* - * If it's not a tape drive or a pipe, seek past the - * error. If your OS doesn't do the right thing for - * raw disks this section should be modified to re-read - * in sector size chunks. - */ - if (!(in.flags & (ISPIPE|ISTAPE)) && - ddop_lseek(in, in.fd, (off_t)in.dbsz, SEEK_CUR)) - warn("%s", in.name); - - /* If sync not specified, omit block and continue. */ - if (!(ddflags & C_SYNC)) - continue; - - /* Read errors count as full blocks. */ - in.dbcnt += in.dbrcnt = in.dbsz; - ++st.in_full; - - /* Handle full input blocks. */ - } else if ((uint64_t)n == in.dbsz) { - in.dbcnt += in.dbrcnt = n; - ++st.in_full; - - /* Handle partial input blocks. */ - } else { - /* If sync, use the entire block. */ - if (ddflags & C_SYNC) - in.dbcnt += in.dbrcnt = in.dbsz; - else - in.dbcnt += in.dbrcnt = n; - ++st.in_part; - } - - /* - * POSIX states that if bs is set and no other conversions - * than noerror, notrunc or sync are specified, the block - * is output without buffering as it is read. - */ - if (ddflags & C_BS) { - out.dbcnt = in.dbcnt; - dd_out(1); - in.dbcnt = 0; - continue; - } - - if (ddflags & C_SWAB) { - if ((n = in.dbrcnt) & 1) { - ++st.swab; - --n; - } - swab(in.dbp, in.dbp, n); - } - - in.dbp += in.dbrcnt; - (*cfunc)(); - } -} - -/* - * Cleanup any remaining I/O and flush output. If necessary, output file - * is truncated. - */ -static void -dd_close(void) -{ - - if (cfunc == def) - def_close(); - else if (cfunc == block) - block_close(); - else if (cfunc == unblock) - unblock_close(); - if (ddflags & C_OSYNC && out.dbcnt < out.dbsz) { - (void)memset(out.dbp, 0, out.dbsz - out.dbcnt); - out.dbcnt = out.dbsz; - } - /* If there are pending sparse blocks, make sure - * to write out the final block un-sparse - */ - if ((out.dbcnt == 0) && pending) { - memset(out.db, 0, out.dbsz); - out.dbcnt = out.dbsz; - out.dbp = out.db + out.dbcnt; - pending -= out.dbsz; - } - if (out.dbcnt) - dd_out(1); - - /* - * Reporting nfs write error may be deferred until next - * write(2) or close(2) system call. So, we need to do an - * extra check. If an output is stdout, the file structure - * may be shared with other processes and close(2) just - * decreases the reference count. - */ - if (out.fd == STDOUT_FILENO && ddop_fsync(out, out.fd) == -1 - && errno != EINVAL) { - err(EXIT_FAILURE, "fsync stdout"); - /* NOTREACHED */ - } - if (ddop_close(out, out.fd) == -1) { - err(EXIT_FAILURE, "close"); - /* NOTREACHED */ - } -} - -void -dd_out(int force) -{ - static int warned; - int64_t cnt, n, nw; - u_char *outp; - - /* - * Write one or more blocks out. The common case is writing a full - * output block in a single write; increment the full block stats. - * Otherwise, we're into partial block writes. If a partial write, - * and it's a character device, just warn. If a tape device, quit. - * - * The partial writes represent two cases. 1: Where the input block - * was less than expected so the output block was less than expected. - * 2: Where the input block was the right size but we were forced to - * write the block in multiple chunks. The original versions of dd(1) - * never wrote a block in more than a single write, so the latter case - * never happened. - * - * One special case is if we're forced to do the write -- in that case - * we play games with the buffer size, and it's usually a partial write. - */ - outp = out.db; - for (n = force ? out.dbcnt : out.dbsz;; n = out.dbsz) { - for (cnt = n;; cnt -= nw) { - - if (!force && ddflags & C_SPARSE) { - int sparse, i; - sparse = 1; /* Is buffer sparse? */ - for (i = 0; i < cnt; i++) - if (outp[i] != 0) { - sparse = 0; - break; - } - if (sparse) { - pending += cnt; - outp += cnt; - nw = 0; - break; - } - } - if (pending != 0) { - if (ddop_lseek(out, - out.fd, pending, SEEK_CUR) == -1) - err(EXIT_FAILURE, "%s: seek error creating sparse file", - out.name); - } - nw = bwrite(&out, outp, cnt); - if (nw <= 0) { - if (nw == 0) - errx(EXIT_FAILURE, - "%s: end of device", out.name); - /* NOTREACHED */ - if (errno != EINTR) - err(EXIT_FAILURE, "%s", out.name); - /* NOTREACHED */ - nw = 0; - } - if (pending) { - st.bytes += pending; - st.sparse += pending/out.dbsz; - st.out_full += pending/out.dbsz; - pending = 0; - } - outp += nw; - st.bytes += nw; - if (nw == n) { - if ((uint64_t)n != out.dbsz) - ++st.out_part; - else - ++st.out_full; - break; - } - ++st.out_part; - if (nw == cnt) - break; - if (out.flags & ISCHR && !warned) { - warned = 1; - warnx("%s: short write on character device", out.name); - } - if (out.flags & ISTAPE) - errx(EXIT_FAILURE, - "%s: short write on tape device", out.name); - /* NOTREACHED */ - - } - if ((out.dbcnt -= n) < out.dbsz) - break; - } - - /* Reassemble the output block. */ - if (out.dbcnt) - (void)memmove(out.db, out.dbp - out.dbcnt, out.dbcnt); - out.dbp = out.db + out.dbcnt; - - if (progress && (st.out_full + st.out_part) % progress == 0) - (void)write(STDERR_FILENO, ".", 1); -} - -/* - * A protected against SIGINFO write - */ -ssize_t -bwrite(IO *io, const void *buf, size_t len) -{ - sigset_t oset; - ssize_t rv; - int oerrno; - - (void)sigprocmask(SIG_BLOCK, &infoset, &oset); - rv = io->ops->op_write(io->fd, buf, len); - oerrno = errno; - (void)sigprocmask(SIG_SETMASK, &oset, NULL); - errno = oerrno; - return (rv); -} diff --git a/toolbox/upstream-netbsd/bin/dd/dd.h b/toolbox/upstream-netbsd/bin/dd/dd.h deleted file mode 100644 index b01c7b303..000000000 --- a/toolbox/upstream-netbsd/bin/dd/dd.h +++ /dev/null @@ -1,127 +0,0 @@ -/* $NetBSD: dd.h,v 1.15 2011/02/04 19:42:12 pooka Exp $ */ - -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * @(#)dd.h 8.3 (Berkeley) 4/2/94 - */ - -#include - -struct ddfops { - int (*op_init)(void); - - int (*op_open)(const char *, int, ...); - int (*op_close)(int); - - int (*op_fcntl)(int, int, ...); -#ifdef __ANDROID__ - int (*op_ioctl)(int, int, ...); -#else - int (*op_ioctl)(int, unsigned long, ...); -#endif - - int (*op_fstat)(int, struct stat *); - int (*op_fsync)(int); - int (*op_ftruncate)(int, off_t); - - off_t (*op_lseek)(int, off_t, int); - - ssize_t (*op_read)(int, void *, size_t); - ssize_t (*op_write)(int, const void *, size_t); -}; - -#define ddop_open(dir, a1, a2, ...) dir.ops->op_open(a1, a2, __VA_ARGS__) -#define ddop_close(dir, a1) dir.ops->op_close(a1) -#define ddop_fcntl(dir, a1, a2, ...) dir.ops->op_fcntl(a1, a2, __VA_ARGS__) -#define ddop_ioctl(dir, a1, a2, ...) dir.ops->op_ioctl(a1, a2, __VA_ARGS__) -#define ddop_fsync(dir, a1) dir.ops->op_fsync(a1) -#define ddop_ftruncate(dir, a1, a2) dir.ops->op_ftruncate(a1, a2) -#define ddop_lseek(dir, a1, a2, a3) dir.ops->op_lseek(a1, a2, a3) -#define ddop_read(dir, a1, a2, a3) dir.ops->op_read(a1, a2, a3) -#define ddop_write(dir, a1, a2, a3) dir.ops->op_write(a1, a2, a3) - -/* Input/output stream state. */ -typedef struct { - u_char *db; /* buffer address */ - u_char *dbp; /* current buffer I/O address */ - uint64_t dbcnt; /* current buffer byte count */ - int64_t dbrcnt; /* last read byte count */ - uint64_t dbsz; /* buffer size */ - -#define ISCHR 0x01 /* character device (warn on short) */ -#define ISPIPE 0x02 /* pipe (not truncatable) */ -#define ISTAPE 0x04 /* tape (not seekable) */ -#define NOREAD 0x08 /* not readable */ - u_int flags; - - const char *name; /* name */ - int fd; /* file descriptor */ - uint64_t offset; /* # of blocks to skip */ - struct ddfops const *ops; /* ops to use with fd */ -} IO; - -typedef struct { - uint64_t in_full; /* # of full input blocks */ - uint64_t in_part; /* # of partial input blocks */ - uint64_t out_full; /* # of full output blocks */ - uint64_t out_part; /* # of partial output blocks */ - uint64_t trunc; /* # of truncated records */ - uint64_t swab; /* # of odd-length swab blocks */ - uint64_t sparse; /* # of sparse output blocks */ - uint64_t bytes; /* # of bytes written */ - struct timeval start; /* start time of dd */ -} STAT; - -/* Flags (in ddflags). */ -#define C_ASCII 0x00001 -#define C_BLOCK 0x00002 -#define C_BS 0x00004 -#define C_CBS 0x00008 -#define C_COUNT 0x00010 -#define C_EBCDIC 0x00020 -#define C_FILES 0x00040 -#define C_IBS 0x00080 -#define C_IF 0x00100 -#define C_LCASE 0x00200 -#define C_NOERROR 0x00400 -#define C_NOTRUNC 0x00800 -#define C_OBS 0x01000 -#define C_OF 0x02000 -#define C_SEEK 0x04000 -#define C_SKIP 0x08000 -#define C_SWAB 0x10000 -#define C_SYNC 0x20000 -#define C_UCASE 0x40000 -#define C_UNBLOCK 0x80000 -#define C_OSYNC 0x100000 -#define C_SPARSE 0x200000 diff --git a/toolbox/upstream-netbsd/bin/dd/dd_hostops.c b/toolbox/upstream-netbsd/bin/dd/dd_hostops.c deleted file mode 100644 index d6e7a89e7..000000000 --- a/toolbox/upstream-netbsd/bin/dd/dd_hostops.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $NetBSD: dd_hostops.c,v 1.1 2011/02/04 19:42:12 pooka Exp $ */ - -/*- - * Copyright (c) 2010 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. - */ - -#include -#ifndef lint -__RCSID("$NetBSD: dd_hostops.c,v 1.1 2011/02/04 19:42:12 pooka Exp $"); -#endif /* !lint */ - -#include -#include - -#include -#include - -#include "dd.h" - -const struct ddfops ddfops_prog = { - .op_open = open, - .op_close = close, - .op_fcntl = fcntl, - .op_ioctl = ioctl, - .op_fstat = fstat, - .op_fsync = fsync, - .op_ftruncate = ftruncate, - .op_lseek = lseek, - .op_read = read, - .op_write = write, -}; diff --git a/toolbox/upstream-netbsd/bin/dd/extern.h b/toolbox/upstream-netbsd/bin/dd/extern.h deleted file mode 100644 index 9c5902186..000000000 --- a/toolbox/upstream-netbsd/bin/dd/extern.h +++ /dev/null @@ -1,82 +0,0 @@ -/* $NetBSD: extern.h,v 1.22 2011/11/07 22:24:23 jym Exp $ */ - -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * @(#)extern.h 8.3 (Berkeley) 4/2/94 - */ - -#include - -#ifdef NO_CONV -__dead void block(void); -__dead void block_close(void); -__dead void unblock(void); -__dead void unblock_close(void); -#else -void block(void); -void block_close(void); -void unblock(void); -void unblock_close(void); -#endif - -#ifndef NO_MSGFMT -int dd_write_msg(const char *, int); -#endif - -void dd_out(int); -void def(void); -void def_close(void); -void jcl(char **); -void pos_in(void); -void pos_out(void); -void summary(void); -void summaryx(int); -__dead void terminate(int); -void unblock(void); -void unblock_close(void); -ssize_t bwrite(IO *, const void *, size_t); - -extern IO in, out; -extern STAT st; -extern void (*cfunc)(void); -extern uint64_t cpy_cnt; -extern uint64_t cbsz; -extern u_int ddflags; -extern u_int files_cnt; -extern uint64_t progress; -extern const u_char *ctab; -extern const u_char a2e_32V[], a2e_POSIX[]; -extern const u_char e2a_32V[], e2a_POSIX[]; -extern const u_char a2ibm_32V[], a2ibm_POSIX[]; -extern u_char casetab[]; -extern const char *msgfmt; diff --git a/toolbox/upstream-netbsd/bin/dd/misc.c b/toolbox/upstream-netbsd/bin/dd/misc.c deleted file mode 100644 index 0fac98bed..000000000 --- a/toolbox/upstream-netbsd/bin/dd/misc.c +++ /dev/null @@ -1,342 +0,0 @@ -/* $NetBSD: misc.c,v 1.23 2011/11/07 22:24:23 jym Exp $ */ - -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: misc.c,v 1.23 2011/11/07 22:24:23 jym Exp $"); -#endif -#endif /* not lint */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "dd.h" -#include "extern.h" - -#define tv2mS(tv) ((tv).tv_sec * 1000LL + ((tv).tv_usec + 500) / 1000) - -static void posix_summary(void); -#ifndef NO_MSGFMT -static void custom_summary(void); -static void human_summary(void); -static void quiet_summary(void); - -static void buffer_write(const char *, size_t, int); -#endif /* NO_MSGFMT */ - -void -summary(void) -{ - - if (progress) - (void)write(STDERR_FILENO, "\n", 1); - -#ifdef NO_MSGFMT - return posix_summary(); -#else /* NO_MSGFMT */ - if (strncmp(msgfmt, "human", sizeof("human")) == 0) - return human_summary(); - - if (strncmp(msgfmt, "posix", sizeof("posix")) == 0) - return posix_summary(); - - if (strncmp(msgfmt, "quiet", sizeof("quiet")) == 0) - return quiet_summary(); - - return custom_summary(); -#endif /* NO_MSGFMT */ -} - -static void -posix_summary(void) -{ - char buf[100]; - int64_t mS; - struct timeval tv; - - if (progress) - (void)write(STDERR_FILENO, "\n", 1); - - (void)gettimeofday(&tv, NULL); - mS = tv2mS(tv) - tv2mS(st.start); - if (mS == 0) - mS = 1; - - /* Use snprintf(3) so that we don't reenter stdio(3). */ - (void)snprintf(buf, sizeof(buf), - "%llu+%llu records in\n%llu+%llu records out\n", - (unsigned long long)st.in_full, (unsigned long long)st.in_part, - (unsigned long long)st.out_full, (unsigned long long)st.out_part); - (void)write(STDERR_FILENO, buf, strlen(buf)); - if (st.swab) { - (void)snprintf(buf, sizeof(buf), "%llu odd length swab %s\n", - (unsigned long long)st.swab, - (st.swab == 1) ? "block" : "blocks"); - (void)write(STDERR_FILENO, buf, strlen(buf)); - } - if (st.trunc) { - (void)snprintf(buf, sizeof(buf), "%llu truncated %s\n", - (unsigned long long)st.trunc, - (st.trunc == 1) ? "block" : "blocks"); - (void)write(STDERR_FILENO, buf, strlen(buf)); - } - if (st.sparse) { - (void)snprintf(buf, sizeof(buf), "%llu sparse output %s\n", - (unsigned long long)st.sparse, - (st.sparse == 1) ? "block" : "blocks"); - (void)write(STDERR_FILENO, buf, strlen(buf)); - } - (void)snprintf(buf, sizeof(buf), - "%llu bytes transferred in %lu.%03d secs (%llu bytes/sec)\n", - (unsigned long long) st.bytes, - (long) (mS / 1000), - (int) (mS % 1000), - (unsigned long long) (st.bytes * 1000LL / mS)); - (void)write(STDERR_FILENO, buf, strlen(buf)); -} - -/* ARGSUSED */ -void -summaryx(int notused) -{ - - summary(); -} - -/* ARGSUSED */ -void -terminate(int signo) -{ - - summary(); - (void)raise_default_signal(signo); - _exit(127); -} - -#ifndef NO_MSGFMT -/* - * Buffer write(2) calls - */ -static void -buffer_write(const char *str, size_t size, int flush) -{ - static char wbuf[128]; - static size_t cnt = 0; /* Internal counter to allow wbuf to wrap */ - - unsigned int i; - - for (i = 0; i < size; i++) { - if (str != NULL) { - wbuf[cnt++] = str[i]; - } - if (cnt >= sizeof(wbuf)) { - (void)write(STDERR_FILENO, wbuf, cnt); - cnt = 0; - } - } - - if (flush != 0) { - (void)write(STDERR_FILENO, wbuf, cnt); - cnt = 0; - } -} - -/* - * Write summary to stderr according to format 'fmt'. If 'enable' is 0, it - * will not attempt to write anything. Can be used to validate the - * correctness of the 'fmt' string. - */ -int -dd_write_msg(const char *fmt, int enable) -{ - char hbuf[7], nbuf[32]; - const char *ptr; - int64_t mS; - struct timeval tv; - - (void)gettimeofday(&tv, NULL); - mS = tv2mS(tv) - tv2mS(st.start); - if (mS == 0) - mS = 1; - -#define ADDC(c) do { if (enable != 0) buffer_write(&c, 1, 0); } \ - while (/*CONSTCOND*/0) -#define ADDS(p) do { if (enable != 0) buffer_write(p, strlen(p), 0); } \ - while (/*CONSTCOND*/0) - - for (ptr = fmt; *ptr; ptr++) { - if (*ptr != '%') { - ADDC(*ptr); - continue; - } - - switch (*++ptr) { - case 'b': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.bytes); - ADDS(nbuf); - break; - case 'B': - if (humanize_number(hbuf, sizeof(hbuf), - st.bytes, "B", - HN_AUTOSCALE, HN_DECIMAL) == -1) - warnx("humanize_number (bytes transferred)"); - ADDS(hbuf); - break; - case 'e': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long) (st.bytes * 1000LL / mS)); - ADDS(nbuf); - break; - case 'E': - if (humanize_number(hbuf, sizeof(hbuf), - st.bytes * 1000LL / mS, "B", - HN_AUTOSCALE, HN_DECIMAL) == -1) - warnx("humanize_number (bytes per second)"); - ADDS(hbuf); ADDS("/sec"); - break; - case 'i': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.in_part); - ADDS(nbuf); - break; - case 'I': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.in_full); - ADDS(nbuf); - break; - case 'o': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.out_part); - ADDS(nbuf); - break; - case 'O': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.out_full); - ADDS(nbuf); - break; - case 's': - (void)snprintf(nbuf, sizeof(nbuf), "%li.%03d", - (long) (mS / 1000), (int) (mS % 1000)); - ADDS(nbuf); - break; - case 'p': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.sparse); - ADDS(nbuf); - break; - case 't': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.trunc); - ADDS(nbuf); - break; - case 'w': - (void)snprintf(nbuf, sizeof(nbuf), "%llu", - (unsigned long long)st.swab); - ADDS(nbuf); - break; - case 'P': - ADDS("block"); - if (st.sparse != 1) ADDS("s"); - break; - case 'T': - ADDS("block"); - if (st.trunc != 1) ADDS("s"); - break; - case 'W': - ADDS("block"); - if (st.swab != 1) ADDS("s"); - break; - case '%': - ADDC(*ptr); - break; - default: - if (*ptr == '\0') - goto done; - errx(EXIT_FAILURE, "unknown specifier '%c' in " - "msgfmt string", *ptr); - /* NOTREACHED */ - } - } - -done: - /* flush buffer */ - buffer_write(NULL, 0, 1); - return 0; -} - -static void -custom_summary(void) -{ - - dd_write_msg(msgfmt, 1); -} - -static void -human_summary(void) -{ - (void)dd_write_msg("%I+%i records in\n%O+%o records out\n", 1); - if (st.swab) { - (void)dd_write_msg("%w odd length swab %W\n", 1); - } - if (st.trunc) { - (void)dd_write_msg("%t truncated %T\n", 1); - } - if (st.sparse) { - (void)dd_write_msg("%p sparse output %P\n", 1); - } - (void)dd_write_msg("%b bytes (%B) transferred in %s secs " - "(%e bytes/sec - %E)\n", 1); -} - -static void -quiet_summary(void) -{ - - /* stay quiet */ -} -#endif /* NO_MSGFMT */ diff --git a/toolbox/upstream-netbsd/bin/dd/position.c b/toolbox/upstream-netbsd/bin/dd/position.c deleted file mode 100644 index 36dd580a3..000000000 --- a/toolbox/upstream-netbsd/bin/dd/position.c +++ /dev/null @@ -1,185 +0,0 @@ -/* $NetBSD: position.c,v 1.18 2010/11/22 21:04:28 pooka Exp $ */ - -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: position.c,v 1.18 2010/11/22 21:04:28 pooka Exp $"); -#endif -#endif /* not lint */ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "dd.h" -#include "extern.h" - -/* - * Position input/output data streams before starting the copy. Device type - * dependent. Seekable devices use lseek, and the rest position by reading. - * Seeking past the end of file can cause null blocks to be written to the - * output. - */ -void -pos_in(void) -{ - int bcnt, cnt, nr, warned; - - /* If not a pipe or tape device, try to seek on it. */ - if (!(in.flags & (ISPIPE|ISTAPE))) { - if (ddop_lseek(in, in.fd, - (off_t)in.offset * (off_t)in.dbsz, SEEK_CUR) == -1) { - err(EXIT_FAILURE, "%s", in.name); - /* NOTREACHED */ - } - return; - /* NOTREACHED */ - } - - /* - * Read the data. If a pipe, read until satisfy the number of bytes - * being skipped. No differentiation for reading complete and partial - * blocks for other devices. - */ - for (bcnt = in.dbsz, cnt = in.offset, warned = 0; cnt;) { - if ((nr = ddop_read(in, in.fd, in.db, bcnt)) > 0) { - if (in.flags & ISPIPE) { - if (!(bcnt -= nr)) { - bcnt = in.dbsz; - --cnt; - } - } else - --cnt; - continue; - } - - if (nr == 0) { - if (files_cnt > 1) { - --files_cnt; - continue; - } - errx(EXIT_FAILURE, "skip reached end of input"); - /* NOTREACHED */ - } - - /* - * Input error -- either EOF with no more files, or I/O error. - * If noerror not set die. POSIX requires that the warning - * message be followed by an I/O display. - */ - if (ddflags & C_NOERROR) { - if (!warned) { - - warn("%s", in.name); - warned = 1; - summary(); - } - continue; - } - err(EXIT_FAILURE, "%s", in.name); - /* NOTREACHED */ - } -} - -void -pos_out(void) -{ - struct mtop t_op; - int n; - uint64_t cnt; - - /* - * If not a tape, try seeking on the file. Seeking on a pipe is - * going to fail, but don't protect the user -- they shouldn't - * have specified the seek operand. - */ - if (!(out.flags & ISTAPE)) { - if (ddop_lseek(out, out.fd, - (off_t)out.offset * (off_t)out.dbsz, SEEK_SET) == -1) - err(EXIT_FAILURE, "%s", out.name); - /* NOTREACHED */ - return; - } - - /* If no read access, try using mtio. */ - if (out.flags & NOREAD) { - t_op.mt_op = MTFSR; - t_op.mt_count = out.offset; - - if (ddop_ioctl(out, out.fd, MTIOCTOP, &t_op) < 0) - err(EXIT_FAILURE, "%s", out.name); - /* NOTREACHED */ - return; - } - - /* Read it. */ - for (cnt = 0; cnt < out.offset; ++cnt) { - if ((n = ddop_read(out, out.fd, out.db, out.dbsz)) > 0) - continue; - - if (n < 0) - err(EXIT_FAILURE, "%s", out.name); - /* NOTREACHED */ - - /* - * If reach EOF, fill with NUL characters; first, back up over - * the EOF mark. Note, cnt has not yet been incremented, so - * the EOF read does not count as a seek'd block. - */ - t_op.mt_op = MTBSR; - t_op.mt_count = 1; - if (ddop_ioctl(out, out.fd, MTIOCTOP, &t_op) == -1) - err(EXIT_FAILURE, "%s", out.name); - /* NOTREACHED */ - - while (cnt++ < out.offset) - if ((uint64_t)(n = bwrite(&out, - out.db, out.dbsz)) != out.dbsz) - err(EXIT_FAILURE, "%s", out.name); - /* NOTREACHED */ - break; - } -} diff --git a/toolbox/upstream-netbsd/include/namespace.h b/toolbox/upstream-netbsd/include/namespace.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/toolbox/upstream-netbsd/include/sys/extattr.h b/toolbox/upstream-netbsd/include/sys/extattr.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/toolbox/upstream-netbsd/include/util.h b/toolbox/upstream-netbsd/include/util.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/toolbox/upstream-netbsd/lib/libc/gen/getbsize.c b/toolbox/upstream-netbsd/lib/libc/gen/getbsize.c deleted file mode 100644 index a9ce2c14e..000000000 --- a/toolbox/upstream-netbsd/lib/libc/gen/getbsize.c +++ /dev/null @@ -1,118 +0,0 @@ -/* $NetBSD: getbsize.c,v 1.17 2012/06/25 22:32:43 abs Exp $ */ - -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93"; -#else -__RCSID("$NetBSD: getbsize.c,v 1.17 2012/06/25 22:32:43 abs Exp $"); -#endif -#endif /* not lint */ - -#include "namespace.h" - -#include -#include -#include -#include -#include - -#ifdef __weak_alias -__weak_alias(getbsize,_getbsize) -#endif - -char * -getbsize(int *headerlenp, long *blocksizep) -{ - static char header[20]; - long n, max, mul, blocksize; - char *ep, *p; - const char *form; - -#define KB (1024L) -#define MB (1024L * 1024L) -#define GB (1024L * 1024L * 1024L) -#define MAXB GB /* No tera, peta, nor exa. */ - form = ""; - if ((p = getenv("BLOCKSIZE")) != NULL && *p != '\0') { - if ((n = strtol(p, &ep, 10)) < 0) - goto underflow; - if (n == 0) - n = 1; - if (*ep && ep[1]) - goto fmterr; - switch (*ep) { - case 'G': case 'g': - form = "G"; - max = MAXB / GB; - mul = GB; - break; - case 'K': case 'k': - form = "K"; - max = MAXB / KB; - mul = KB; - break; - case 'M': case 'm': - form = "M"; - max = MAXB / MB; - mul = MB; - break; - case '\0': - max = MAXB; - mul = 1; - break; - default: -fmterr: warnx("%s: unknown blocksize", p); - n = 512; - mul = 1; - max = 0; - break; - } - if (n > max) { - warnx("maximum blocksize is %ldG", MAXB / GB); - n = max; - } - if ((blocksize = n * mul) < 512) { -underflow: warnx("%s: minimum blocksize is 512", p); - form = ""; - blocksize = n = 512; - } - } else - blocksize = n = 512; - - if (headerlenp) - *headerlenp = - snprintf(header, sizeof(header), "%ld%s-blocks", n, form); - if (blocksizep) - *blocksizep = blocksize; - return (header); -} diff --git a/toolbox/upstream-netbsd/lib/libc/gen/humanize_number.c b/toolbox/upstream-netbsd/lib/libc/gen/humanize_number.c deleted file mode 100644 index 533560f31..000000000 --- a/toolbox/upstream-netbsd/lib/libc/gen/humanize_number.c +++ /dev/null @@ -1,161 +0,0 @@ -/* $NetBSD: humanize_number.c,v 1.16 2012/03/17 20:01:14 christos Exp $ */ - -/* - * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, - * NASA Ames Research Center, by Luke Mewburn and by Tomas Svensson. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: humanize_number.c,v 1.16 2012/03/17 20:01:14 christos Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#include "namespace.h" -#include -#include -#include -#include -#include -#include - -int -humanize_number(char *buf, size_t len, int64_t bytes, - const char *suffix, int scale, int flags) -{ - const char *prefixes, *sep; - int b, r, s1, s2, sign; - int64_t divisor, max, post = 1; - size_t i, baselen, maxscale; - - _DIAGASSERT(buf != NULL); - _DIAGASSERT(suffix != NULL); - _DIAGASSERT(scale >= 0); - - if (flags & HN_DIVISOR_1000) { - /* SI for decimal multiplies */ - divisor = 1000; - if (flags & HN_B) - prefixes = "B\0k\0M\0G\0T\0P\0E"; - else - prefixes = "\0\0k\0M\0G\0T\0P\0E"; - } else { - /* - * binary multiplies - * XXX IEC 60027-2 recommends Ki, Mi, Gi... - */ - divisor = 1024; - if (flags & HN_B) - prefixes = "B\0K\0M\0G\0T\0P\0E"; - else - prefixes = "\0\0K\0M\0G\0T\0P\0E"; - } - -#define SCALE2PREFIX(scale) (&prefixes[(scale) << 1]) - maxscale = 7; - - if ((size_t)scale >= maxscale && - (scale & (HN_AUTOSCALE | HN_GETSCALE)) == 0) - return (-1); - - if (buf == NULL || suffix == NULL) - return (-1); - - if (len > 0) - buf[0] = '\0'; - if (bytes < 0) { - sign = -1; - baselen = 3; /* sign, digit, prefix */ - if (-bytes < INT64_MAX / 100) - bytes *= -100; - else { - bytes = -bytes; - post = 100; - baselen += 2; - } - } else { - sign = 1; - baselen = 2; /* digit, prefix */ - if (bytes < INT64_MAX / 100) - bytes *= 100; - else { - post = 100; - baselen += 2; - } - } - if (flags & HN_NOSPACE) - sep = ""; - else { - sep = " "; - baselen++; - } - baselen += strlen(suffix); - - /* Check if enough room for `x y' + suffix + `\0' */ - if (len < baselen + 1) - return (-1); - - if (scale & (HN_AUTOSCALE | HN_GETSCALE)) { - /* See if there is additional columns can be used. */ - for (max = 100, i = len - baselen; i-- > 0;) - max *= 10; - - /* - * Divide the number until it fits the given column. - * If there will be an overflow by the rounding below, - * divide once more. - */ - for (i = 0; bytes >= max - 50 && i < maxscale; i++) - bytes /= divisor; - - if (scale & HN_GETSCALE) { - _DIAGASSERT(__type_fit(int, i)); - return (int)i; - } - } else - for (i = 0; i < (size_t)scale && i < maxscale; i++) - bytes /= divisor; - bytes *= post; - - /* If a value <= 9.9 after rounding and ... */ - if (bytes < 995 && i > 0 && flags & HN_DECIMAL) { - /* baselen + \0 + .N */ - if (len < baselen + 1 + 2) - return (-1); - b = ((int)bytes + 5) / 10; - s1 = b / 10; - s2 = b % 10; - r = snprintf(buf, len, "%d%s%d%s%s%s", - sign * s1, localeconv()->decimal_point, s2, - sep, SCALE2PREFIX(i), suffix); - } else - r = snprintf(buf, len, "%" PRId64 "%s%s%s", - sign * ((bytes + 50) / 100), - sep, SCALE2PREFIX(i), suffix); - - return (r); -} diff --git a/toolbox/upstream-netbsd/lib/libc/stdlib/strsuftoll.c b/toolbox/upstream-netbsd/lib/libc/stdlib/strsuftoll.c deleted file mode 100644 index 80fc52fc9..000000000 --- a/toolbox/upstream-netbsd/lib/libc/stdlib/strsuftoll.c +++ /dev/null @@ -1,249 +0,0 @@ -/* $NetBSD: strsuftoll.c,v 1.9 2011/10/22 22:08:47 christos Exp $ */ -/*- - * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Luke Mewburn. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. - */ -/*- - * Copyright (c) 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Keith Muller of the University of California, San Diego and Lance - * Visser of Convex Computer Corporation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - -#include - -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: strsuftoll.c,v 1.9 2011/10/22 22:08:47 christos Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#ifdef _LIBC -#include "namespace.h" -#endif - -#if !HAVE_STRSUFTOLL - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef _LIBC -# ifdef __weak_alias -__weak_alias(strsuftoll, _strsuftoll) -__weak_alias(strsuftollx, _strsuftollx) -# endif -#endif /* LIBC */ - -/* - * Convert an expression of the following forms to a (u)int64_t. - * 1) A positive decimal number. - * 2) A positive decimal number followed by a b (mult by 512). - * 3) A positive decimal number followed by a k (mult by 1024). - * 4) A positive decimal number followed by a m (mult by 1048576). - * 5) A positive decimal number followed by a g (mult by 1073741824). - * 6) A positive decimal number followed by a t (mult by 1099511627776). - * 7) A positive decimal number followed by a w (mult by sizeof int) - * 8) Two or more positive decimal numbers (with/without k,b or w). - * separated by x (also * for backwards compatibility), specifying - * the product of the indicated values. - * Returns the result upon successful conversion, or exits with an - * appropriate error. - * - */ -/* LONGLONG */ -long long -strsuftoll(const char *desc, const char *val, - long long min, long long max) -{ - long long result; - char errbuf[100]; - - result = strsuftollx(desc, val, min, max, errbuf, sizeof(errbuf)); - if (*errbuf != '\0') - errx(EXIT_FAILURE, "%s", errbuf); - return result; -} - -/* - * As strsuftoll(), but returns the error message into the provided buffer - * rather than exiting with it. - */ -/* LONGLONG */ -static long long -__strsuftollx(const char *desc, const char *val, - long long min, long long max, char *ebuf, size_t ebuflen, size_t depth) -{ - long long num, t; - char *expr; - - _DIAGASSERT(desc != NULL); - _DIAGASSERT(val != NULL); - _DIAGASSERT(ebuf != NULL); - - if (depth > 16) { - snprintf(ebuf, ebuflen, "%s: Recursion limit exceeded", desc); - return 0; - } - - while (isspace((unsigned char)*val)) /* Skip leading space */ - val++; - - errno = 0; - num = strtoll(val, &expr, 10); - if (errno == ERANGE) - goto erange; /* Overflow */ - - if (expr == val) /* No digits */ - goto badnum; - - switch (*expr) { - case 'b': - t = num; - num *= 512; /* 1 block */ - if (t > num) - goto erange; - ++expr; - break; - case 'k': - t = num; - num *= 1024; /* 1 kibibyte */ - if (t > num) - goto erange; - ++expr; - break; - case 'm': - t = num; - num *= 1048576; /* 1 mebibyte */ - if (t > num) - goto erange; - ++expr; - break; - case 'g': - t = num; - num *= 1073741824; /* 1 gibibyte */ - if (t > num) - goto erange; - ++expr; - break; - case 't': - t = num; - num *= 1099511627776LL; /* 1 tebibyte */ - if (t > num) - goto erange; - ++expr; - break; - case 'w': - t = num; - num *= sizeof(int); /* 1 word */ - if (t > num) - goto erange; - ++expr; - break; - } - - switch (*expr) { - case '\0': - break; - case '*': /* Backward compatible */ - case 'x': - t = num; - num *= __strsuftollx(desc, expr + 1, min, max, ebuf, ebuflen, - depth + 1); - if (*ebuf != '\0') - return 0; - if (t > num) { - erange: - errno = ERANGE; - snprintf(ebuf, ebuflen, "%s: %s", desc, strerror(errno)); - return 0; - } - break; - default: - badnum: - snprintf(ebuf, ebuflen, "%s `%s': illegal number", desc, val); - return 0; - } - if (num < min) { - /* LONGLONG */ - snprintf(ebuf, ebuflen, "%s %lld is less than %lld.", - desc, (long long)num, (long long)min); - return 0; - } - if (num > max) { - /* LONGLONG */ - snprintf(ebuf, ebuflen, "%s %lld is greater than %lld.", - desc, (long long)num, (long long)max); - return 0; - } - *ebuf = '\0'; - return num; -} - -long long -strsuftollx(const char *desc, const char *val, - long long min, long long max, char *ebuf, size_t ebuflen) -{ - return __strsuftollx(desc, val, min, max, ebuf, ebuflen, 0); -} -#endif /* !HAVE_STRSUFTOLL */ diff --git a/toolbox/upstream-netbsd/lib/libc/string/swab.c b/toolbox/upstream-netbsd/lib/libc/string/swab.c deleted file mode 100644 index 392b1868e..000000000 --- a/toolbox/upstream-netbsd/lib/libc/string/swab.c +++ /dev/null @@ -1,80 +0,0 @@ -/* $NetBSD: swab.c,v 1.18 2011/01/04 17:14:07 martin Exp $ */ - -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Jeffrey Mogul. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; -#else -__RCSID("$NetBSD: swab.c,v 1.18 2011/01/04 17:14:07 martin Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include - -void -swab(const void * __restrict from, void * __restrict to, ssize_t len) -{ - char temp; - const char *fp; - char *tp; - - if (len <= 1) - return; - - _DIAGASSERT(from != NULL); - _DIAGASSERT(to != NULL); - - len /= 2; - fp = (const char *)from; - tp = (char *)to; -#define STEP temp = *fp++,*tp++ = *fp++,*tp++ = temp - - if (__predict_false(len == 1)) { - STEP; - return; - } - - /* round to multiple of 8 */ - while ((--len % 8) != 0) - STEP; - len /= 8; - if (len == 0) - return; - while (len-- != 0) { - STEP; STEP; STEP; STEP; - STEP; STEP; STEP; STEP; - } -} diff --git a/toolbox/upstream-netbsd/lib/libutil/raise_default_signal.c b/toolbox/upstream-netbsd/lib/libutil/raise_default_signal.c deleted file mode 100644 index 50cffd440..000000000 --- a/toolbox/upstream-netbsd/lib/libutil/raise_default_signal.c +++ /dev/null @@ -1,117 +0,0 @@ -/* $NetBSD: raise_default_signal.c,v 1.3 2008/04/28 20:23:03 martin Exp $ */ - -/*- - * Copyright (c) 2007 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Luke Mewburn. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. - */ - -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - -#include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: raise_default_signal.c,v 1.3 2008/04/28 20:23:03 martin Exp $"); -#endif - -#include -#include -#include -#include -#include - -#if ! HAVE_RAISE_DEFAULT_SIGNAL -/* - * raise_default_signal sig - * Raise the default signal handler for sig, by - * - block all signals - * - set the signal handler to SIG_DFL - * - raise the signal - * - unblock the signal to deliver it - * - * The original signal mask and signal handler is restored on exit - * (whether successful or not). - * - * Returns 0 on success, or -1 on failure with errno set to - * on of the values for sigemptyset(), sigaddset(), sigprocmask(), - * sigaction(), or raise(). - */ -int -raise_default_signal(int sig) -{ - struct sigaction origact, act; - sigset_t origmask, fullmask, mask; - int retval, oerrno; - - retval = -1; - - /* Setup data structures */ - /* XXX memset(3) isn't async-safe according to signal(7) */ - (void)memset(&act, 0, sizeof(act)); - act.sa_handler = SIG_DFL; - act.sa_flags = 0; - if ((sigemptyset(&act.sa_mask) == -1) || - (sigfillset(&fullmask) == -1) || - (sigemptyset(&mask) == -1) || - (sigaddset(&mask, sig) == -1)) - goto restore_none; - - /* Block all signals */ - if (sigprocmask(SIG_BLOCK, &fullmask, &origmask) == -1) - goto restore_none; - /* (use 'goto restore_mask' to restore state) */ - - /* Enable the SIG_DFL handler */ - if (sigaction(sig, &act, &origact) == -1) - goto restore_mask; - /* (use 'goto restore_act' to restore state) */ - - /* Raise the signal, and unblock the signal to deliver it */ - if ((raise(sig) == -1) || - (sigprocmask(SIG_UNBLOCK, &mask, NULL) == -1)) - goto restore_act; - - /* Flag successful raise() */ - retval = 0; - - /* Restore the original handler */ - restore_act: - oerrno = errno; - (void)sigaction(sig, &origact, NULL); - errno = oerrno; - - /* Restore the original mask */ - restore_mask: - oerrno = errno; - (void)sigprocmask(SIG_SETMASK, &origmask, NULL); - errno = oerrno; - - restore_none: - return retval; -} - -#endif /* ! HAVE_RAISE_DEFAULT_SIGNAL */