aboutsummaryrefslogtreecommitdiff
path: root/ash.c
diff options
context:
space:
mode:
Diffstat (limited to 'ash.c')
-rw-r--r--ash.c31
1 files changed, 12 insertions, 19 deletions
diff --git a/ash.c b/ash.c
index 8a213d876..a65275893 100644
--- a/ash.c
+++ b/ash.c
@@ -2508,9 +2508,7 @@ out:
2508 * of all the rest.) 2508 * of all the rest.)
2509 */ 2509 */
2510 2510
2511static inline void 2511static inline void evalpipe(union node *n)
2512evalpipe(n)
2513 union node *n;
2514{ 2512{
2515 struct job *jp; 2513 struct job *jp;
2516 struct nodelist *lp; 2514 struct nodelist *lp;
@@ -3453,8 +3451,8 @@ pgetc(void)
3453 * PEOF may be pushed back. 3451 * PEOF may be pushed back.
3454 */ 3452 */
3455 3453
3456static void 3454static void pungetc(void)
3457pungetc() { 3455{
3458 parsenleft++; 3456 parsenleft++;
3459 parsenextc--; 3457 parsenextc--;
3460} 3458}
@@ -3496,8 +3494,8 @@ popallfiles(void) {
3496 * after a fork is done. 3494 * after a fork is done.
3497 */ 3495 */
3498 3496
3499static void 3497static void closescript(void)
3500closescript() { 3498{
3501 popallfiles(); 3499 popallfiles();
3502 if (parsefile->fd > 0) { 3500 if (parsefile->fd > 0) {
3503 close(parsefile->fd); 3501 close(parsefile->fd);
@@ -3511,9 +3509,7 @@ closescript() {
3511 * interrupts off. 3509 * interrupts off.
3512 */ 3510 */
3513 3511
3514static void 3512static void setinputfd(int fd, int push)
3515setinputfd(fd, push)
3516 int fd, push;
3517{ 3513{
3518 (void) fcntl(fd, F_SETFD, FD_CLOEXEC); 3514 (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
3519 if (push) { 3515 if (push) {
@@ -4471,10 +4467,7 @@ expandarg(arg, arglist, flag)
4471 * input string. 4467 * input string.
4472 */ 4468 */
4473 4469
4474static inline char * 4470static inline char * evalvar(char *p, int flag)
4475evalvar(p, flag)
4476 char *p;
4477 int flag;
4478{ 4471{
4479 int subtype; 4472 int subtype;
4480 int varflags; 4473 int varflags;
@@ -6075,7 +6068,7 @@ static inline void putprompt(const char *s) {
6075 6068
6076#ifdef ASH_ALIAS 6069#ifdef ASH_ALIAS
6077static int 6070static int
6078pgetc2() 6071pgetc2(void)
6079{ 6072{
6080 int c; 6073 int c;
6081 do { 6074 do {
@@ -6349,7 +6342,8 @@ static int fd0_redirected = 0;
6349 6342
6350/* Return true if fd 0 has already been redirected at least once. */ 6343/* Return true if fd 0 has already been redirected at least once. */
6351static inline int 6344static inline int
6352fd0_redirected_p () { 6345fd0_redirected_p (void)
6346{
6353 return fd0_redirected != 0; 6347 return fd0_redirected != 0;
6354} 6348}
6355 6349
@@ -7971,8 +7965,7 @@ readcmdfile(const char *name)
7971 7965
7972 7966
7973static inline char * 7967static inline char *
7974find_dot_file(mybasename) 7968find_dot_file(char *mybasename)
7975 char *mybasename;
7976{ 7969{
7977 char *fullname; 7970 char *fullname;
7978 const char *path = pathval(); 7971 const char *path = pathval();
@@ -12761,7 +12754,7 @@ findvar(struct var **vpp, const char *name)
12761/* 12754/*
12762 * Copyright (c) 1999 Herbert Xu <herbert@debian.org> 12755 * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
12763 * This file contains code for the times builtin. 12756 * This file contains code for the times builtin.
12764 * $Id: ash.c,v 1.25 2001/09/11 01:14:02 mjn3 Exp $ 12757 * $Id: ash.c,v 1.26 2001/10/18 04:11:38 andersen Exp $
12765 */ 12758 */
12766static int timescmd (int argc, char **argv) 12759static int timescmd (int argc, char **argv)
12767{ 12760{