Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

correct set prompt if CONFIG_ASH_EXPAND_PRMT enabled, small automatic space->tabs convert by my personal editor

Browse Source
This commit is contained in:
"Vladimir N. Oleynik" 2005-09-26 13:24:45 +00:00
parent 5f46010ab7
commit 11d7c52912
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shell/ash.c
View File

@ -6016,10 +6016,19 @@ pfgets(char *line, int len)
#ifdef CONFIG_FEATURE_COMMAND_EDITING #ifdef CONFIG_FEATURE_COMMAND_EDITING
#ifdef CONFIG_ASH_EXPAND_PRMT
static char *cmdedit_prompt;
#else
static const char *cmdedit_prompt; static const char *cmdedit_prompt;
#endif
static inline void putprompt(const char *s) static inline void putprompt(const char *s)
{ {
#ifdef CONFIG_ASH_EXPAND_PRMT
free(cmdedit_prompt);
cmdedit_prompt = bb_xstrdup(s);
#else
cmdedit_prompt = s; cmdedit_prompt = s;
#endif
} }
#else #else
static inline void putprompt(const char *s) static inline void putprompt(const char *s)
@ -12626,7 +12635,7 @@ readcmd(int argc, char **argv)
while ((i = nextopt("p:r")) != '\0') while ((i = nextopt("p:r")) != '\0')
#endif #endif
{ {
switch(i) { switch(i) {
case 'p': case 'p':
prompt = optionarg; prompt = optionarg;
break; break;
@ -12643,13 +12652,13 @@ readcmd(int argc, char **argv)
#endif #endif
#if defined(CONFIG_ASH_READ_TIMEOUT) #if defined(CONFIG_ASH_READ_TIMEOUT)
case 't': case 't':
ts.tv_sec = strtol(optionarg, &p, 10); ts.tv_sec = strtol(optionarg, &p, 10);
ts.tv_usec = 0; ts.tv_usec = 0;
if (*p == '.') { if (*p == '.') {
char *p2; char *p2;
if (*++p) { if (*++p) {
int scale; int scale;
ts.tv_usec = strtol(p, &p2, 10); ts.tv_usec = strtol(p, &p2, 10);
if (*p2) if (*p2)
error("invalid timeout"); error("invalid timeout");
scale = p2 - p; scale = p2 - p;