Apple-2gs-SW
/
hush
mirror of https://github.com/sheumann/hush.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More GNO and ORCA/C compatibility fixes. 

Everything in the shell directory now compiles.
This commit is contained in:
Stephen Heumann 2014-11-01 18:25:21 -05:00
parent 2464399542
commit 875b1bbd0e
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libbb.h
View File

@ -1580,7 +1580,11 @@ struct globals;
* If you want to assign a value, use SET_PTR_TO_GLOBALS(x) */ * If you want to assign a value, use SET_PTR_TO_GLOBALS(x) */
extern struct globals *const ptr_to_globals; extern struct globals *const ptr_to_globals;
/* At least gcc 3.4.6 on mipsel system needs optimization barrier */ /* At least gcc 3.4.6 on mipsel system needs optimization barrier */
#define barrier() __asm__ __volatile__("":::"memory") #ifndef __ORCAC__
# define barrier() __asm__ __volatile__("":::"memory")
#else
# define barrier()
#endif
#define SET_PTR_TO_GLOBALS(x) do { \ #define SET_PTR_TO_GLOBALS(x) do { \
(*(struct globals**)&ptr_to_globals) = (void*)(x); \ (*(struct globals**)&ptr_to_globals) = (void*)(x); \
barrier(); \ barrier(); \

2
include/platform.h
View File

@ -202,7 +202,7 @@ typedef unsigned smalluint;
#endif #endif
/* Define bb_setpgrp */ /* Define bb_setpgrp */
#if defined(__digital__) && defined(__unix__) #if defined(__digital__) && defined(__unix__) || defined(__GNO__)
/* use legacy setpgrp(pid_t, pid_t) for now. move to platform.c */ /* use legacy setpgrp(pid_t, pid_t) for now. move to platform.c */
# define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0) # define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0)
#else #else

12
shell/hush.c
View File

@ -6117,7 +6117,7 @@ static void xforked_grandchild(void *args_struct) {
/* squirrel != NULL means we squirrel away copies of stdin, stdout, /* squirrel != NULL means we squirrel away copies of stdin, stdout,
* and stderr if they are redirected. */ * and stderr if they are redirected. */
static int setup_redirects(struct command *prog, int squirrel[]) static int setup_redirects(struct command *prog, int *squirrel)
{ {
int openfd, mode; int openfd, mode;
struct redir_struct *redir; struct redir_struct *redir;
@ -6756,7 +6756,11 @@ static void delete_finished_bg_job(struct pipe *pi)
static int checkjobs(struct pipe *fg_pipe) static int checkjobs(struct pipe *fg_pipe)
{ {
int attributes; int attributes;
#ifndef __GNO__
int status; int status;
#else
union wait status;
#endif
#if ENABLE_HUSH_JOB #if ENABLE_HUSH_JOB
struct pipe *pi; struct pipe *pi;
#endif #endif
@ -7854,7 +7858,7 @@ int hush_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int hush_main(int argc, char **argv) int hush_main(int argc, char **argv)
{ {
enum { enum {
OPT_login = (1 << 0), OPT_login = (1 << 0)
}; };
unsigned flags; unsigned flags;
int opt; int opt;
@ -9122,7 +9126,11 @@ static int FAST_FUNC builtin_unset(char **argv)
static int FAST_FUNC builtin_wait(char **argv) static int FAST_FUNC builtin_wait(char **argv)
{ {
int ret = EXIT_SUCCESS; int ret = EXIT_SUCCESS;
#ifndef __GNO__
int status; int status;
#else
union wait status;
#endif
argv = skip_dash_dash(argv); argv = skip_dash_dash(argv);
if (argv[0] == NULL) { if (argv[0] == NULL) {

4
shell/random.c
View File

@ -37,7 +37,7 @@ next_random(random_t *rnd)
/* Galois LFSR parameter: /* Galois LFSR parameter:
* Taps at 32 31 29 1: * Taps at 32 31 29 1:
*/ */
enum { MASK = 0x8000000b }; const uint32_t MASK = 0x8000000b;
/* Another example - taps at 32 31 30 10: */ /* Another example - taps at 32 31 30 10: */
/* enum { MASK = 0x00400007 }; */ /* enum { MASK = 0x00400007 }; */
@ -48,7 +48,7 @@ next_random(random_t *rnd)
enum { enum {
a = 2, a = 2,
b = 7, b = 7,
c = 3, c = 3
}; };
uint32_t t; uint32_t t;