/*-
- * Copyright (c) 1990, 1993
+ * Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
- * %sccs.include.redist.c%
+ * 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.
*/
#ifndef lint
-static char sccsid[] = "@(#)keyword.c 8.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
#endif /* not lint */
#include <sys/param.h>
void
showkey()
{
- extern int termwidth;
- register VAR *v;
- register int i, len;
- register char *p, *sep;
+ VAR *v;
+ int i;
+ char *p, *sep;
i = 0;
sep = "";
for (v = var; *(p = v->name); ++v) {
- len = strlen(p);
+ int len = strlen(p);
if (termwidth && (i += len + 1) > termwidth) {
i = len;
sep = "\n";
char *p;
{
static struct varent *vtail;
- register VAR *v;
- register char *cp;
- register struct varent *vent;
#define FMTSEP " \t,\n"
while (p && *p) {
+ char *cp;
+ VAR *v;
+ struct varent *vent;
+
while ((cp = strsep(&p, FMTSEP)) != NULL && *cp == '\0')
/* void */;
if (!(v = findvar(cp)))
findvar(p)
char *p;
{
- extern int eval;
VAR *v, key;
char *hp;
int vcmp();
eval = 1;
}
parsefmt(v->alias);
- return((VAR *)NULL);
+ return ((VAR *)NULL);
}
if (!v) {
warnx("%s: keyword not found", p);
}
if (hp)
v->header = hp;
- return(v);
+ return (v);
}
static int
vcmp(a, b)
const void *a, *b;
{
- return(strcmp(((VAR *)a)->name, ((VAR *)b)->name));
+ return (strcmp(((VAR *)a)->name, ((VAR *)b)->name));
}