8f0afc6b0a
related patches. These include: * Mode page editting can be scripted. This involves two things: first, if stdin is not a tty, changes are read from stdin rather than invoking $EDITOR. Second, and more importantly, not all modepage entries must be included in the change set. This means that camcontrol can now gracefully handle more intrusive editting from the $EDITOR, including removal or rearrangement of lines. It also means that you can do stuff like: # echo "WCE: 1" | camcontrol modepage da3 -m 8 -e # newfs /dev/da3 # echo "WCE: 0" | camcontrol modepage da3 -m 8 -e * Range-checking on user-supplied input values. modeedit.c now uses the field width specifiers to determine the maximum allowable value for a field. If the user enters a value larger than the maximum, it clips the value to the max and warns the user. This also involved patching cam_cmdparse.c to be more consistent with regards to the "count" parameter to arg_put (previously is was the length of strings and 1 for all integral types). The cam_cdbparse(3) man page was also updated to reflect the revised semantics. * In the process, I removed the 64 entry limit on mode pages (not that we were even close to hitting that limit). This was a nice side-effect of the other changes. * Technically, the new mode editting functionality allows editting of character array entries in mode pages (type 'c' or 'z'), however since buff_encode doesn't grok them it is currently useless. * Camcontrol gained two new options related to mode pages: -l and -b. The former lists all available mode pages for a given device. The latter forces mode page display in binary format (the default when no mode page definition was found in scsi_modes). * Added support for mode page names to scsi_modes. Allows names to be displayed alongside mode numbers in the mode page listing. Updated scsi_modes to use the new functionality. This also adds the semicolon into the scsi_modes syntax as an optional mode page definition terminator. This is needed to name pages without providing a page format definition. * Updated scsi_all.h to include a structure describing mode page headers. * Added $FreeBSD$ line to scsi_modes. Inspired by: dwhite Reviewed by: ken
153 lines
3.6 KiB
C
153 lines
3.6 KiB
C
/*
|
|
* Written By Julian ELischer
|
|
* Copyright julian Elischer 1993.
|
|
* Permission is granted to use or redistribute this file in any way as long
|
|
* as this notice remains. Julian Elischer does not guarantee that this file
|
|
* is totally correct for any given task and users of this file must
|
|
* accept responsibility for any damage that occurs from the application of this
|
|
* file.
|
|
*
|
|
* (julian@tfs.com julian@dialix.oz.au)
|
|
*
|
|
* User SCSI hooks added by Peter Dufault:
|
|
*
|
|
* Copyright (c) 1994 HD Associates
|
|
* (contact: dufault@hda.com)
|
|
* 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. The name of HD Associates
|
|
* may not be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES ``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 HD ASSOCIATES 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.
|
|
*/
|
|
/*
|
|
* Taken from the original scsi(8) program.
|
|
* from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
|
|
*/
|
|
#ifndef lint
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif /* not lint */
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <camlib.h>
|
|
#include "camcontrol.h"
|
|
|
|
int verbose;
|
|
|
|
/* iget: Integer argument callback
|
|
*/
|
|
int
|
|
iget(void *hook, char *name)
|
|
{
|
|
struct get_hook *h = (struct get_hook *)hook;
|
|
int arg;
|
|
|
|
if (h->got >= h->argc)
|
|
{
|
|
fprintf(stderr, "Expecting an integer argument.\n");
|
|
usage(0);
|
|
exit(1);
|
|
}
|
|
arg = strtol(h->argv[h->got], 0, 0);
|
|
h->got++;
|
|
|
|
if (verbose && name && *name)
|
|
printf("%s: %d\n", name, arg);
|
|
|
|
return arg;
|
|
}
|
|
|
|
/* cget: char * argument callback
|
|
*/
|
|
char *
|
|
cget(void *hook, char *name)
|
|
{
|
|
struct get_hook *h = (struct get_hook *)hook;
|
|
char *arg;
|
|
|
|
if (h->got >= h->argc)
|
|
{
|
|
fprintf(stderr, "Expecting a character pointer argument.\n");
|
|
usage(0);
|
|
exit(1);
|
|
}
|
|
arg = h->argv[h->got];
|
|
h->got++;
|
|
|
|
if (verbose && name)
|
|
printf("cget: %s: %s", name, arg);
|
|
|
|
return arg;
|
|
}
|
|
|
|
/* arg_put: "put argument" callback
|
|
*/
|
|
void
|
|
arg_put(void *hook, int letter, void *arg, int count, char *name)
|
|
{
|
|
if (verbose && name && *name)
|
|
printf("%s: ", name);
|
|
|
|
switch(letter)
|
|
{
|
|
case 'i':
|
|
case 'b':
|
|
printf("%d ", (intptr_t)arg);
|
|
break;
|
|
|
|
case 'c':
|
|
case 'z':
|
|
{
|
|
char *p;
|
|
|
|
p = malloc(count + 1);
|
|
|
|
bzero(p, count +1);
|
|
strncpy(p, (char *)arg, count);
|
|
if (letter == 'z')
|
|
{
|
|
int i;
|
|
for (i = count - 1; i >= 0; i--)
|
|
if (p[i] == ' ')
|
|
p[i] = 0;
|
|
else
|
|
break;
|
|
}
|
|
printf("%s ", p);
|
|
|
|
free(p);
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
printf("Unknown format letter: '%c'\n", letter);
|
|
}
|
|
if (verbose)
|
|
putchar('\n');
|
|
}
|