From 1002778c3dccf891b85971f12677f2c76bdc5671 Mon Sep 17 00:00:00 2001 From: bostic Date: Thu, 2 Dec 1993 10:52:24 +0000 Subject: [PATCH] rework ARGS structures as part of ex parser rework --- ex/ex_source.c | 4 ++-- ex/ex_usage.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ex/ex_source.c b/ex/ex_source.c index 2e476818..232cc30f 100644 --- a/ex/ex_source.c +++ b/ex/ex_source.c @@ -6,7 +6,7 @@ */ #ifndef lint -static char sccsid[] = "$Id: ex_source.c,v 8.2 1993/08/16 12:49:47 bostic Exp $ (Berkeley) $Date: 1993/08/16 12:49:47 $"; +static char sccsid[] = "$Id: ex_source.c,v 8.3 1993/12/02 10:53:22 bostic Exp $ (Berkeley) $Date: 1993/12/02 10:53:22 $"; #endif /* not lint */ #include @@ -24,5 +24,5 @@ ex_source(sp, ep, cmdp) EXF *ep; EXCMDARG *cmdp; { - return (ex_cfile(sp, ep, (char *)cmdp->argv[0])); + return (ex_cfile(sp, ep, cmdp->argv[0]->bp)); } diff --git a/ex/ex_usage.c b/ex/ex_usage.c index 2403578f..f9d35402 100644 --- a/ex/ex_usage.c +++ b/ex/ex_usage.c @@ -6,7 +6,7 @@ */ #ifndef lint -static char sccsid[] = "$Id: ex_usage.c,v 8.8 1993/11/28 19:32:07 bostic Exp $ (Berkeley) $Date: 1993/11/28 19:32:07 $"; +static char sccsid[] = "$Id: ex_usage.c,v 8.9 1993/12/02 10:52:24 bostic Exp $ (Berkeley) $Date: 1993/12/02 10:52:24 $"; #endif /* not lint */ #include @@ -54,7 +54,7 @@ ex_usage(sp, ep, cmdp) switch (cmdp->argc) { case 1: - for (cp = cmds, p = cmdp->argv[0], len = strlen(p); + for (cp = cmds, p = cmdp->argv[0]->bp, len = strlen(p); cp->name != NULL && memcmp(p, cp->name, len); ++cp); if (cp->name == NULL) (void)ex_printf(EXCOOKIE, @@ -89,12 +89,12 @@ ex_viusage(sp, ep, cmdp) switch (cmdp->argc) { case 1: - key = cmdp->argv[0][0]; + key = cmdp->argv[0]->bp[0]; if (key > MAXVIKEY) goto nokey; /* Special case: '[' and ']' commands. */ - if ((key == '[' || key == ']') && cmdp->argv[0][1] != key) + if ((key == '[' || key == ']') && cmdp->argv[0]->bp[1] != key) goto nokey; kp = &vikeys[key]; -- 2.11.4.GIT