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

däs isch ei buul, koa int…

Browse Source
This commit is contained in:
tg
2008-09-30 17:49:26 +00:00
parent 8f5eda8859
commit f53a8196e4
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
edit.c
View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.132 2008/09/30 17:23:00 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.133 2008/09/30 17:49:24 tg Exp $");
/* tty driver characters we are interested in */ /* tty driver characters we are interested in */
typedef struct { typedef struct {
@ -3155,7 +3155,7 @@ x_edit_line(int c __unused)
if (modified) { if (modified) {
*xep = '\0'; *xep = '\0';
source->line++; source->line++;
histsave(source->line, xbuf, 1); histsave(source->line, xbuf, true);
x_arg = 0; x_arg = 0;
} else } else
x_arg = source->line - (histptr - x_histp); x_arg = source->line - (histptr - x_histp);
@ -4366,7 +4366,7 @@ vi_cmd(int argcnt, const char *cmd)
if (modified) { if (modified) {
es->cbuf[es->linelen] = '\0'; es->cbuf[es->linelen] = '\0';
source->line++; source->line++;
histsave(source->line, es->cbuf, 1); histsave(source->line, es->cbuf, true);
} else } else
argcnt = source->line + 1 argcnt = source->line + 1
- (hlast - hnum); - (hlast - hnum);

6
funcs.c
View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.87 2008/09/17 19:31:29 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.88 2008/09/30 17:49:25 tg Exp $");
/* A leading = means assignments before command are kept; /* A leading = means assignments before command are kept;
* a leading * means a POSIX special builtin; * a leading * means a POSIX special builtin;
@ -503,7 +503,7 @@ c_print(const char **wp)
if (flags & PO_HIST) { if (flags & PO_HIST) {
Xput(xs, xp, '\0'); Xput(xs, xp, '\0');
source->line++; source->line++;
histsave(source->line, Xstring(xs, xp), 1); histsave(source->line, Xstring(xs, xp), true);
Xfree(xs, xp); Xfree(xs, xp);
} else { } else {
int n, len = Xlength(xs, xp); int n, len = Xlength(xs, xp);
@ -1895,7 +1895,7 @@ c_read(const char **wp)
if (historyr) { if (historyr) {
Xput(xs, xp, '\0'); Xput(xs, xp, '\0');
source->line++; source->line++;
histsave(source->line, Xstring(xs, xp), 1); histsave(source->line, Xstring(xs, xp), true);
Xfree(xs, xp); Xfree(xs, xp);
} }
/* if this is the co-process fd, close the file descriptor /* if this is the co-process fd, close the file descriptor

8
histrap.c
View File

@ -3,7 +3,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.67 2008/07/12 17:16:03 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.68 2008/09/30 17:49:26 tg Exp $");
/*- /*-
* MirOS: This is the default mapping type, and need not be specified. * MirOS: This is the default mapping type, and need not be specified.
@ -280,7 +280,7 @@ hist_execute(char *cmd)
if (!*q) /* ignore trailing newline */ if (!*q) /* ignore trailing newline */
q = NULL; q = NULL;
} }
histsave(++(hist_source->line), p, 1); histsave(++(hist_source->line), p, true);
shellf("%s\n", p); /* POSIX doesn't say this is done... */ shellf("%s\n", p); /* POSIX doesn't say this is done... */
if ((p = q)) /* restore \n (trailing \n not restored) */ if ((p = q)) /* restore \n (trailing \n not restored) */
@ -574,7 +574,7 @@ init_histvec(void)
* save command in history * save command in history
*/ */
void void
histsave(int lno __unused, const char *cmd, int dowrite __unused) histsave(int lno __unused, const char *cmd, bool dowrite __unused)
{ {
char **hp; char **hp;
char *c, *cp; char *c, *cp;
@ -858,7 +858,7 @@ histload(Source *s, unsigned char *base, int bytes)
histinsert(s, lno, (char *)line); histinsert(s, lno, (char *)line);
} else { } else {
s->line = lno; s->line = lno;
histsave(lno, (char *)line, 0); histsave(lno, (char *)line, false);
} }
state = shdr; state = shdr;
} }

4
lex.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.67 2008/09/20 14:17:30 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/lex.c,v 1.68 2008/09/30 17:49:26 tg Exp $");
/* /*
* states while lexing word * states while lexing word
@ -1243,7 +1243,7 @@ getsc_line(Source *s)
char *p = Xstring(s->xs, xp); char *p = Xstring(s->xs, xp);
if (*p && (cur_prompt != PS1 || !ctype(*p, C_IFS | C_IFSWS))) { if (*p && (cur_prompt != PS1 || !ctype(*p, C_IFS | C_IFSWS))) {
s->line++; s->line++;
histsave(s->line, s->str, 1); histsave(s->line, s->str, true);
} }
} }
if (interactive) if (interactive)

4
sh.h
View File

@ -100,7 +100,7 @@
#define __SCCSID(x) __IDSTRING(sccsid,x) #define __SCCSID(x) __IDSTRING(sccsid,x)
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.233 2008/09/20 19:18:00 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.234 2008/09/30 17:49:26 tg Exp $");
#endif #endif
#define MKSH_VERSION "R35 2008/09/20" #define MKSH_VERSION "R35 2008/09/20"
@ -1306,7 +1306,7 @@ void hist_init(Source *);
#if HAVE_PERSISTENT_HISTORY #if HAVE_PERSISTENT_HISTORY
void hist_finish(void); void hist_finish(void);
#endif #endif
void histsave(int, const char *, int); void histsave(int, const char *, bool);
int c_fc(const char **); int c_fc(const char **);
void sethistsize(int); void sethistsize(int);
#if HAVE_PERSISTENT_HISTORY #if HAVE_PERSISTENT_HISTORY