aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-07-10 16:57:09 +0000
committerEric Andersen <andersen@codepoet.org>2001-07-10 16:57:09 +0000
commit8c145dc31be854e74de12dbbd8e36f9a011d8e10 (patch)
tree15b0ac38b9fad54ce5a4b7aaf75631b6e5fb2fd1
parent55522080c68f73c9de0a190a3b1b0b3e7e56e9fb (diff)
downloadbusybox-w32-8c145dc31be854e74de12dbbd8e36f9a011d8e10.tar.gz
busybox-w32-8c145dc31be854e74de12dbbd8e36f9a011d8e10.tar.bz2
busybox-w32-8c145dc31be854e74de12dbbd8e36f9a011d8e10.zip
Fix a stupid search and replace bug...
-rw-r--r--ash.c8
-rw-r--r--shell/ash.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/ash.c b/ash.c
index 5756c6304..985507341 100644
--- a/ash.c
+++ b/ash.c
@@ -6471,7 +6471,7 @@ static void setjobctl(int enable)
6471 initialpgrp = tcgetpgrp(2); 6471 initialpgrp = tcgetpgrp(2);
6472 if (initialpgrp < 0) { 6472 if (initialpgrp < 0) {
6473#endif 6473#endif
6474 out2str("sh: can't access tty; job cenabletrol turned off\n"); 6474 out2str("sh: can't access tty; job control turned off\n");
6475 mflag = 0; 6475 mflag = 0;
6476 return; 6476 return;
6477 } 6477 }
@@ -6484,7 +6484,7 @@ static void setjobctl(int enable)
6484 } while (0); 6484 } while (0);
6485#ifdef OLD_TTY_DRIVER 6485#ifdef OLD_TTY_DRIVER
6486 if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) { 6486 if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
6487 out2str("sh: need new tty driver to run job cenabletrol; job cenabletrol turned off\n"); 6487 out2str("sh: need new tty driver to run job control; job control turned off\n");
6488 mflag = 0; 6488 mflag = 0;
6489 return; 6489 return;
6490 } 6490 }
@@ -6498,7 +6498,7 @@ static void setjobctl(int enable)
6498#else 6498#else
6499 tcsetpgrp(2, rootpid); 6499 tcsetpgrp(2, rootpid);
6500#endif 6500#endif
6501 } else { /* turning job cenabletrol off */ 6501 } else { /* turning job control off */
6502 setpgid(0, initialpgrp); 6502 setpgid(0, initialpgrp);
6503#ifdef OLD_TTY_DRIVER 6503#ifdef OLD_TTY_DRIVER
6504 ioctl(2, TIOCSPGRP, (char *)&initialpgrp); 6504 ioctl(2, TIOCSPGRP, (char *)&initialpgrp);
@@ -12927,7 +12927,7 @@ findvar(struct var **vpp, const char *name)
12927/* 12927/*
12928 * Copyright (c) 1999 Herbert Xu <herbert@debian.org> 12928 * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
12929 * This file contains code for the times builtin. 12929 * This file contains code for the times builtin.
12930 * $Id: ash.c,v 1.8 2001/07/10 06:09:16 andersen Exp $ 12930 * $Id: ash.c,v 1.9 2001/07/10 16:57:09 andersen Exp $
12931 */ 12931 */
12932static int timescmd (int argc, char **argv) 12932static int timescmd (int argc, char **argv)
12933{ 12933{
diff --git a/shell/ash.c b/shell/ash.c
index 5756c6304..985507341 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6471,7 +6471,7 @@ static void setjobctl(int enable)
6471 initialpgrp = tcgetpgrp(2); 6471 initialpgrp = tcgetpgrp(2);
6472 if (initialpgrp < 0) { 6472 if (initialpgrp < 0) {
6473#endif 6473#endif
6474 out2str("sh: can't access tty; job cenabletrol turned off\n"); 6474 out2str("sh: can't access tty; job control turned off\n");
6475 mflag = 0; 6475 mflag = 0;
6476 return; 6476 return;
6477 } 6477 }
@@ -6484,7 +6484,7 @@ static void setjobctl(int enable)
6484 } while (0); 6484 } while (0);
6485#ifdef OLD_TTY_DRIVER 6485#ifdef OLD_TTY_DRIVER
6486 if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) { 6486 if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
6487 out2str("sh: need new tty driver to run job cenabletrol; job cenabletrol turned off\n"); 6487 out2str("sh: need new tty driver to run job control; job control turned off\n");
6488 mflag = 0; 6488 mflag = 0;
6489 return; 6489 return;
6490 } 6490 }
@@ -6498,7 +6498,7 @@ static void setjobctl(int enable)
6498#else 6498#else
6499 tcsetpgrp(2, rootpid); 6499 tcsetpgrp(2, rootpid);
6500#endif 6500#endif
6501 } else { /* turning job cenabletrol off */ 6501 } else { /* turning job control off */
6502 setpgid(0, initialpgrp); 6502 setpgid(0, initialpgrp);
6503#ifdef OLD_TTY_DRIVER 6503#ifdef OLD_TTY_DRIVER
6504 ioctl(2, TIOCSPGRP, (char *)&initialpgrp); 6504 ioctl(2, TIOCSPGRP, (char *)&initialpgrp);
@@ -12927,7 +12927,7 @@ findvar(struct var **vpp, const char *name)
12927/* 12927/*
12928 * Copyright (c) 1999 Herbert Xu <herbert@debian.org> 12928 * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
12929 * This file contains code for the times builtin. 12929 * This file contains code for the times builtin.
12930 * $Id: ash.c,v 1.8 2001/07/10 06:09:16 andersen Exp $ 12930 * $Id: ash.c,v 1.9 2001/07/10 16:57:09 andersen Exp $
12931 */ 12931 */
12932static int timescmd (int argc, char **argv) 12932static int timescmd (int argc, char **argv)
12933{ 12933{