emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a stupid search and replace bug...

Browse Source
This commit is contained in:
Eric Andersen
2001-07-10 16:57:09 +00:00
parent 55522080c6
commit 8c145dc31b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ash.c
View File

@@ -6471,7 +6471,7 @@ static void setjobctl(int enable)
initialpgrp = tcgetpgrp(2); initialpgrp = tcgetpgrp(2);
if (initialpgrp < 0) { if (initialpgrp < 0) {
#endif #endif
out2str("sh: can't access tty; job cenabletrol turned off\n"); out2str("sh: can't access tty; job control turned off\n");
mflag = 0; mflag = 0;
return; return;
} }
@@ -6484,7 +6484,7 @@ static void setjobctl(int enable)
} while (0); } while (0);
#ifdef OLD_TTY_DRIVER #ifdef OLD_TTY_DRIVER
if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) { if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
out2str("sh: need new tty driver to run job cenabletrol; job cenabletrol turned off\n"); out2str("sh: need new tty driver to run job control; job control turned off\n");
mflag = 0; mflag = 0;
return; return;
} }
@@ -6498,7 +6498,7 @@ static void setjobctl(int enable)
#else #else
tcsetpgrp(2, rootpid); tcsetpgrp(2, rootpid);
#endif #endif
} else { /* turning job cenabletrol off */ } else { /* turning job control off */
setpgid(0, initialpgrp); setpgid(0, initialpgrp);
#ifdef OLD_TTY_DRIVER #ifdef OLD_TTY_DRIVER
ioctl(2, TIOCSPGRP, (char *)&initialpgrp); ioctl(2, TIOCSPGRP, (char *)&initialpgrp);
@@ -12927,7 +12927,7 @@ findvar(struct var **vpp, const char *name)
/* /*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org> * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin. * This file contains code for the times builtin.
* $Id: ash.c,v 1.8 2001/07/10 06:09:16 andersen Exp $ * $Id: ash.c,v 1.9 2001/07/10 16:57:09 andersen Exp $
*/ */
static int timescmd (int argc, char **argv) static int timescmd (int argc, char **argv)
{ {

8
shell/ash.c
View File

@@ -6471,7 +6471,7 @@ static void setjobctl(int enable)
initialpgrp = tcgetpgrp(2); initialpgrp = tcgetpgrp(2);
if (initialpgrp < 0) { if (initialpgrp < 0) {
#endif #endif
out2str("sh: can't access tty; job cenabletrol turned off\n"); out2str("sh: can't access tty; job control turned off\n");
mflag = 0; mflag = 0;
return; return;
} }
@@ -6484,7 +6484,7 @@ static void setjobctl(int enable)
} while (0); } while (0);
#ifdef OLD_TTY_DRIVER #ifdef OLD_TTY_DRIVER
if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) { if (ioctl(2, TIOCGETD, (char *)&ldisc) < 0 || ldisc != NTTYDISC) {
out2str("sh: need new tty driver to run job cenabletrol; job cenabletrol turned off\n"); out2str("sh: need new tty driver to run job control; job control turned off\n");
mflag = 0; mflag = 0;
return; return;
} }
@@ -6498,7 +6498,7 @@ static void setjobctl(int enable)
#else #else
tcsetpgrp(2, rootpid); tcsetpgrp(2, rootpid);
#endif #endif
} else { /* turning job cenabletrol off */ } else { /* turning job control off */
setpgid(0, initialpgrp); setpgid(0, initialpgrp);
#ifdef OLD_TTY_DRIVER #ifdef OLD_TTY_DRIVER
ioctl(2, TIOCSPGRP, (char *)&initialpgrp); ioctl(2, TIOCSPGRP, (char *)&initialpgrp);
@@ -12927,7 +12927,7 @@ findvar(struct var **vpp, const char *name)
/* /*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org> * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin. * This file contains code for the times builtin.
* $Id: ash.c,v 1.8 2001/07/10 06:09:16 andersen Exp $ * $Id: ash.c,v 1.9 2001/07/10 16:57:09 andersen Exp $
*/ */
static int timescmd (int argc, char **argv) static int timescmd (int argc, char **argv)
{ {