diff options
-rw-r--r-- | bin/csh/char.h | 4 | ||||
-rw-r--r-- | bin/csh/const.c | 86 | ||||
-rw-r--r-- | bin/csh/csh.c | 6 | ||||
-rw-r--r-- | bin/csh/dol.c | 6 | ||||
-rw-r--r-- | bin/csh/err.c | 8 | ||||
-rw-r--r-- | bin/csh/func.c | 6 | ||||
-rw-r--r-- | bin/csh/glob.c | 6 | ||||
-rw-r--r-- | bin/csh/proc.c | 24 | ||||
-rw-r--r-- | bin/csh/sem.c | 6 | ||||
-rw-r--r-- | bin/csh/str.c | 6 |
10 files changed, 79 insertions, 79 deletions
diff --git a/bin/csh/char.h b/bin/csh/char.h index eaeb2672381..fbbe1db375c 100644 --- a/bin/csh/char.h +++ b/bin/csh/char.h @@ -1,4 +1,4 @@ -/* $OpenBSD: char.h,v 1.2 1996/06/23 14:19:13 deraadt Exp $ */ +/* $OpenBSD: char.h,v 1.3 1997/07/23 14:36:47 kstailey Exp $ */ /* $NetBSD: char.h,v 1.6 1995/03/21 09:02:29 cgd Exp $ */ /*- @@ -71,7 +71,7 @@ extern unsigned char _cmap_lower[], _cmap_upper[]; #define letter(c) (((c) & QUOTE) ? 0 : \ (isalpha((unsigned char) (c)) || (c) == '_')) #define alnum(c) (((c) & QUOTE) ? 0 : \ - (isalnum((unsigned char) (c)) || (c) == '_')) + (isalnum((unsigned char) (c)) || (c) == '_')) #ifdef NLS #define Isspace(c) (((c) & QUOTE) ? 0 : isspace((unsigned char) (c))) #define Isdigit(c) (((c) & QUOTE) ? 0 : isdigit((unsigned char) (c))) diff --git a/bin/csh/const.c b/bin/csh/const.c index 27375771b55..58699d54191 100644 --- a/bin/csh/const.c +++ b/bin/csh/const.c @@ -1,4 +1,4 @@ -/* $OpenBSD: const.c,v 1.2 1996/06/23 14:19:13 deraadt Exp $ */ +/* $OpenBSD: const.c,v 1.3 1997/07/23 14:36:48 kstailey Exp $ */ /* $NetBSD: const.c,v 1.6 1995/03/21 09:02:31 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)const.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: const.c,v 1.2 1996/06/23 14:19:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: const.c,v 1.3 1997/07/23 14:36:48 kstailey Exp $"; #endif #endif /* not lint */ @@ -48,45 +48,45 @@ static char rcsid[] = "$OpenBSD: const.c,v 1.2 1996/06/23 14:19:13 deraadt Exp $ #include "csh.h" -Char STR0[] = { '0', '\0' }; -Char STR1[] = { '1', '\0' }; +Char STR0[] = { '0', '\0' }; +Char STR1[] = { '1', '\0' }; Char STRHOME[] = { 'H', 'O', 'M', 'E', '\0' }; -Char STRLANG[] = { 'L', 'A', 'N', 'G', '\0' }; +Char STRLANG[] = { 'L', 'A', 'N', 'G', '\0' }; Char STRLC_CTYPE[] = { 'L', 'C', '_', 'C', 'T', 'Y', 'P', 'E' ,'\0' }; Char STRLOGNAME[] = { 'L', 'O', 'G', 'N', 'A', 'M', 'E', '\0' }; Char STRLbrace[] = { '{', '\0' }; Char STRLparen[] = { '(', '\0' }; Char STRLparensp[] = { '(', ' ', '\0' }; -Char STRNULL[] = { '\0' }; -Char STRPATH[] = { 'P', 'A', 'T', 'H', '\0' }; +Char STRNULL[] = { '\0' }; +Char STRPATH[] = { 'P', 'A', 'T', 'H', '\0' }; Char STRPWD[] = { 'P', 'W', 'D', '\0' }; Char STRQNULL[] = { '\0' | QUOTE, '\0' }; Char STRRbrace[] = { '}', '\0' }; Char STRspRparen[] = { ' ', ')', '\0' }; Char STRTERM[] = { 'T', 'E', 'R', 'M', '\0' }; Char STRUSER[] = { 'U', 'S', 'E', 'R', '\0' }; -Char STRalias[] = { 'a', 'l', 'i', 'a', 's', '\0' }; +Char STRalias[] = { 'a', 'l', 'i', 'a', 's', '\0' }; Char STRand[] = { '&', '\0' }; Char STRand2[] = { '&', '&', '\0' }; -Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' }; -Char STRargv[] = { 'a', 'r', 'g', 'v', '\0' }; +Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' }; +Char STRargv[] = { 'a', 'r', 'g', 'v', '\0' }; Char STRbang[] = { '!', '\0' }; Char STRcaret[] = { '^', '\0' }; Char STRcdpath[] = { 'c', 'd', 'p', 'a', 't', 'h', '\0' }; -Char STRcent2[] = { '%', '%', '\0' }; -Char STRcenthash[] = { '%', '#', '\0' }; -Char STRcentplus[] = { '%', '+', '\0' }; -Char STRcentminus[] = { '%', '-', '\0' }; +Char STRcent2[] = { '%', '%', '\0' }; +Char STRcenthash[] = { '%', '#', '\0' }; +Char STRcentplus[] = { '%', '+', '\0' }; +Char STRcentminus[] = { '%', '-', '\0' }; Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l', 'i', 'n', 'k', 's', '\0' }; Char STRchild[] = { 'c', 'h', 'i', 'l', 'd', '\0' }; Char STRcolon[] = { ':', '\0' }; -Char STRcwd[] = { 'c', 'w', 'd', '\0' }; +Char STRcwd[] = { 'c', 'w', 'd', '\0' }; Char STRdefault[] = { 'd', 'e', 'f', 'a', 'u', 'l', 't', '\0' }; -Char STRdot[] = { '.', '\0' }; +Char STRdot[] = { '.', '\0' }; Char STRdotdotsl[] = { '.', '.', '/', '\0' }; Char STRdotsl[] = { '.', '/', '\0' }; -Char STRecho[] = { 'e', 'c', 'h', 'o', '\0' }; +Char STRecho[] = { 'e', 'c', 'h', 'o', '\0' }; Char STRequal[] = { '=', '\0' }; Char STRfakecom[] = { '{', ' ', '.', '.', '.', ' ', '}', '\0' }; Char STRfakecom1[] = { '`', ' ', '.', '.', '.', ' ', '`', '\0' }; @@ -95,24 +95,24 @@ Char STRfignore[] = { 'f', 'i', 'g', 'n', 'o', 'r', 'e', '\0' }; Char STRfilec[] = { 'f', 'i', 'l', 'e', 'c', '\0' }; #endif /* FILEC */ Char STRhistchars[] = { 'h', 'i', 's', 't', 'c', 'h', 'a', 'r', 's', '\0' }; -Char STRtildothist[] = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r', - 'y', '\0' }; +Char STRtildothist[] = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r', + 'y', '\0' }; Char STRhistfile[] = { 'h', 'i', 's', 't', 'f', 'i', 'l', 'e', '\0' }; -Char STRhistory[] = { 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' }; -Char STRhome[] = { 'h', 'o', 'm', 'e', '\0' }; +Char STRhistory[] = { 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' }; +Char STRhome[] = { 'h', 'o', 'm', 'e', '\0' }; Char STRignore_symlinks[] = { 'i', 'g', 'n', 'o', 'r', 'e', '_', 's', 'y', 'm', 'l', 'i', 'n', 'k', 's', '\0' }; Char STRignoreeof[] = { 'i', 'g', 'n', 'o', 'r', 'e', 'e', 'o', 'f', '\0' }; -Char STRjobs[] = { 'j', 'o', 'b', 's', '\0' }; +Char STRjobs[] = { 'j', 'o', 'b', 's', '\0' }; Char STRlistjobs[] = { 'l', 'i', 's', 't', 'j', 'o', 'b', 's', '\0' }; -Char STRlogout[] = { 'l', 'o', 'g', 'o', 'u', 't', '\0' }; +Char STRlogout[] = { 'l', 'o', 'g', 'o', 'u', 't', '\0' }; Char STRlong[] = { 'l', 'o', 'n', 'g', '\0' }; Char STRmail[] = { 'm', 'a', 'i', 'l', '\0' }; -Char STRmh[] = { '-', 'h', '\0' }; +Char STRmh[] = { '-', 'h', '\0' }; Char STRminus[] = { '-', '\0' }; Char STRml[] = { '-', 'l', '\0' }; Char STRmn[] = { '-', 'n', '\0' }; -Char STRmquestion[] = { '?' | QUOTE, ' ', '\0' }; +Char STRmquestion[] = { '?' | QUOTE, ' ', '\0' }; Char STRnice[] = { 'n', 'i', 'c', 'e', '\0' }; Char STRnoambiguous[] = { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u', 's', '\0' }; @@ -121,27 +121,27 @@ Char STRnoclobber[] = { 'n', 'o', 'c', 'l', 'o', 'b', 'b', 'e', 'r', '\0' }; Char STRnoglob[] = { 'n', 'o', 'g', 'l', 'o', 'b', '\0' }; Char STRnohup[] = { 'n', 'o', 'h', 'u', 'p', '\0' }; Char STRnonomatch[] = { 'n', 'o', 'n', 'o', 'm', 'a', 't', 'c', 'h', '\0' }; -Char STRnormal[] = { 'n', 'o', 'r', 'm', 'a', 'l', '\0' }; +Char STRnormal[] = { 'n', 'o', 'r', 'm', 'a', 'l', '\0' }; Char STRnotify[] = { 'n', 'o', 't', 'i', 'f', 'y', '\0' }; Char STRor[] = { '|', '\0' }; Char STRor2[] = { '|', '|', '\0' }; -Char STRpath[] = { 'p', 'a', 't', 'h', '\0' }; +Char STRpath[] = { 'p', 'a', 't', 'h', '\0' }; Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v', 'a', 'l', 'u', 'e', '\0' }; -Char STRprompt[] = { 'p', 'r', 'o', 'm', 'p', 't', '\0' }; -Char STRprompt2[] = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' }; +Char STRprompt[] = { 'p', 'r', 'o', 'm', 'p', 't', '\0' }; +Char STRprompt2[] = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' }; Char STRpushdsilent[] = { 'p', 'u', 's', 'h', 'd', 's', 'i', 'l', 'e', 'n', 't', '\0' }; Char STRret[] = { '\n', '\0' }; -Char STRsavehist[] = { 's', 'a', 'v', 'e', 'h', 'i', 's', 't', '\0' }; +Char STRsavehist[] = { 's', 'a', 'v', 'e', 'h', 'i', 's', 't', '\0' }; Char STRsemisp[] = { ';', ' ', '\0' }; -Char STRshell[] = { 's', 'h', 'e', 'l', 'l', '\0' }; +Char STRshell[] = { 's', 'h', 'e', 'l', 'l', '\0' }; Char STRslash[] = { '/', '\0' }; Char STRsldotcshrc[] = { '/', '.', 'c', 's', 'h', 'r', 'c', '\0' }; Char STRsldotlogin[] = { '/', '.', 'l', 'o', 'g', 'i', 'n', '\0' }; -Char STRsldthist[] = { '/', '.', 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' }; -Char STRsldtlogout[] = { '/', '.', 'l', 'o', 'g', 'o', 'u', 't', '\0' }; -Char STRsource[] = { 's', 'o', 'u', 'r', 'c', 'e', '\0' }; +Char STRsldthist[] = { '/', '.', 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' }; +Char STRsldtlogout[] = { '/', '.', 'l', 'o', 'g', 'o', 'u', 't', '\0' }; +Char STRsource[] = { 's', 'o', 'u', 'r', 'c', 'e', '\0' }; Char STRsp3dots[] = { ' ', '.', '.', '.', '\0' }; Char STRspLarrow2sp[] = { ' ', '<', '<', ' ', '\0' }; Char STRspLarrowsp[] = { ' ', '<', ' ', '\0' }; @@ -152,16 +152,16 @@ Char STRspace[] = { ' ', '\0' }; Char STRspand2sp[] = { ' ', '&', '&', ' ', '\0' }; Char STRspor2sp[] = { ' ', '|', '|', ' ', '\0' }; Char STRsporsp[] = { ' ', '|', ' ', '\0' }; -Char STRstar[] = { '*', '\0' }; -Char STRstatus[] = { 's', 't', 'a', 't', 'u', 's', '\0' }; -Char STRsymcent[] = { '%', ' ', '\0' }; -Char STRsymhash[] = { '#', ' ', '\0' }; -Char STRterm[] = { 't', 'e', 'r', 'm', '\0' }; +Char STRstar[] = { '*', '\0' }; +Char STRstatus[] = { 's', 't', 'a', 't', 'u', 's', '\0' }; +Char STRsymcent[] = { '%', ' ', '\0' }; +Char STRsymhash[] = { '#', ' ', '\0' }; +Char STRterm[] = { 't', 'e', 'r', 'm', '\0' }; Char STRthen[] = { 't', 'h', 'e', 'n', '\0' }; Char STRtilde[] = { '~', '\0' }; Char STRtime[] = { 't', 'i', 'm', 'e', '\0' }; -Char STRtmpsh[] = { '/', 't', 'm', 'p', '/', 's', 'h', '\0' }; -Char STRunalias[] = { 'u', 'n', 'a', 'l', 'i', 'a', 's', '\0' }; -Char STRuser[] = { 'u', 's', 'e', 'r', '\0' }; -Char STRverbose[] = { 'v', 'e', 'r', 'b', 'o', 's', 'e', '\0' }; +Char STRtmpsh[] = { '/', 't', 'm', 'p', '/', 's', 'h', '\0' }; +Char STRunalias[] = { 'u', 'n', 'a', 'l', 'i', 'a', 's', '\0' }; +Char STRuser[] = { 'u', 's', 'e', 'r', '\0' }; +Char STRverbose[] = { 'v', 'e', 'r', 'b', 'o', 's', 'e', '\0' }; Char STRwordchars[] = { 'w', 'o', 'r', 'd', 'c', 'h', 'a', 'r', 's', '\0' }; diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 536198ecdb6..0a974b1e633 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.5 1996/11/02 01:00:30 millert Exp $ */ +/* $OpenBSD: csh.c,v 1.6 1997/07/23 14:36:48 kstailey Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else -static char rcsid[] = "$OpenBSD: csh.c,v 1.5 1996/11/02 01:00:30 millert Exp $"; +static char rcsid[] = "$OpenBSD: csh.c,v 1.6 1997/07/23 14:36:48 kstailey Exp $"; #endif #endif /* not lint */ @@ -559,7 +559,7 @@ notty: if ((cp = value(STRhistfile)) != STRNULL) loadhist[2] = cp; dosource(loadhist, NULL); - if (loginsh) + if (loginsh) (void) srccat(value(STRhome), STRsldotlogin); } diff --git a/bin/csh/dol.c b/bin/csh/dol.c index ca2502b7c0e..d472a99f6ed 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dol.c,v 1.2 1996/06/23 14:19:18 deraadt Exp $ */ +/* $OpenBSD: dol.c,v 1.3 1997/07/23 14:36:49 kstailey Exp $ */ /* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dol.c,v 1.2 1996/06/23 14:19:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dol.c,v 1.3 1997/07/23 14:36:49 kstailey Exp $"; #endif #endif /* not lint */ @@ -758,7 +758,7 @@ setDolp(cp) dolmcnt--; else break; - } else { + } else { int didmod = 0; do { diff --git a/bin/csh/err.c b/bin/csh/err.c index 00c77a85848..0708850347f 100644 --- a/bin/csh/err.c +++ b/bin/csh/err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err.c,v 1.3 1996/09/15 22:00:27 millert Exp $ */ +/* $OpenBSD: err.c,v 1.4 1997/07/23 14:36:49 kstailey Exp $ */ /* $NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: err.c,v 1.3 1996/09/15 22:00:27 millert Exp $"; +static char rcsid[] = "$OpenBSD: err.c,v 1.4 1997/07/23 14:36:49 kstailey Exp $"; #endif #endif /* not lint */ @@ -277,7 +277,7 @@ static char *errorlist[] = "Alias loop", #define ERR_HISTLOOP 106 "!# History loop", -#define ERR_ARCH 107 +#define ERR_ARCH 107 "%s: %s. Wrong Architecture", #define ERR_FILEINQ 108 "Malformed file inquiry", @@ -325,7 +325,7 @@ seterror(id, va_alist) * Special ids: * ERR_SILENT: Print nothing. * ERR_OLD: Print the previously set error if one was there. - * otherwise return. + * otherwise return. * ERR_NAME: If this bit is set, print the name of the function * in bname * diff --git a/bin/csh/func.c b/bin/csh/func.c index 5089e6d37a3..3f787c87954 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: func.c,v 1.4 1997/06/18 18:39:38 kstailey Exp $ */ +/* $OpenBSD: func.c,v 1.5 1997/07/23 14:36:50 kstailey Exp $ */ /* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: func.c,v 1.4 1997/06/18 18:39:38 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: func.c,v 1.5 1997/07/23 14:36:50 kstailey Exp $"; #endif #endif /* not lint */ @@ -1407,7 +1407,7 @@ retry: old = signal(SIGTTIN, SIG_DFL); (void) kill(0, SIGTTIN); (void) signal(SIGTTIN, old); - goto retry; + goto retry; } (void) setpgid(0, shpgrp); (void) tcsetpgrp(FSHTTY, shpgrp); diff --git a/bin/csh/glob.c b/bin/csh/glob.c index 9dc7f9daf24..b2f7328a1e5 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.2 1996/06/23 14:19:23 deraadt Exp $ */ +/* $OpenBSD: glob.c,v 1.3 1997/07/23 14:36:50 kstailey Exp $ */ /* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.2 1996/06/23 14:19:23 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.3 1997/07/23 14:36:50 kstailey Exp $"; #endif #endif /* not lint */ @@ -708,7 +708,7 @@ backeval(cp, literal) while (*cp) *cp++ &= TRIM; - /* + /* * In the child ``forget'' everything about current aliases or * eval vectors. */ diff --git a/bin/csh/proc.c b/bin/csh/proc.c index da53e3b325c..ffc18be92c5 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.3 1996/12/14 12:17:42 mickey Exp $ */ +/* $OpenBSD: proc.c,v 1.4 1997/07/23 14:36:51 kstailey Exp $ */ /* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: proc.c,v 1.3 1996/12/14 12:17:42 mickey Exp $"; +static char rcsid[] = "$OpenBSD: proc.c,v 1.4 1997/07/23 14:36:51 kstailey Exp $"; #endif #endif /* not lint */ @@ -742,16 +742,16 @@ pprint(pp, flag) case PINTERRUPTED: case PSTOPPED: case PSIGNALED: - /* - * tell what happened to the background job - * From: Michael Schroeder - * <mlschroe@immd4.informatik.uni-erlangen.de> - */ - if ((flag & REASON) - || ((flag & AREASON) - && reason != SIGINT - && (reason != SIGPIPE - || (pp->p_flags & PPOU) == 0))) { + /* + * tell what happened to the background job + * From: Michael Schroeder + * <mlschroe@immd4.informatik.uni-erlangen.de> + */ + if ((flag & REASON) + || ((flag & AREASON) + && reason != SIGINT + && (reason != SIGPIPE + || (pp->p_flags & PPOU) == 0))) { (void) fprintf(cshout, format, sys_siglist[(unsigned char) pp->p_reason]); diff --git a/bin/csh/sem.c b/bin/csh/sem.c index 57e934ecd70..614e2dce453 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.2 1996/06/23 14:19:29 deraadt Exp $ */ +/* $OpenBSD: sem.c,v 1.3 1997/07/23 14:36:51 kstailey Exp $ */ /* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sem.c,v 1.2 1996/06/23 14:19:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: sem.c,v 1.3 1997/07/23 14:36:51 kstailey Exp $"; #endif #endif /* not lint */ @@ -306,7 +306,7 @@ execute(t, wanttty, pipein, pipeout) bool ignint = 0; if (nosigchld) { - sigprocmask(SIG_SETMASK, &csigset, NULL); + sigprocmask(SIG_SETMASK, &csigset, NULL); nosigchld = 0; } diff --git a/bin/csh/str.c b/bin/csh/str.c index e525129e2dd..001ef9090b4 100644 --- a/bin/csh/str.c +++ b/bin/csh/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.2 1996/06/23 14:19:31 deraadt Exp $ */ +/* $OpenBSD: str.c,v 1.3 1997/07/23 14:36:52 kstailey Exp $ */ /* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: str.c,v 1.2 1996/06/23 14:19:31 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: str.c,v 1.3 1997/07/23 14:36:52 kstailey Exp $"; #endif #endif /* not lint */ @@ -323,7 +323,7 @@ s_strncmp(str1, str2, n) return (*str1 - *str2); break; } - if (*str1 == '\0') + if (*str1 == '\0') return(0); str1++, str2++; } while (--n != 0); |