Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-10 16:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Change the ARRAY_SIZE macro to work around an ORCA/C limitation.

Browse Source
This commit is contained in:
Stephen Heumann 2014-11-01 15:47:17 -05:00
parent 2b0d727f39
commit 3577d48e74
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/libbb.h
View File

@ -1651,7 +1651,10 @@ extern const char bb_default_login_shell[] ALIGN1;
#endif #endif
#define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) #define ARRAY_SIZE(x) ((size_t)(sizeof(x) / sizeof((x)[0])))
/* ORCA/C will sometimes barf on the expression in ARRAY_SIZE, depending on the element type
* (e.g. for arrays of structs). When it does, use ARRAY_SIZE2 instead. */
#define ARRAY_SIZE2(x, elttype) ((size_t)(sizeof(x) / sizeof(elttype)))
/* We redefine ctype macros. Unicode-correct handling of char types /* We redefine ctype macros. Unicode-correct handling of char types

10
shell/hush.c
View File

@ -3108,7 +3108,7 @@ static const struct reserved_combo* match_reserved_word(o_string *word)
}; };
const struct reserved_combo *r; const struct reserved_combo *r;
for (r = reserved_list; r < reserved_list + ARRAY_SIZE(reserved_list); r++) { for (r = reserved_list; r < reserved_list + ARRAY_SIZE2(reserved_list, struct reserved_combo); r++) {
if (strcmp(word->data, r->literal) == 0) if (strcmp(word->data, r->literal) == 0)
return r; return r;
} }
@ -3999,7 +3999,7 @@ static int parse_dollar(o_string *as_string,
if (last_ch == 0) /* error? */ if (last_ch == 0) /* error? */
return 0; return 0;
#else #else
#error Simple code to only allow ${var} is not implemented #error "Simple code to only allow ${var} is not implemented"
#endif #endif
if (as_string) { if (as_string) {
o_addstr(as_string, dest->data + pos); o_addstr(as_string, dest->data + pos);
@ -6214,14 +6214,14 @@ static const struct built_in_command *find_builtin_helper(const char *name,
} }
static const struct built_in_command *find_builtin1(const char *name) static const struct built_in_command *find_builtin1(const char *name)
{ {
return find_builtin_helper(name, bltins1, &bltins1[ARRAY_SIZE(bltins1)]); return find_builtin_helper(name, bltins1, &bltins1[ARRAY_SIZE2(bltins1, struct built_in_command)]);
} }
static const struct built_in_command *find_builtin(const char *name) static const struct built_in_command *find_builtin(const char *name)
{ {
const struct built_in_command *x = find_builtin1(name); const struct built_in_command *x = find_builtin1(name);
if (x) if (x)
return x; return x;
return find_builtin_helper(name, bltins2, &bltins2[ARRAY_SIZE(bltins2)]); return find_builtin_helper(name, bltins2, &bltins2[ARRAY_SIZE2(bltins2, struct built_in_command)]);
} }
#if ENABLE_HUSH_FUNCTIONS #if ENABLE_HUSH_FUNCTIONS
@ -8723,7 +8723,7 @@ static int FAST_FUNC builtin_help(char **argv UNUSED_PARAM)
printf( printf(
"Built-in commands:\n" "Built-in commands:\n"
"------------------\n"); "------------------\n");
for (x = bltins1; x != &bltins1[ARRAY_SIZE(bltins1)]; x++) { for (x = bltins1; x != &bltins1[ARRAY_SIZE2(bltins1, struct built_in_command)]; x++) {
if (x->b_descr) if (x->b_descr)
printf("%-10s%s\n", x->b_cmd, x->b_descr); printf("%-10s%s\n", x->b_cmd, x->b_descr);
} }

6
shell/shell_common.c
View File

@ -432,7 +432,7 @@ shell_builtin_ulimit(char **argv)
} }
if (opt_char == 'a') { if (opt_char == 'a') {
for (l = limits_tbl; l != &limits_tbl[ARRAY_SIZE(limits_tbl)]; l++) { for (l = limits_tbl; l != &limits_tbl[ARRAY_SIZE2(limits_tbl, struct limits)]; l++) {
getrlimit(l->cmd, &limit); getrlimit(l->cmd, &limit);
printf("-%c: %-30s ", l->option, l->name); printf("-%c: %-30s ", l->option, l->name);
printlim(opts, &limit, l); printlim(opts, &limit, l);
@ -442,7 +442,7 @@ shell_builtin_ulimit(char **argv)
if (opt_char == 1) if (opt_char == 1)
opt_char = 'f'; opt_char = 'f';
for (l = limits_tbl; l != &limits_tbl[ARRAY_SIZE(limits_tbl)]; l++) { for (l = limits_tbl; l != &limits_tbl[ARRAY_SIZE2(limits_tbl, struct limits)]; l++) {
if (opt_char == l->option) { if (opt_char == l->option) {
char *val_str; char *val_str;
@ -489,7 +489,7 @@ shell_builtin_ulimit(char **argv)
} }
} /* for (every possible opt) */ } /* for (every possible opt) */
if (l == &limits_tbl[ARRAY_SIZE(limits_tbl)]) { if (l == &limits_tbl[ARRAY_SIZE2(limits_tbl, struct limits)]) {
/* bad option. getopt already complained. */ /* bad option. getopt already complained. */
break; break;
} }