Bash is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 1, or (at your option) any later
+Software Foundation; either version 2, or (at your option) any later
version.
Bash is distributed in the hope that it will be useful, but WITHOUT ANY
You should have received a copy of the GNU General Public License along
with Bash; see the file COPYING. If not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA.
$PRODUCES fg_bg.c
used.
$END
-#include <sys/types.h>
+#include <config.h>
+
+#include "../bashtypes.h"
#include <signal.h>
+
+#if defined (HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+
#include "../shell.h"
#include "../jobs.h"
+#include "common.h"
#if defined (JOB_CONTROL)
extern char *this_command_name;
-static int fg_bg ();
+static int fg_bg __P((WORD_LIST *, int));
/* How to bring a job into the foreground. */
int
fg_builtin (list)
WORD_LIST *list;
{
- int fg_bit = 1;
- register WORD_LIST *t = list;
+ int fg_bit;
+ register WORD_LIST *t;
- if (!job_control)
+ if (job_control == 0)
{
builtin_error ("no job control");
return (EXECUTION_FAILURE);
}
+ if (no_options (list))
+ return (EX_USAGE);
+
/* If the last arg on the line is '&', then start this job in the
background. Else, fg the job. */
-
- while (t && t->next)
- t = t->next;
-
- if (t && t->word->word[0] == '&' && !t->word->word[1])
- fg_bit = 0;
+ for (t = list; t && t->next; t = t->next)
+ ;
+ fg_bit = (t && t->word->word[0] == '&' && t->word->word[1] == '\0') == 0;
return (fg_bg (list, fg_bit));
}
bg_builtin (list)
WORD_LIST *list;
{
- if (!job_control)
+ if (job_control == 0)
{
builtin_error ("no job control");
return (EXECUTION_FAILURE);
}
+ if (no_options (list))
+ return (EX_USAGE);
+
return (fg_bg (list, 0));
}
int foreground;
{
sigset_t set, oset;
- int job, status = EXECUTION_SUCCESS, old_async_pid;
+ int job, status, old_async_pid;
BLOCK_CHILD (set, oset);
job = get_job_spec (list);
- if (job < 0 || job >= job_slots || !jobs[job])
+ if (job < 0 || job >= job_slots || jobs[job] == 0)
{
if (job != DUP_JOB)
- builtin_error ("No such job %s", list ? list->word->word : "");
+ builtin_error ("%s: no such job", list ? list->word->word : "current");
goto failure;
}
/* Or if jobs[job]->pgrp == shell_pgrp. */
- if (!(jobs[job]->flags & J_JOBCONTROL))
+ if (IS_JOBCONTROL (job) == 0)
{
builtin_error ("job %%%d started without job control", job + 1);
goto failure;
}
- if (!foreground)
+ if (foreground == 0)
{
old_async_pid = last_asynchronous_pid;
last_asynchronous_pid = jobs[job]->pgrp; /* As per Posix.2 5.4.2 */
}
else
{
- if (!foreground)
+ if (foreground == 0)
last_asynchronous_pid = old_async_pid;
failure: