Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sbin/mknod cleanups suggested by simonb:
details: https://anonhg.NetBSD.org/src/rev/b0c94ab113c1
branches: trunk
changeset: 515907:b0c94ab113c1
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Oct 08 04:45:29 2001 +0000
description:
cleanups suggested by simonb:
- rename "format.c" -> "pack_dev.c", "mknod.h" -> "pack_dev.h"
- make the private stuff in pack_dev.c static
diffstat:
sbin/mknod/Makefile | 4 +-
sbin/mknod/format.c | 301 --------------------------------------------------
sbin/mknod/mknod.c | 8 +-
sbin/mknod/mknod.h | 47 -------
sbin/mknod/pack_dev.c | 298 +++++++++++++++++++++++++++++++++++++++++++++++++
sbin/mknod/pack_dev.h | 47 +++++++
6 files changed, 351 insertions(+), 354 deletions(-)
diffs (truncated from 759 to 300 lines):
diff -r 1811444f8fa6 -r b0c94ab113c1 sbin/mknod/Makefile
--- a/sbin/mknod/Makefile Mon Oct 08 04:25:00 2001 +0000
+++ b/sbin/mknod/Makefile Mon Oct 08 04:45:29 2001 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/10/08 04:20:43 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/08 04:45:29 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
PROG= mknod
-SRCS= mknod.c format.c
+SRCS= mknod.c pack_dev.c
MAN= mknod.8
WARNS?= 2
diff -r 1811444f8fa6 -r b0c94ab113c1 sbin/mknod/format.c
--- a/sbin/mknod/format.c Mon Oct 08 04:25:00 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,301 +0,0 @@
-/* $NetBSD: format.c,v 1.1 2001/10/08 04:20:44 lukem Exp $ */
-
-/*-
- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * 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>
-#ifndef lint
-__RCSID("$NetBSD: format.c,v 1.1 2001/10/08 04:20:44 lukem Exp $");
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <err.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "mknod.h"
-
-dev_t
-pack_native(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev(numbers[0], numbers[1]);
- if (major(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-#define major_netbsd(x) ((int32_t)((((x) & 0x000fff00) >> 8)))
-#define minor_netbsd(x) ((int32_t)((((x) & 0xfff00000) >> 12) | \
- (((x) & 0x000000ff) >> 0)))
-#define makedev_netbsd(x,y) ((dev_t)((((x) << 8) & 0x000fff00) | \
- (((y) << 12) & 0xfff00000) | \
- (((y) << 0) & 0x000000ff)))
-
-pack_t pack_netbsd;
-
-dev_t
-pack_netbsd(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev_netbsd(numbers[0], numbers[1]);
- if (major_netbsd(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor_netbsd(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-#define major_freebsd(x) ((int32_t)(((x) & 0x0000ff00) >> 8))
-#define minor_freebsd(x) ((int32_t)(((x) & 0xffff00ff) >> 0))
-#define makedev_freebsd(x,y) ((dev_t)((((x) << 8) & 0x0000ff00) | \
- (((y) << 0) & 0xffff00ff)))
-
-pack_t pack_freebsd;
-
-dev_t
-pack_freebsd(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev_freebsd(numbers[0], numbers[1]);
- if (major_freebsd(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor_freebsd(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-#define major_8_8(x) ((int32_t)(((x) & 0x0000ff00) >> 8))
-#define minor_8_8(x) ((int32_t)(((x) & 0x000000ff) >> 0))
-#define makedev_8_8(x,y) ((dev_t)((((x) << 8) & 0x0000ff00) | \
- (((y) << 0) & 0x000000ff)))
-
-pack_t pack_8_8;
-
-dev_t
-pack_8_8(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev_8_8(numbers[0], numbers[1]);
- if (major_8_8(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor_8_8(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-#define major_12_20(x) ((int32_t)(((x) & 0xfff00000) >> 20))
-#define minor_12_20(x) ((int32_t)(((x) & 0x000fffff) >> 0))
-#define makedev_12_20(x,y) ((dev_t)((((x) << 20) & 0xfff00000) | \
- (((y) << 0) & 0x000fffff)))
-
-pack_t pack_12_20;
-
-dev_t
-pack_12_20(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev_12_20(numbers[0], numbers[1]);
- if (major_12_20(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor_12_20(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-#define major_14_18(x) ((int32_t)(((x) & 0xfffc0000) >> 18))
-#define minor_14_18(x) ((int32_t)(((x) & 0x0003ffff) >> 0))
-#define makedev_14_18(x,y) ((dev_t)((((x) << 18) & 0xfffc0000) | \
- (((y) << 0) & 0x0003ffff)))
-
-pack_t pack_14_18;
-
-dev_t
-pack_14_18(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev_14_18(numbers[0], numbers[1]);
- if (major_14_18(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor_14_18(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-#define major_8_24(x) ((int32_t)(((x) & 0xff000000) >> 24))
-#define minor_8_24(x) ((int32_t)(((x) & 0x00ffffff) >> 0))
-#define makedev_8_24(x,y) ((dev_t)((((x) << 24) & 0xff000000) | \
- (((y) << 0) & 0x00ffffff)))
-
-pack_t pack_8_24;
-
-dev_t
-pack_8_24(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev_8_24(numbers[0], numbers[1]);
- if (major_8_24(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor_8_24(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-#define major_12_12_8(x) ((int32_t)(((x) & 0xfff00000) >> 20))
-#define unit_12_12_8(x) ((int32_t)(((x) & 0x000fff00) >> 8))
-#define subunit_12_12_8(x) ((int32_t)(((x) & 0x000000ff) >> 0))
-#define makedev_12_12_8(x,y,z) ((dev_t)((((x) << 20) & 0xfff00000) | \
- (((y) << 8) & 0x000fff00) | \
- (((z) << 0) & 0x000000ff)))
-
-pack_t pack_bsdos;
-
-dev_t
-pack_bsdos(int n, u_long numbers[])
-{
- dev_t dev;
-
- if (n == 2) {
- dev = makedev_12_20(numbers[0], numbers[1]);
- if (major_12_20(dev) != numbers[0])
- errx(1, "invalid major number");
- if (minor_12_20(dev) != numbers[1])
- errx(1, "invalid minor number");
- } else if (n == 3) {
- dev = makedev_12_12_8(numbers[0], numbers[1], numbers[2]);
- if (major_12_12_8(dev) != numbers[0])
- errx(1, "invalid major number");
- if (unit_12_12_8(dev) != numbers[1])
- errx(1, "invalid unit number");
- if (subunit_12_12_8(dev) != numbers[2])
- errx(1, "invalid subunit number");
- } else
- errx(1, "too many fields for format");
- return (dev);
-}
-
-
-struct format {
- const char *name;
- pack_t *pack;
-} formats[] = {
- {"386bsd", pack_8_8},
- {"4bsd", pack_8_8},
- {"bsdos", pack_bsdos},
- {"freebsd", pack_freebsd},
- {"hpux", pack_8_24},
- {"isc", pack_8_8},
- {"linux", pack_8_8},
- {"native", pack_native},
- {"netbsd", pack_netbsd},
- {"osf1", pack_12_20},
- {"sco", pack_8_8},
- {"solaris", pack_14_18},
- {"sunos", pack_8_8},
- {"svr3", pack_8_8},
- {"svr4", pack_14_18},
- {"ultrix", pack_8_8},
-};
-
-int compare_format(const void *, const void *);
-
-int
-compare_format(const void *key, const void *element)
-{
- const char *name;
- const struct format *format;
-
Home |
Main Index |
Thread Index |
Old Index