diff options
Diffstat (limited to 'tc.func.c')
| -rw-r--r-- | tc.func.c | 115 |
1 files changed, 72 insertions, 43 deletions
diff --git a/tc.func.c b/tc.func.c index b13fe04dd2d8..feb1c8947118 100644 --- a/tc.func.c +++ b/tc.func.c @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/tc.func.c,v 3.148 2011/12/14 16:36:44 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/tc.func.c,v 3.158 2016/05/13 15:08:12 christos Exp $ */ /* * tc.func.c: New tcsh builtins. */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$tcsh: tc.func.c,v 3.148 2011/12/14 16:36:44 christos Exp $") +RCSID("$tcsh: tc.func.c,v 3.158 2016/05/13 15:08:12 christos Exp $") #include "ed.h" #include "ed.defns.h" /* for the function names */ @@ -120,11 +120,17 @@ expand_lex(const struct wordent *sp0, int from, int to) if ((*s & QUOTE) && (((*s & TRIM) == HIST && HIST != '\0') || (((*s & TRIM) == '\'') && (prev_c != '\\')) || - (((*s & TRIM) == '\"') && (prev_c != '\\')) || - (((*s & TRIM) == '\\') && (prev_c != '\\')))) { + (((*s & TRIM) == '\"') && (prev_c != '\\')))) { Strbuf_append1(&buf, '\\'); } +#if INVALID_BYTE != 0 + if ((*s & INVALID_BYTE) != INVALID_BYTE) /* *s < INVALID_BYTE */ + Strbuf_append1(&buf, *s & TRIM); + else + Strbuf_append1(&buf, *s); +#else Strbuf_append1(&buf, *s & TRIM); +#endif prev_c = *s; } Strbuf_append1(&buf, ' '); @@ -193,7 +199,7 @@ void dolist(Char **v, struct command *c) { Char **globbed; - int i, k; + int i, k, ret = 0; struct stat st; USE(c); @@ -333,8 +339,11 @@ dolist(Char **v, struct command *c) xputchar('\n'); print_by_column(STRNULL, &v[i], k - i, FALSE); } + haderr = 1; xprintf("%S: %s.\n", tmp, strerror(err)); + haderr = 0; i = k + 1; + ret = 1; } else if (S_ISDIR(st.st_mode)) { Char *cp; @@ -372,6 +381,8 @@ dolist(Char **v, struct command *c) xputchar('\n'); print_by_column(STRNULL, &v[i], k - i, FALSE); } + if (ret) + stderror(ERR_SILENT); } cleanup_until(globbed); @@ -481,6 +492,19 @@ dowhich(Char **v, struct command *c) setcopy(STRstatus, STR1, VAR_READWRITE); } +static int +findvv(Char **vv, const char *cp) +{ + for (; vv && *vv; vv++) { + size_t i; + for (i = 0; (*vv)[i] && (*vv)[i] == cp[i]; i++) + continue; + if ((*vv)[i] == '\0' && cp[i] == '\0') + return 1; + } + return 0; +} + /* PWP: a hack to start up your stopped editor on a single keystroke */ /* jbs - fixed hack so it worked :-) 3/28/89 */ @@ -488,32 +512,41 @@ struct process * find_stop_ed(void) { struct process *pp, *retp; - const char *ep, *vp; + const char *ep = NULL, *vp = NULL; char *cp, *p; - size_t epl, vpl; + size_t epl = 0, vpl = 0; int pstatus; + struct varent *varp; + Char **vv; - if ((ep = getenv("EDITOR")) != NULL) { /* if we have a value */ - if ((p = strrchr(ep, '/')) != NULL) /* if it has a path */ - ep = p + 1; /* then we want only the last part */ - } - else - ep = "ed"; + if (pcurrent == NULL) /* see if we have any jobs */ + return NULL; /* nope */ - if ((vp = getenv("VISUAL")) != NULL) { /* if we have a value */ - if ((p = strrchr(vp, '/')) != NULL) /* and it has a path */ - vp = p + 1; /* then we want only the last part */ - } - else - vp = "vi"; + if ((varp = adrof(STReditors)) != NULL) + vv = varp->vec; + else + vv = NULL; - for (vpl = 0; vp[vpl] && !isspace((unsigned char)vp[vpl]); vpl++) - continue; - for (epl = 0; ep[epl] && !isspace((unsigned char)ep[epl]); epl++) - continue; + if (! vv) { + if ((ep = getenv("EDITOR")) != NULL) { /* if we have a value */ + if ((p = strrchr(ep, '/')) != NULL) /* if it has a path */ + ep = p + 1; /* then we want only the last part */ + } + else + ep = "ed"; - if (pcurrent == NULL) /* see if we have any jobs */ - return NULL; /* nope */ + if ((vp = getenv("VISUAL")) != NULL) { /* if we have a value */ + if ((p = strrchr(vp, '/')) != NULL) /* and it has a path */ + vp = p + 1; /* then we want only the last part */ + } + else + vp = "vi"; + + for (vpl = 0; vp[vpl] && !isspace((unsigned char)vp[vpl]); vpl++) + continue; + for (epl = 0; ep[epl] && !isspace((unsigned char)ep[epl]); epl++) + continue; + } retp = NULL; for (pp = proclist.p_next; pp; pp = pp->p_next) @@ -540,10 +573,13 @@ find_stop_ed(void) else cp = p; /* else we get all of it */ - /* if we find either in the current name, fg it */ - if (strncmp(ep, cp, epl) == 0 || - strncmp(vp, cp, vpl) == 0) { - + /* + * If we find the current name in the $editors array (if set) + * or as $EDITOR or $VISUAL (if $editors not set), fg it. + */ + if ((vv && findvv(vv, cp)) || + (epl && strncmp(ep, cp, epl) == 0 && cp[epl] == '\0') || + (vpl && strncmp(vp, cp, vpl) == 0 && cp[vpl] == '\0')) { /* * If there is a choice, then choose the current process if * available, or the previous process otherwise, or else @@ -733,7 +769,7 @@ auto_lock(void) pp = xgetpass("Password:"); crpp = XCRYPT(pw, pp, srpp); - if ((strcmp(crpp, srpp) == 0) + if ((crpp && strcmp(crpp, srpp) == 0) #ifdef AFS || (ka_UserAuthenticateGeneral(KA_USERAUTH_VERSION, afsname, /* name */ @@ -1108,8 +1144,7 @@ rmstar(struct wordent *cp) Char *tag; #endif /* RMDEBUG */ Char *charac; - char c; - int ask, doit, star = 0, silent = 0; + int ask, doit, star = 0, silent = 0, opintr_disabled; if (!adrof(STRrmstar)) return; @@ -1119,6 +1154,8 @@ rmstar(struct wordent *cp) we = cp->next; while (*we->word == ';' && we != cp) we = we->next; + opintr_disabled = pintr_disabled; + pintr_disabled = 0; while (we != cp) { #ifdef RMDEBUG if (*tag) @@ -1139,17 +1176,8 @@ rmstar(struct wordent *cp) if (!Strcmp(args->word, STRstar)) star = 1; if (ask && star) { - xprintf("%s", CGETS(22, 8, - "Do you really want to delete all files? [n/y] ")); - flush(); - (void) force_read(SHIN, &c, 1); - /* - * Perhaps we should use the yesexpr from the - * actual locale - */ - doit = (strchr(CGETS(22, 14, "Yy"), c) != NULL); - while (c != '\n' && force_read(SHIN, &c, 1) == 1) - continue; + doit = getYN(CGETS(22, 8, + "Do you really want to delete all files? [N/y] ")); if (!doit) { /* remove the command instead */ #ifdef RMDEBUG @@ -1195,6 +1223,7 @@ rmstar(struct wordent *cp) xprintf("%S ", we->word); } #endif /* RMDEBUG */ + pintr_disabled = opintr_disabled; return; } |