Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add IPV6 and IPV4 field types to sushi.

This commit is contained in:
garbled 2001-03-07 10:10:20 +00:00
parent a456915f39
commit 2566752a91
2 changed files with 110 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sushi/formtree.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: formtree.h,v 1.3 2001/01/31 09:35:42 garbled Exp $ */
/* $NetBSD: formtree.h,v 1.4 2001/03/07 10:10:20 garbled Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -52,6 +52,10 @@
#define DATAT_ESCRIPT 12 /* script generated entry */
#define DATAT_NESCRIPT 13 /* script generated uneditable field */
#define DATAT_ISCRIPT 14 /* script generated integer field */
#define DATAT_V4 15 /* static IPV4 entry field */
#define DATAT_V4SCRIPT 16 /* script generated IPV4 entry field */
#define DATAT_V6 17 /* static IPV6 entry field */
#define DATAT_V6SCRIPT 18 /* script generated IPV6 entry field */
CIRCLEQ_HEAD(cqForm, formentry);

107
usr.sbin/sushi/scanform.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scanform.c,v 1.13 2001/02/01 08:43:46 garbled Exp $ */
/* $NetBSD: scanform.c,v 1.14 2001/03/07 10:10:20 garbled Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -207,6 +207,26 @@ scan_formindex(struct cqForm *cqf, char *row)
else if (strcmp(x, "req-iscript") == 0) {
type = DATAT_ISCRIPT;
req = 1;
} else if (strcmp(x, "ipv4") == 0)
type = DATAT_V4;
else if (strcmp(x, "req-ipv4") == 0) {
type = DATAT_V4;
req = 1;
} else if (strcmp(x, "ipv4script") == 0)
type = DATAT_V4SCRIPT;
else if (strcmp(x, "req-ipv4script") == 0) {
type = DATAT_V4SCRIPT;
req = 1;
} else if (strcmp(x, "ipv6") == 0)
type = DATAT_V6;
else if (strcmp(x, "req-ipv6") == 0) {
type = DATAT_V6;
req = 1;
} else if (strcmp(x, "ipv6script") == 0)
type = DATAT_V6SCRIPT;
else if (strcmp(x, "req-ipv6script") == 0) {
type = DATAT_V6SCRIPT;
req = 1;
} else
bailout("%s: %s",
catgets(catalog, 1, 11, "invalid data type"), x);
@ -595,6 +615,48 @@ STRING(FIELD_RECORD *x)
return f;
}
static FIELD *
IPV4(FIELD_RECORD *x)
{ /* create an IPV4 field */
FIELD *f = new_field(x->rows, x->cols, x->frow, x->fcol, 0, 0);
if (f) {
set_field_type(f, TYPE_IPV4);
set_field_back(f, A_UNDERLINE);
if (x->newpage == 1)
set_new_page(f, TRUE);
if (x->required == 1)
field_opts_off(f, O_NULLOK);
if (x->bigfield) {
field_opts_off(f, O_STATIC);
set_max_field(f, x->rcols);
}
set_field_buffer(f, 0, x->v);
}
return f;
}
static FIELD *
IPV6(FIELD_RECORD *x)
{ /* create an IPV6 field */
FIELD *f = new_field(x->rows, x->cols, x->frow, x->fcol, 0, 0);
if (f) {
set_field_type(f, TYPE_IPV6);
set_field_back(f, A_UNDERLINE);
if (x->newpage == 1)
set_new_page(f, TRUE);
if (x->required == 1)
field_opts_off(f, O_NULLOK);
if (x->bigfield) {
field_opts_off(f, O_STATIC);
set_max_field(f, x->rcols);
}
set_field_buffer(f, 0, x->v);
}
return f;
}
static FIELD *
MULTI(FIELD_RECORD *x)
{ /* create a MULTI field */
@ -910,6 +972,11 @@ strlen_data(FTREE_ENTRY *ftp)
break;
case DATAT_ENTRY:
case DATAT_ESCRIPT:
case DATAT_NESCRIPT:
case DATAT_V4:
case DATAT_V4SCRIPT:
case DATAT_V6:
case DATAT_V6SCRIPT:
return(ftp->elen);
/* NOTREACHED */
break;
@ -927,7 +994,6 @@ strlen_data(FTREE_ENTRY *ftp)
break;
case DATAT_INVIS:
case DATAT_NOEDIT:
case DATAT_NESCRIPT:
return(strlen(ftp->data));
/* NOTREACHED */
break;
@ -1353,10 +1419,47 @@ form_generate(struct cqForm *cqf, char *basedir, char **args)
p = strsep(&ftp->data, ",");
ftp->elen = atoi(p);
F[i].v = gen_escript(ftp, basedir, max, args);
if (strlen(F[i].v) > ftp->elen)
ftp->elen = strlen(F[i].v);
break;
case DATAT_NESCRIPT:
F[i].type = NOEDIT;
F[i].v = gen_escript(ftp, basedir, max, args);
ftp->elen = strlen(F[i].v);
break;
case DATAT_V4SCRIPT:
F[i].type = IPV4;
F[i].v = gen_escript(ftp, basedir, max, args);
ftp->elen = 18;
break;
case DATAT_V4:
F[i].type = IPV4;
cur = tstring(max, ftp->data);
if (cur)
F[i].v = strdup(args[cur-1]);
else {
if (ftp->data == NULL)
ftp->data = strdup("");
F[i].v = strdup(ftp->data);
}
ftp->elen = 18;
break;
case DATAT_V6SCRIPT:
F[i].type = IPV6;
F[i].v = gen_escript(ftp, basedir, max, args);
ftp->elen = 48;
break;
case DATAT_V6:
F[i].type = IPV6;
cur = tstring(max, ftp->data);
if (cur)
F[i].v = strdup(args[cur-1]);
else {
if (ftp->data == NULL)
ftp->data = strdup("");
F[i].v = strdup(ftp->data);
}
ftp->elen = 48;
break;
}
F[i].rows = 1;