Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-07 04:31:22 +00:00
Code Issues Projects Releases Wiki Activity

vi: support $EXINIT and -c

Browse Source
This commit is contained in:
Denis Vlasenko 2007-03-21 00:03:42 +00:00
parent 4f93cde77f
commit f9234135f8
1 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
editors/vi.c
View File

@ -257,6 +257,7 @@ static void crash_dummy();
static void crash_test(); static void crash_test();
static int crashme = 0; static int crashme = 0;
#endif #endif
static char *initial_cmds[] = { NULL, NULL , NULL }; // currently 2 entries, NULL terminated
static void write1(const char *out) static void write1(const char *out)
@ -300,10 +301,15 @@ int vi_main(int argc, char **argv)
modifying_cmds = (Byte *) "aAcCdDiIJoOpPrRsxX<>~"; // cmds modifying text[] modifying_cmds = (Byte *) "aAcCdDiIJoOpPrRsxX<>~"; // cmds modifying text[]
#endif #endif
// 1- process $HOME/.exrc file // 1- process $HOME/.exrc file (not inplemented yet)
// 2- process EXINIT variable from environment // 2- process EXINIT variable from environment
// 3- process command line args // 3- process command line args
while ((c = getopt(argc, argv, "hCR")) != -1) { {
char *p = getenv("EXINIT");
if (p && *p)
initial_cmds[0] = xstrdup(p);
}
while ((c = getopt(argc, argv, "hCRc:")) != -1) {
switch (c) { switch (c) {
#if ENABLE_FEATURE_VI_CRASHME #if ENABLE_FEATURE_VI_CRASHME
case 'C': case 'C':
@ -319,6 +325,10 @@ int vi_main(int argc, char **argv)
//case 'r': // recover flag- ignore- we don't use tmp file //case 'r': // recover flag- ignore- we don't use tmp file
//case 'x': // encryption flag- ignore //case 'x': // encryption flag- ignore
//case 'c': // execute command first //case 'c': // execute command first
case 'c': // cmd line vi command
if (*optarg)
initial_cmds[initial_cmds[0] != 0] = xstrdup(optarg);
break;
//case 'h': // help -- just use default //case 'h': // help -- just use default
default: default:
show_help(); show_help();
@ -418,6 +428,25 @@ static void edit_file(Byte * fn)
redraw(FALSE); // dont force every col re-draw redraw(FALSE); // dont force every col re-draw
show_status_line(); show_status_line();
{
char *p, *q;
int n = 0;
while ((p = initial_cmds[n])) {
do {
q = p;
p = strchr(q,'\n');
if (p)
while(*p == '\n')
*p++ = '\0';
if (*q)
colon(q);
} while (p);
free(initial_cmds[n]);
initial_cmds[n] = NULL;
n++;
}
}
//------This is the main Vi cmd handling loop ----------------------- //------This is the main Vi cmd handling loop -----------------------
while (editing > 0) { while (editing > 0) {
#if ENABLE_FEATURE_VI_CRASHME #if ENABLE_FEATURE_VI_CRASHME
@ -902,9 +931,11 @@ static void colon(Byte * buf)
editing = 0; editing = 0;
} }
#if ENABLE_FEATURE_VI_SET #if ENABLE_FEATURE_VI_SET
} else if (strncasecmp((char *) cmd, "set", i) == 0) { // set or clear features } else if (strncasecmp(cmd, "set", i) == 0) { // set or clear features
char *argp;
i = 0; // offset into args i = 0; // offset into args
if (strlen((char *) args) == 0) { // only blank is regarded as args delmiter. What about tab '\t' ?
if (!args[0] || strcasecmp(args, "all") == 0) {
// print out values of all options // print out values of all options
place_cursor(rows - 1, 0, FALSE); // go to Status line, bottom of screen place_cursor(rows - 1, 0, FALSE); // go to Status line, bottom of screen
clear_to_eol(); // clear the line clear_to_eol(); // clear the line
@ -927,17 +958,25 @@ static void colon(Byte * buf)
printf("\r\n"); printf("\r\n");
goto vc2; goto vc2;
} }
if (strncasecmp((char *) args, "no", 2) == 0)
i = 2; // ":set noautoindent"
#if ENABLE_FEATURE_VI_SETOPTS #if ENABLE_FEATURE_VI_SETOPTS
setops(args, "autoindent ", i, "ai", VI_AUTOINDENT); argp = (char *)args;
setops(args, "flash ", i, "fl", VI_ERR_METHOD); while (*argp) {
setops(args, "ignorecase ", i, "ic", VI_IGNORECASE); if (strncasecmp(argp, "no", 2) == 0)
setops(args, "showmatch ", i, "ic", VI_SHOWMATCH); i = 2; // ":set noautoindent"
if (strncasecmp((char *) args + i, "tabstop=%d ", 7) == 0) { setops(argp, "autoindent ", i, "ai", VI_AUTOINDENT);
sscanf(strchr((char *) args + i, '='), "=%d", &ch); setops(argp, "flash ", i, "fl", VI_ERR_METHOD);
if (ch > 0 && ch < columns - 1) setops(argp, "ignorecase ", i, "ic", VI_IGNORECASE);
tabstop = ch; setops(argp, "showmatch ", i, "ic", VI_SHOWMATCH);
/* tabstopXXXX */
if (strncasecmp(argp + i, "tabstop=%d ", 7) == 0) {
sscanf(strchr(argp + i, '='), "=%d", &ch);
if (ch > 0 && ch < columns - 1)
tabstop = ch;
}
while (*argp && *argp != ' ')
argp++; // skip to arg delimiter (i.e. blank)
while (*argp && *argp == ' ')
argp++; // skip all delimiting blanks
} }
#endif /* FEATURE_VI_SETOPTS */ #endif /* FEATURE_VI_SETOPTS */
#endif /* FEATURE_VI_SET */ #endif /* FEATURE_VI_SET */