Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/bin/dd convert to using strsuftoll(3) from libc
details: https://anonhg.NetBSD.org/src/rev/2f6c32e20089
branches: trunk
changeset: 539912:2f6c32e20089
user: lukem <lukem%NetBSD.org@localhost>
date: Fri Nov 29 13:11:10 2002 +0000
description:
convert to using strsuftoll(3) from libc
diffstat:
bin/dd/Makefile | 4 +-
bin/dd/args.c | 21 ++--
bin/dd/strsuftoull.c | 231 ---------------------------------------------------
bin/dd/strsuftoull.h | 6 -
4 files changed, 12 insertions(+), 250 deletions(-)
diffs (truncated from 354 to 300 lines):
diff -r 5e5f4eb13a3c -r 2f6c32e20089 bin/dd/Makefile
--- a/bin/dd/Makefile Fri Nov 29 13:06:32 2002 +0000
+++ b/bin/dd/Makefile Fri Nov 29 13:11:10 2002 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/02/02 13:03:21 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2002/11/29 13:11:10 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= dd
-SRCS= args.c conv.c dd.c misc.c position.c strsuftoull.c
+SRCS= args.c conv.c dd.c misc.c position.c
.ifdef SMALLPROG
CPPFLAGS+= -DNO_CONV
diff -r 5e5f4eb13a3c -r 2f6c32e20089 bin/dd/args.c
--- a/bin/dd/args.c Fri Nov 29 13:06:32 2002 +0000
+++ b/bin/dd/args.c Fri Nov 29 13:11:10 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.20 2001/11/26 00:56:33 enami Exp $ */
+/* $NetBSD: args.c,v 1.21 2002/11/29 13:11:10 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: args.c,v 1.20 2001/11/26 00:56:33 enami Exp $");
+__RCSID("$NetBSD: args.c,v 1.21 2002/11/29 13:11:10 lukem Exp $");
#endif
#endif /* not lint */
@@ -58,7 +58,6 @@
#include "dd.h"
#include "extern.h"
-#include "strsuftoull.h"
static int c_arg(const void *, const void *);
#ifndef NO_CONV
@@ -189,21 +188,21 @@
f_bs(char *arg)
{
- in.dbsz = out.dbsz = strsuftoull("block size", arg, 1, UINT_MAX);
+ in.dbsz = out.dbsz = strsuftoll("block size", arg, 1, UINT_MAX);
}
static void
f_cbs(char *arg)
{
- cbsz = strsuftoull("conversion record size", arg, 1, UINT_MAX);
+ cbsz = strsuftoll("conversion record size", arg, 1, UINT_MAX);
}
static void
f_count(char *arg)
{
- cpy_cnt = strsuftoull("block count", arg, 0, ULLONG_MAX);
+ cpy_cnt = strsuftoll("block count", arg, 0, LLONG_MAX);
if (!cpy_cnt)
terminate(0);
}
@@ -212,7 +211,7 @@
f_files(char *arg)
{
- files_cnt = (u_int)strsuftoull("file count", arg, 0, UINT_MAX);
+ files_cnt = (u_int)strsuftoll("file count", arg, 0, UINT_MAX);
if (!files_cnt)
terminate(0);
}
@@ -222,7 +221,7 @@
{
if (!(ddflags & C_BS))
- in.dbsz = strsuftoull("input block size", arg, 1, UINT_MAX);
+ in.dbsz = strsuftoll("input block size", arg, 1, UINT_MAX);
}
static void
@@ -237,7 +236,7 @@
{
if (!(ddflags & C_BS))
- out.dbsz = strsuftoull("output block size", arg, 1, UINT_MAX);
+ out.dbsz = strsuftoll("output block size", arg, 1, UINT_MAX);
}
static void
@@ -251,14 +250,14 @@
f_seek(char *arg)
{
- out.offset = strsuftoull("seek blocks", arg, 0, ULLONG_MAX);
+ out.offset = strsuftoll("seek blocks", arg, 0, LLONG_MAX);
}
static void
f_skip(char *arg)
{
- in.offset = strsuftoull("skip blocks", arg, 0, ULLONG_MAX);
+ in.offset = strsuftoll("skip blocks", arg, 0, LLONG_MAX);
}
static void
diff -r 5e5f4eb13a3c -r 2f6c32e20089 bin/dd/strsuftoull.c
--- a/bin/dd/strsuftoull.c Fri Nov 29 13:06:32 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-/* $NetBSD: strsuftoull.c,v 1.8 2002/06/09 19:38:00 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. 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.
- */
-
-/*-
- * Copyright (c) 2001 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 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 <sys/cdefs.h>
-#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: strsuftoull.c,v 1.8 2002/06/09 19:38:00 matt Exp $");
-#endif /* not lint */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "strsuftoull.h"
-
-
-/*
- * Convert an expression of the following forms to a uint64_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 w (mult by sizeof int)
- * 6) 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.
- *
- */
-uint64_t
-strsuftoull(const char *desc, const char *val, uint64_t min, uint64_t max)
-{
- uint64_t result;
- char errbuf[100];
-
- result = strsuftoullx(desc, val, min, max, errbuf, sizeof(errbuf));
- if (*errbuf != '\0')
- errx(1, "%s", errbuf);
- return (result);
-}
-
-/*
- * As strsuftoull(), but returns the error message into the provided buffer
- * rather than exiting with it.
- */
-uint64_t
-strsuftoullx(const char *desc, const char *val, uint64_t min, uint64_t max,
- char *ebuf, size_t ebuflen)
-{
- uint64_t num, t;
- char *expr;
-
- assert(desc != NULL);
- assert(val != NULL);
- assert(ebuf != NULL);
-
- errno = 0;
- if (*val == '-') /* Prevent negative numbers */
- goto badnum;
-
- num = strtoull(val, &expr, 0);
- if (num == LLONG_MAX && 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 kilobyte */
- if (t > num)
- goto erange;
- ++expr;
- break;
- case 'm':
- t = num;
- num *= 1048576; /* 1 megabyte */
- if (t > num)
- goto erange;
- ++expr;
- break;
- case 'g':
- t = num;
- num *= 1073741824; /* 1 gigabyte */
- if (t > num)
- goto erange;
- ++expr;
- break;
- case 't':
- t = num;
- num *= 1099511627776LL; /* 1 terabyte */
- if (t > num)
- goto erange;
- ++expr;
- break;
- case 'w':
Home |
Main Index |
Thread Index |
Old Index