upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo some of the reversions from previous revisions, and attempt to

Browse source 
minimize diffs with {Net,Open}BSD

Hinted-More-Or-Less-By:	bde
This commit is contained in:
Kris Kennaway 1999-06-21 13:23:23 +00:00
parent 6bad8b7d57
commit 794bf053c4
1 changed files with 82 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
bin/chio/chio.c
View file

@ -1,4 +1,3 @@
/* $NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
* All rights reserved.
@ -34,12 +33,14 @@
* Additional Copyright (c) 1997, by Matthew Jacob, for NASA/Ames Research Ctr.
*/
#include <sys/cdefs.h>
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved.");
__RCSID("$NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $");
#endif
static const char copyright[] =
"@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved.";
static const char rcsid[] =
"$Id";
#endif /* not lint */
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/chio.h>
#include <err.h>
@ -55,25 +56,24 @@ __RCSID("$NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $");
extern char *__progname; /* from crt0.o */
extern int optreset; /* from getopt.o */
int main(int, char *[]);
static void usage(void);
static void cleanup(void);
static int parse_element_type(char *);
static int parse_element_unit(char *);
static const char * element_type_name(int et);
static int parse_special(char *);
static int is_special(char *);
static char *bits_to_string(int, const char *);
static void usage __P((void));
static void cleanup __P((void));
static int parse_element_type __P((char *));
static int parse_element_unit __P((char *));
static const char * element_type_name __P((int et));
static int parse_special __P((char *));
static int is_special __P((char *));
static const char *bits_to_string __P((int, const char *));
static int do_move(char *, int, char **);
static int do_exchange(char *, int, char **);
static int do_position(char *, int, char **);
static int do_params(char *, int, char **);
static int do_getpicker(char *, int, char **);
static int do_setpicker(char *, int, char **);
static int do_status(char *, int, char **);
static int do_ielem(char *, int, char **);
static int do_voltag(char *, int, char **);
static int do_move __P((char *, int, char **));
static int do_exchange __P((char *, int, char **));
static int do_position __P((char *, int, char **));
static int do_params __P((char *, int, char **));
static int do_getpicker __P((char *, int, char **));
static int do_setpicker __P((char *, int, char **));
static int do_status __P((char *, int, char **));
static int do_ielem __P((char *, int, char **));
static int do_voltag __P((char *, int, char **));
/* Valid changer element types. */
const struct element_type elements[] = {
@ -107,10 +107,12 @@ const struct special_word specials[] = {
};
static int changer_fd;
static char *changer_name;
static const char *changer_name;
int
main(int argc, char *argv[])
main(argc, argv)
int argc;
char **argv;
{
int ch, i;
@ -153,17 +155,20 @@ main(int argc, char *argv[])
if (strncmp(*argv, commands[i].cc_name,
strlen(*argv)) == 0)
break;
}
}
if (commands[i].cc_name == NULL)
errx(1, "unknown command: %s", *argv);
exit((*commands[i].cc_handler)(commands[i].cc_name, argc, argv));
exit ((*commands[i].cc_handler)(commands[i].cc_name, argc, argv));
/* NOTREACHED */
}
static int
do_move(char *cname, int argc, char **argv)
do_move(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
struct changer_move cmd;
int val;
@ -231,7 +236,10 @@ do_move(char *cname, int argc, char **argv)
}
static int
do_exchange(char *cname, int argc, char **argv)
do_exchange(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
struct changer_exchange cmd;
int val;
@ -326,7 +334,10 @@ do_exchange(char *cname, int argc, char **argv)
}
static int
do_position(char *cname, int argc, char **argv)
do_position(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
struct changer_position cmd;
int val;
@ -387,7 +398,10 @@ do_position(char *cname, int argc, char **argv)
/* ARGSUSED */
static int
do_params(char *cname, int argc, char **argv)
do_params(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
struct changer_params data;
int picker;
@ -430,7 +444,10 @@ do_params(char *cname, int argc, char **argv)
/* ARGSUSED */
static int
do_getpicker(char *cname, int argc, char **argv)
do_getpicker(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
int picker;
@ -457,7 +474,10 @@ do_getpicker(char *cname, int argc, char **argv)
}
static int
do_setpicker(char *cname, int argc, char **argv)
do_setpicker(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
int picker;
@ -485,7 +505,10 @@ do_setpicker(char *cname, int argc, char **argv)
}
static int
do_status(char *cname, int argc, char **argv)
do_status(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
struct changer_params cp;
struct changer_element_status_request cesr;
@ -704,7 +727,10 @@ do_status(char *cname, int argc, char **argv)
}
static int
do_ielem(char *cname, int argc, char **argv)
do_ielem(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
int timeout = 0;
@ -727,7 +753,10 @@ do_ielem(char *cname, int argc, char **argv)
}
static int
do_voltag(char *cname, int argc, char **argv)
do_voltag(cname, argc, argv)
char *cname;
int argc;
char **argv;
{
int force = 0;
int clear = 0;
@ -812,7 +841,8 @@ do_voltag(char *cname, int argc, char **argv)
}
static int
parse_element_type(char *cp)
parse_element_type(cp)
char *cp;
{
int i;
@ -825,7 +855,8 @@ parse_element_type(char *cp)
}
static const char *
element_type_name(int et)
element_type_name(et)
int et;
{
int i;
@ -837,7 +868,8 @@ element_type_name(int et)
}
static int
parse_element_unit(char *cp)
parse_element_unit(cp)
char *cp;
{
int i;
char *p;
@ -850,7 +882,8 @@ parse_element_unit(char *cp)
}
static int
parse_special(char *cp)
parse_special(cp)
char *cp;
{
int val;
@ -863,7 +896,8 @@ parse_special(char *cp)
}
static int
is_special(char *cp)
is_special(cp)
char *cp;
{
int i;
@ -874,8 +908,10 @@ is_special(char *cp)
return (0);
}
static char *
bits_to_string(int v, const char *cp)
static const char *
bits_to_string(v, cp)
int v;
const char *cp;
{
const char *np;
char f, sep, *bp;
@ -890,7 +926,7 @@ bits_to_string(int v, const char *cp)
if ((v & (1 << (f - 1))) == 0)
continue;
(void) snprintf(bp, sizeof(buf) - (bp - &buf[0]),
"%c%.*s", sep, (int)(long)(np - cp), cp);
"%c%.*s", sep, (int)(long)(np - cp), cp);
bp += strlen(bp);
sep = ',';
}
@ -910,12 +946,7 @@ cleanup()
static void
usage()
{
int i;
(void) fprintf(stderr, "usage: %s [-f device] command [-<flags>] [args ...]\n", __progname);
(void) fprintf(stderr, "commands:");
for (i = 0; commands[i].cc_name; i++)
(void) fprintf(stderr, " %s", commands[i].cc_name);
(void) fprintf(stderr, "\n");
(void) fprintf(stderr, "usage: %s [-f changer] command [-<flags>] "
"arg1 arg2 [arg3 [...]]\n", __progname);
exit(1);
}