/* function prototypes for shell stuff */
static void checkjobs(struct jobset *job_list);
static void remove_job(struct jobset *j_list, struct job *job);
-static int get_command_bufsiz(FILE * source, char *command);
+static int get_command_bufsiz(FILE *source, char *command);
static int parse_command(char **command_ptr, struct job *job, int *inbg);
static int run_command(struct job *newjob, int inbg, int outpipe[2]);
-static int pseudo_exec(struct child_prog *cmd) ATTRIBUTE_NORETURN;
-static int busy_loop(FILE * input);
+static int pseudo_exec(struct child_prog *cmd) NORETURN;
+static int busy_loop(FILE *input);
/* Table of built-in functions (these are non-forking builtins, meaning they
va_end(args);
}
#else
-static inline void debug_printf(const char ATTRIBUTE_UNUSED *format, ...) { }
+static inline void debug_printf(const char UNUSED_PARAM *format, ...) { }
#endif
/*
}
/* built-in 'help' handler */
-static int builtin_help(struct child_prog ATTRIBUTE_UNUSED *dummy)
+static int builtin_help(struct child_prog UNUSED_PARAM *dummy)
{
const struct built_in_command *x;
- printf("\nBuilt-in commands:\n"
- "-------------------\n");
+ printf(
+ "Built-in commands:\n"
+ "------------------\n");
for (x = bltins; x <= &VEC_LAST(bltins); x++) {
if (x->descr == NULL)
continue;
/* built-in 'pwd' handler */
-static int builtin_pwd(struct child_prog ATTRIBUTE_UNUSED *dummy)
+static int builtin_pwd(struct child_prog UNUSED_PARAM *dummy)
{
update_cwd();
puts(cwd);
static line_input_t *line_input_state;
#endif
-static int get_command_bufsiz(FILE * source, char *command)
+static int get_command_bufsiz(FILE *source, char *command)
{
const char *prompt_str;
/* Find the end of any whitespace trailing behind
* the token and let that be part of the token */
- while (string[*ix] && (isspace)(string[*ix]) ) {
+ while (string[*ix] && isspace(string[*ix])) {
(*ix)++;
}
num_skip_chars = 1;
} else {
src = dst + 1;
- while ((isalnum)(*src) || *src == '_') src++;
+ while (isalnum(*src) || *src == '_') src++;
}
if (src == NULL) {
src = dst+dstlen;
return 0;
}
-static int busy_loop(FILE * input)
+static int busy_loop(FILE *input)
{
char *command;
char *next_command = NULL;
if (global_argv[0] && global_argv[0][0] == '-') {
FILE *prof_input;
- prof_input = fopen("/etc/profile", "r");
+ prof_input = fopen_for_read("/etc/profile");
if (prof_input) {
llist_add_to(&close_me_list, (void *)(long)fileno(prof_input));
/* Now run the file */
}
} else if (!local_pending_command && global_argv[optind]) {
//printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
- input = xfopen(global_argv[optind], "r");
+ input = xfopen_for_read(global_argv[optind]);
/* be lazy, never mark this closed */
llist_add_to(&close_me_list, (void *)(long)fileno(input));
}