Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-08 11:30:54 +00:00
Code Issues Projects Releases Wiki Activity

fix ash-alias/alias.tests failure

Browse Source
This commit is contained in:
Denis Vlasenko 2009-04-02 12:57:38 +00:00
parent 98c52645c0
commit 0dfe1d26a9
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
shell/ash.c
View File

@ -354,39 +354,25 @@ raise_interrupt(void)
} while (0) } while (0)
#endif #endif
#if ENABLE_ASH_OPTIMIZE_FOR_SIZE static USE_ASH_OPTIMIZE_FOR_SIZE(inline) void
static void
int_on(void) int_on(void)
{ {
xbarrier();
if (--suppressint == 0 && intpending) { if (--suppressint == 0 && intpending) {
raise_interrupt(); raise_interrupt();
} }
} }
#define INT_ON int_on() #define INT_ON int_on()
static void static USE_ASH_OPTIMIZE_FOR_SIZE(inline) void
force_int_on(void) force_int_on(void)
{ {
xbarrier();
suppressint = 0; suppressint = 0;
if (intpending) if (intpending)
raise_interrupt(); raise_interrupt();
} }
#define FORCE_INT_ON force_int_on() #define FORCE_INT_ON force_int_on()
#else /* !ASH_OPTIMIZE_FOR_SIZE */
#define INT_ON do { \
xbarrier(); \
if (--suppressint == 0 && intpending) \
raise_interrupt(); \
} while (0)
#define FORCE_INT_ON do { \
xbarrier(); \
suppressint = 0; \
if (intpending) \
raise_interrupt(); \
} while (0)
#endif /* !ASH_OPTIMIZE_FOR_SIZE */
#define SAVE_INT(v) ((v) = suppressint) #define SAVE_INT(v) ((v) = suppressint)
#define RESTORE_INT(v) do { \ #define RESTORE_INT(v) do { \
@ -2700,23 +2686,26 @@ SIT(int c, int syntax)
const char *s; const char *s;
int indx; int indx;
if (c == PEOF) /* 2^8+2 */ if (c == PEOF) { /* 2^8+2 */
return CENDFILE; return CENDFILE;
#if ENABLE_ASH_ALIAS
if (c == PEOA) /* 2^8+1 */
indx = 0;
else
#endif
if ((unsigned char)c >= (unsigned char)(CTLESC)
&& (unsigned char)c <= (unsigned char)(CTLQUOTEMARK)
) {
return CCTL;
} }
s = strchrnul(spec_symbls, c); #if ENABLE_ASH_ALIAS
if (*s == '\0') if (c == PEOA) { /* 2^8+1 */
return CWORD; indx = 0;
indx = syntax_index_table[s - spec_symbls]; } else
#endif
{
if ((unsigned char)c >= (unsigned char)(CTLESC)
&& (unsigned char)c <= (unsigned char)(CTLQUOTEMARK)
) {
return CCTL;
}
s = strchrnul(spec_symbls, c);
if (*s == '\0') {
return CWORD;
}
indx = syntax_index_table[s - spec_symbls];
}
return S_I_T[indx][syntax]; return S_I_T[indx][syntax];
} }
@ -3019,7 +3008,7 @@ static const char syntax_index_table[258] = {
/* 257 127 */ CWORD_CWORD_CWORD_CWORD, /* 257 127 */ CWORD_CWORD_CWORD_CWORD,
}; };
#define SIT(c, syntax) (S_I_T[(int)syntax_index_table[((int)c)+SYNBASE]][syntax]) #define SIT(c, syntax) (S_I_T[(int)syntax_index_table[(int)(c) + SYNBASE]][syntax])
#endif /* USE_SIT_FUNCTION */ #endif /* USE_SIT_FUNCTION */