mirror of
https://github.com/sheumann/hush.git
synced 2024-09-28 13:54:53 +00:00
GNO/ORCA compatiblity: remove final comma in enums, and appropriately define stuff that GNO doesn't have in platform.h.
This commit is contained in:
parent
3709307794
commit
f6c7fdc027
@ -400,6 +400,28 @@ typedef unsigned smalluint;
|
|||||||
# undef HAVE_NET_ETHERNET_H
|
# undef HAVE_NET_ETHERNET_H
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GNO__)
|
||||||
|
# undef HAVE_CLEARENV
|
||||||
|
# undef HAVE_FDATASYNC
|
||||||
|
# undef HAVE_DPRINTF
|
||||||
|
# undef HAVE_MEMRCHR
|
||||||
|
# undef HAVE_MKDTEMP
|
||||||
|
# undef HAVE_PTSNAME_R
|
||||||
|
# undef HAVE_SIGHANDLER_T
|
||||||
|
# undef HAVE_STPCPY
|
||||||
|
# undef HAVE_STRCASESTR
|
||||||
|
# undef HAVE_STRCHRNUL
|
||||||
|
# undef HAVE_STRSIGNAL
|
||||||
|
# undef HAVE_VASPRINTF
|
||||||
|
# undef HAVE_GETLINE
|
||||||
|
# undef HAVE_XTABS
|
||||||
|
# undef HAVE_UNLOCKED_STDIO
|
||||||
|
# undef HAVE_UNLOCKED_LINE_OPS
|
||||||
|
# undef HAVE_MNTENT_H
|
||||||
|
# undef HAVE_NET_ETHERNET_H
|
||||||
|
# undef HAVE_SYS_STATFS_H
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Now, define prototypes for all the functions defined in platform.c
|
* Now, define prototypes for all the functions defined in platform.c
|
||||||
* These must come after all the HAVE_* macros are defined (or not)
|
* These must come after all the HAVE_* macros are defined (or not)
|
||||||
|
13
shell/hush.c
13
shell/hush.c
@ -440,14 +440,14 @@ enum {
|
|||||||
EXP_FLAG_GLOB = 0x2,
|
EXP_FLAG_GLOB = 0x2,
|
||||||
/* Protect newly added chars against globbing
|
/* Protect newly added chars against globbing
|
||||||
* by prepending \ to *, ?, [, \ */
|
* by prepending \ to *, ?, [, \ */
|
||||||
EXP_FLAG_ESC_GLOB_CHARS = 0x1,
|
EXP_FLAG_ESC_GLOB_CHARS = 0x1
|
||||||
};
|
};
|
||||||
enum {
|
enum {
|
||||||
MAYBE_ASSIGNMENT = 0,
|
MAYBE_ASSIGNMENT = 0,
|
||||||
DEFINITELY_ASSIGNMENT = 1,
|
DEFINITELY_ASSIGNMENT = 1,
|
||||||
NOT_ASSIGNMENT = 2,
|
NOT_ASSIGNMENT = 2,
|
||||||
/* Not an assigment, but next word may be: "if v=xyz cmd;" */
|
/* Not an assigment, but next word may be: "if v=xyz cmd;" */
|
||||||
WORD_IS_KEYWORD = 3,
|
WORD_IS_KEYWORD = 3
|
||||||
};
|
};
|
||||||
/* Used for initialization: o_string foo = NULL_O_STRING; */
|
/* Used for initialization: o_string foo = NULL_O_STRING; */
|
||||||
#define NULL_O_STRING { NULL }
|
#define NULL_O_STRING { NULL }
|
||||||
@ -520,7 +520,7 @@ typedef enum redir_type {
|
|||||||
/* otherwise, rd_fd is redirected to rd_dup */
|
/* otherwise, rd_fd is redirected to rd_dup */
|
||||||
|
|
||||||
HEREDOC_SKIPTABS = 1,
|
HEREDOC_SKIPTABS = 1,
|
||||||
HEREDOC_QUOTED = 2,
|
HEREDOC_QUOTED = 2
|
||||||
} redir_type;
|
} redir_type;
|
||||||
|
|
||||||
|
|
||||||
@ -593,7 +593,7 @@ typedef enum pipe_style {
|
|||||||
PIPE_SEQ = 1,
|
PIPE_SEQ = 1,
|
||||||
PIPE_AND = 2,
|
PIPE_AND = 2,
|
||||||
PIPE_OR = 3,
|
PIPE_OR = 3,
|
||||||
PIPE_BG = 4,
|
PIPE_BG = 4
|
||||||
} pipe_style;
|
} pipe_style;
|
||||||
/* Is there anything in this pipe at all? */
|
/* Is there anything in this pipe at all? */
|
||||||
#define IS_NULL_PIPE(pi) \
|
#define IS_NULL_PIPE(pi) \
|
||||||
@ -652,7 +652,7 @@ struct variable {
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
BC_BREAK = 1,
|
BC_BREAK = 1,
|
||||||
BC_CONTINUE = 2,
|
BC_CONTINUE = 2
|
||||||
};
|
};
|
||||||
|
|
||||||
#if ENABLE_HUSH_FUNCTIONS
|
#if ENABLE_HUSH_FUNCTIONS
|
||||||
@ -1463,7 +1463,6 @@ enum {
|
|||||||
| (1 << SIGTTOU)
|
| (1 << SIGTTOU)
|
||||||
| (1 << SIGTSTP)
|
| (1 << SIGTSTP)
|
||||||
#endif
|
#endif
|
||||||
,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void record_pending_signo(int sig)
|
static void record_pending_signo(int sig)
|
||||||
@ -3075,7 +3074,7 @@ enum {
|
|||||||
FLAG_MATCH = (1 << RES_MATCH),
|
FLAG_MATCH = (1 << RES_MATCH),
|
||||||
FLAG_ESAC = (1 << RES_ESAC ),
|
FLAG_ESAC = (1 << RES_ESAC ),
|
||||||
# endif
|
# endif
|
||||||
FLAG_START = (1 << RES_XXXX ),
|
FLAG_START = (1 << RES_XXXX )
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct reserved_combo* match_reserved_word(o_string *word)
|
static const struct reserved_combo* match_reserved_word(o_string *word)
|
||||||
|
Loading…
Reference in New Issue
Block a user