JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* use modulo operation, Mr Glockner

Browse Source 
* allow promptlen to return values > $COLUMNS
This commit is contained in:
tg 2006-08-01 14:35:44 +00:00
parent ce18e01f2c
commit a15c5c319a
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edit.c
View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.26 2006/08/01 14:10:24 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.27 2006/08/01 14:35:43 tg Exp $");
/* tty driver characters we are interested in */ /* tty driver characters we are interested in */
typedef struct { typedef struct {
@ -1241,7 +1241,7 @@ x_emacs(char *buf, size_t len)
x_adj_ok = 1; x_adj_ok = 1;
prompt_redraw = 1; prompt_redraw = 1;
if (x_col > xx_cols) if (x_col > xx_cols)
x_col = x_col - (x_col / xx_cols) * xx_cols; x_col %= xx_cols;
x_displen = xx_cols - 2 - x_col; x_displen = xx_cols - 2 - x_col;
x_adj_done = 0; x_adj_done = 0;

42
lex.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.16 2006/08/01 14:10:25 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/lex.c,v 1.17 2006/08/01 14:35:44 tg Exp $");
/* Structure to keep track of the lexing state and the various pieces of info /* Structure to keep track of the lexing state and the various pieces of info
* needed for each particular state. */ * needed for each particular state. */
@ -58,6 +58,8 @@ static void gethere(void);
static Lex_state *push_state_(State_info *, Lex_state *); static Lex_state *push_state_(State_info *, Lex_state *);
static Lex_state *pop_state_(State_info *, Lex_state *); static Lex_state *pop_state_(State_info *, Lex_state *);
static int dopprompt(const char *, int, const char **, int);
static int backslash_skip; static int backslash_skip;
static int ignore_backslash_newline; static int ignore_backslash_newline;
@ -1085,18 +1087,10 @@ set_prompt(int to, Source *s)
} }
} }
/* See also related routine, promptlen() in edit.c */ static int
void dopprompt(const char *cp, int ntruncate, const char **spp, int doprint)
pprompt(const char *cp, int ntruncate)
{ {
shf_puts(cp + ntruncate, shl_out); int count = 0, lines = 0;
shf_flush(shl_out);
}
int
promptlen(const char *cp, const char **spp)
{
int count = 0;
const char *sp = cp; const char *sp = cp;
char delimiter = 0; char delimiter = 0;
int indelimit = 0; int indelimit = 0;
@ -1112,10 +1106,17 @@ promptlen(const char *cp, const char **spp)
cp += 2; cp += 2;
} }
for (; *cp; cp++) { for (; *cp; cp++) {
if (!indelimit && ntruncate)
--ntruncate;
else if (doprint) {
shf_puts(cp, shl_out);
doprint = 0;
}
if (indelimit && *cp != delimiter) if (indelimit && *cp != delimiter)
; ;
else if (*cp == '\n' || *cp == '\r') { else if (*cp == '\n' || *cp == '\r') {
count = 0; count = 0;
++lines;
sp = cp + 1; sp = cp + 1;
} else if (*cp == '\t') { } else if (*cp == '\t') {
count = (count | 7) + 1; count = (count | 7) + 1;
@ -1129,7 +1130,22 @@ promptlen(const char *cp, const char **spp)
} }
if (spp) if (spp)
*spp = sp; *spp = sp;
return count; if (doprint)
shf_flush(shl_out);
return (count + (lines * x_cols));
}
void
pprompt(const char *cp, int ntruncate)
{
dopprompt(cp, ntruncate, NULL, 1);
}
int
promptlen(const char *cp, const char **spp)
{
return (dopprompt(cp, 0, spp, 0));
} }
/* Read the variable part of a ${...} expression (ie, up to but not including /* Read the variable part of a ${...} expression (ie, up to but not including