From 6ebcb99824c4af546578daa1d67bdad1d14e0e44 Mon Sep 17 00:00:00 2001 From: Keith Bostic Date: Wed, 16 May 1990 02:50:31 -0800 Subject: [PATCH] string.h is ANSI C include file SCCS-vsn: bin/date/date.c 4.26 SCCS-vsn: bin/chmod/chmod.c 5.12 SCCS-vsn: bin/rcp/rcp.c 5.25 SCCS-vsn: bin/cp/cp.c 5.16 SCCS-vsn: old/tar/tar.c 5.15 SCCS-vsn: bin/ls/ls.c 5.41 SCCS-vsn: bin/df/df.c 5.19 SCCS-vsn: bin/mkdir/mkdir.c 5.6 SCCS-vsn: games/arithmetic/arithmetic.c 5.3 SCCS-vsn: games/hack/config.h 5.3 SCCS-vsn: games/hack/hack.h 1.3 SCCS-vsn: games/mille/mille.h 5.4 SCCS-vsn: include/memory.h 5.4 SCCS-vsn: lib/libkvm/kvm.c 5.5 SCCS-vsn: lib/libkvm/kvm_hp300.c 5.5 SCCS-vsn: lib/libkvm/kvm_proc.c 5.5 SCCS-vsn: lib/libc/gen/disklabel.c 5.12 SCCS-vsn: lib/libc/gen/genbuildname.c 5.2 SCCS-vsn: lib/libc/gen/getttyent.c 5.7 SCCS-vsn: lib/libc/gen/syslog.c 5.26 SCCS-vsn: lib/libc/net/res_query.c 5.6 SCCS-vsn: usr.bin/f77/libI77/wsnmle.c 5.3 SCCS-vsn: libexec/getNAME/getNAME.c 5.3 SCCS-vsn: libexec/telnetd/defs.h 5.5 SCCS-vsn: libexec/rlogind/rlogind.c 5.42 SCCS-vsn: libexec/ftpd/ftpd.c 5.33 SCCS-vsn: libexec/comsat/comsat.c 5.19 SCCS-vsn: usr.bin/tsort/tsort.c 5.2 SCCS-vsn: usr.bin/nm/nm.c 5.4 --- usr/src/bin/chmod/chmod.c | 4 ++-- usr/src/bin/cp/cp.c | 4 ++-- usr/src/bin/date/date.c | 4 ++-- usr/src/bin/df/df.c | 4 ++-- usr/src/bin/ls/ls.c | 4 ++-- usr/src/bin/mkdir/mkdir.c | 4 ++-- usr/src/bin/rcp/rcp.c | 4 ++-- usr/src/games/arithmetic/arithmetic.c | 4 ++-- usr/src/games/hack/config.h | 1 - usr/src/games/hack/hack.h | 6 ++---- usr/src/games/mille/mille.h | 4 ++-- usr/src/include/memory.h | 4 ++-- usr/src/lib/libc/gen/disklabel.c | 4 ++-- usr/src/lib/libc/gen/genbuildname.c | 4 ++-- usr/src/lib/libc/gen/getttyent.c | 4 ++-- usr/src/lib/libc/gen/syslog.c | 4 ++-- usr/src/lib/libc/net/res_query.c | 4 ++-- usr/src/lib/libkvm/kvm.c | 2 +- usr/src/lib/libkvm/kvm_hp300.c | 2 +- usr/src/lib/libkvm/kvm_proc.c | 2 +- usr/src/libexec/comsat/comsat.c | 4 ++-- usr/src/libexec/ftpd/ftpd.c | 4 ++-- usr/src/libexec/getNAME/getNAME.c | 4 ++-- usr/src/libexec/rlogind/rlogind.c | 4 ++-- usr/src/libexec/telnetd/defs.h | 4 ++-- usr/src/old/tar/tar.c | 4 ++-- usr/src/usr.bin/f77/libI77/wsnmle.c | 4 ++-- usr/src/usr.bin/nm/nm.c | 4 ++-- usr/src/usr.bin/tsort/tsort.c | 4 ++-- 29 files changed, 53 insertions(+), 56 deletions(-) diff --git a/usr/src/bin/chmod/chmod.c b/usr/src/bin/chmod/chmod.c index 507def3b1d..a6d713d98a 100644 --- a/usr/src/bin/chmod/chmod.c +++ b/usr/src/bin/chmod/chmod.c @@ -22,14 +22,14 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)chmod.c 5.11 (Berkeley) %G%"; +static char sccsid[] = "@(#)chmod.c 5.12 (Berkeley) %G%"; #endif /* not lint */ #include #include #include #include -#include +#include extern int errno; int retval; diff --git a/usr/src/bin/cp/cp.c b/usr/src/bin/cp/cp.c index 77d3135078..23204c0d58 100644 --- a/usr/src/bin/cp/cp.c +++ b/usr/src/bin/cp/cp.c @@ -25,7 +25,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)cp.c 5.15 (Berkeley) %G%"; +static char sccsid[] = "@(#)cp.c 5.16 (Berkeley) %G%"; #endif /* not lint */ /* @@ -49,7 +49,7 @@ static char sccsid[] = "@(#)cp.c 5.15 (Berkeley) %G%"; #include #include #include -#include +#include #define type(st) ((st).st_mode & S_IFMT) diff --git a/usr/src/bin/date/date.c b/usr/src/bin/date/date.c index ac22f20b2b..9dcf117c49 100644 --- a/usr/src/bin/date/date.c +++ b/usr/src/bin/date/date.c @@ -22,7 +22,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)date.c 4.25 (Berkeley) %G%"; +static char sccsid[] = "@(#)date.c 4.26 (Berkeley) %G%"; #endif /* not lint */ /* @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)date.c 4.25 (Berkeley) %G%"; #include #include #include -#include +#include #define ATOI2(ar) (ar[0] - '0') * 10 + (ar[1] - '0'); ar += 2; diff --git a/usr/src/bin/df/df.c b/usr/src/bin/df/df.c index df073ab8b3..efcec73efe 100644 --- a/usr/src/bin/df/df.c +++ b/usr/src/bin/df/df.c @@ -22,7 +22,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)df.c 5.18 (Berkeley) %G%"; +static char sccsid[] = "@(#)df.c 5.19 (Berkeley) %G%"; #endif /* not lint */ /* @@ -33,7 +33,7 @@ static char sccsid[] = "@(#)df.c 5.18 (Berkeley) %G%"; #include #include #include -#include +#include #include char *getmntpt(); diff --git a/usr/src/bin/ls/ls.c b/usr/src/bin/ls/ls.c index e5ea3b16c9..61d845c308 100644 --- a/usr/src/bin/ls/ls.c +++ b/usr/src/bin/ls/ls.c @@ -15,14 +15,14 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)ls.c 5.40 (Berkeley) %G%"; +static char sccsid[] = "@(#)ls.c 5.41 (Berkeley) %G%"; #endif /* not lint */ #include #include #include #include -#include +#include #include #include #include "ls.h" diff --git a/usr/src/bin/mkdir/mkdir.c b/usr/src/bin/mkdir/mkdir.c index 7e8722f47e..aa2f40ae19 100644 --- a/usr/src/bin/mkdir/mkdir.c +++ b/usr/src/bin/mkdir/mkdir.c @@ -22,14 +22,14 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)mkdir.c 5.5 (Berkeley) %G%"; +static char sccsid[] = "@(#)mkdir.c 5.6 (Berkeley) %G%"; #endif /* not lint */ #include #include #include #include -#include +#include extern int errno; diff --git a/usr/src/bin/rcp/rcp.c b/usr/src/bin/rcp/rcp.c index efe70112d4..5163990df0 100644 --- a/usr/src/bin/rcp/rcp.c +++ b/usr/src/bin/rcp/rcp.c @@ -22,7 +22,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)rcp.c 5.24 (Berkeley) %G%"; +static char sccsid[] = "@(#)rcp.c 5.25 (Berkeley) %G%"; #endif /* not lint */ /* @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rcp.c 5.24 (Berkeley) %G%"; #include #include #include -#include +#include #include #include #include "pathnames.h" diff --git a/usr/src/games/arithmetic/arithmetic.c b/usr/src/games/arithmetic/arithmetic.c index 497cbddc7e..c2b4f8f7d0 100644 --- a/usr/src/games/arithmetic/arithmetic.c +++ b/usr/src/games/arithmetic/arithmetic.c @@ -25,7 +25,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)arithmetic.c 5.2 (Berkeley) %G%"; +static char sccsid[] = "@(#)arithmetic.c 5.3 (Berkeley) %G%"; #endif /* not lint */ /* @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)arithmetic.c 5.2 (Berkeley) %G%"; #include #include #include -#include +#include char keylist[] = "+-x/"; char defaultkeys[] = "+-"; diff --git a/usr/src/games/hack/config.h b/usr/src/games/hack/config.h index b072125cc3..f382937ba5 100644 --- a/usr/src/games/hack/config.h +++ b/usr/src/games/hack/config.h @@ -12,7 +12,6 @@ /* * Some include files are in a different place under SYSV * BSD SYSV - * * * * diff --git a/usr/src/games/hack/hack.h b/usr/src/games/hack/hack.h index caab8ddf5f..58c028379e 100644 --- a/usr/src/games/hack/hack.h +++ b/usr/src/games/hack/hack.h @@ -2,11 +2,9 @@ /* hack.h - version 1.0.3 */ #include "config.h" +#include -#ifdef BSD -#include /* declarations for strcat etc. */ -#else -#include /* idem on System V */ +#ifndef BSD #define index strchr #define rindex strrchr #endif BSD diff --git a/usr/src/games/mille/mille.h b/usr/src/games/mille/mille.h index fe09595c6c..36456a9645 100644 --- a/usr/src/games/mille/mille.h +++ b/usr/src/games/mille/mille.h @@ -14,13 +14,13 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)mille.h 5.3 (Berkeley) %G% + * @(#)mille.h 5.4 (Berkeley) %G% */ # include # include # include -# include +# include /* * @(#)mille.h 1.1 (Berkeley) 4/1/82 diff --git a/usr/src/include/memory.h b/usr/src/include/memory.h index 8759b5e45e..891b17564c 100644 --- a/usr/src/include/memory.h +++ b/usr/src/include/memory.h @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)memory.h 5.3 (Berkeley) %G% + * @(#)memory.h 5.4 (Berkeley) %G% */ -#include +#include diff --git a/usr/src/lib/libc/gen/disklabel.c b/usr/src/lib/libc/gen/disklabel.c index 07aa970666..729ce94079 100644 --- a/usr/src/lib/libc/gen/disklabel.c +++ b/usr/src/lib/libc/gen/disklabel.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)disklabel.c 5.11 (Berkeley) %G%"; +static char sccsid[] = "@(#)disklabel.c 5.12 (Berkeley) %G%"; #endif /* LIBC_SCCS and not lint */ #include @@ -25,7 +25,7 @@ static char sccsid[] = "@(#)disklabel.c 5.11 (Berkeley) %G%"; #define DKTYPENAMES #include #include -#include +#include static char *dgetstr(); diff --git a/usr/src/lib/libc/gen/genbuildname.c b/usr/src/lib/libc/gen/genbuildname.c index 80bf724d76..0a3cec7aef 100644 --- a/usr/src/lib/libc/gen/genbuildname.c +++ b/usr/src/lib/libc/gen/genbuildname.c @@ -16,12 +16,12 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)genbuildname.c 5.1 (Berkeley) %G%"; +static char sccsid[] = "@(#)genbuildname.c 5.2 (Berkeley) %G%"; #endif LIBC_SCCS and not lint -#include #include #include +#include char *objdir = "obj"; diff --git a/usr/src/lib/libc/gen/getttyent.c b/usr/src/lib/libc/gen/getttyent.c index 0e6bcd2e13..fe84f6fed7 100644 --- a/usr/src/lib/libc/gen/getttyent.c +++ b/usr/src/lib/libc/gen/getttyent.c @@ -16,13 +16,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)getttyent.c 5.6 (Berkeley) %G%"; +static char sccsid[] = "@(#)getttyent.c 5.7 (Berkeley) %G%"; #endif /* LIBC_SCCS and not lint */ #include #include #include -#include +#include static char zapchar; static FILE *tf; diff --git a/usr/src/lib/libc/gen/syslog.c b/usr/src/lib/libc/gen/syslog.c index c5fa4382b9..90afc13ad7 100644 --- a/usr/src/lib/libc/gen/syslog.c +++ b/usr/src/lib/libc/gen/syslog.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)syslog.c 5.25 (Berkeley) %G%"; +static char sccsid[] = "@(#)syslog.c 5.26 (Berkeley) %G%"; #endif /* LIBC_SCCS and not lint */ /* @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)syslog.c 5.25 (Berkeley) %G%"; #include #include #include -#include +#include #include #include #include diff --git a/usr/src/lib/libc/net/res_query.c b/usr/src/lib/libc/net/res_query.c index 36857edd4c..710c892bc6 100644 --- a/usr/src/lib/libc/net/res_query.c +++ b/usr/src/lib/libc/net/res_query.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)res_query.c 5.5 (Berkeley) %G%"; +static char sccsid[] = "@(#)res_query.c 5.6 (Berkeley) %G%"; #endif /* LIBC_SCCS and not lint */ #include @@ -26,7 +26,7 @@ static char sccsid[] = "@(#)res_query.c 5.5 (Berkeley) %G%"; #include #include #include -#include +#include #include #include #include diff --git a/usr/src/lib/libkvm/kvm.c b/usr/src/lib/libkvm/kvm.c index 93d26437db..db057254e7 100644 --- a/usr/src/lib/libkvm/kvm.c +++ b/usr/src/lib/libkvm/kvm.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/usr/src/lib/libkvm/kvm_hp300.c b/usr/src/lib/libkvm/kvm_hp300.c index 93d26437db..db057254e7 100644 --- a/usr/src/lib/libkvm/kvm_hp300.c +++ b/usr/src/lib/libkvm/kvm_hp300.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/usr/src/lib/libkvm/kvm_proc.c b/usr/src/lib/libkvm/kvm_proc.c index 93d26437db..db057254e7 100644 --- a/usr/src/lib/libkvm/kvm_proc.c +++ b/usr/src/lib/libkvm/kvm_proc.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/usr/src/libexec/comsat/comsat.c b/usr/src/libexec/comsat/comsat.c index bba82f7195..3f57efff59 100644 --- a/usr/src/libexec/comsat/comsat.c +++ b/usr/src/libexec/comsat/comsat.c @@ -22,7 +22,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)comsat.c 5.18 (Berkeley) %G%"; +static char sccsid[] = "@(#)comsat.c 5.19 (Berkeley) %G%"; #endif /* not lint */ #include @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)comsat.c 5.18 (Berkeley) %G%"; #include #include #include -#include +#include #include #include "pathnames.h" diff --git a/usr/src/libexec/ftpd/ftpd.c b/usr/src/libexec/ftpd/ftpd.c index 828677f21c..5e2c33e7ac 100644 --- a/usr/src/libexec/ftpd/ftpd.c +++ b/usr/src/libexec/ftpd/ftpd.c @@ -22,7 +22,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)ftpd.c 5.32 (Berkeley) %G%"; +static char sccsid[] = "@(#)ftpd.c 5.33 (Berkeley) %G%"; #endif /* not lint */ /* @@ -50,7 +50,7 @@ static char sccsid[] = "@(#)ftpd.c 5.32 (Berkeley) %G%"; #include #include #include -#include +#include #include #include #include "pathnames.h" diff --git a/usr/src/libexec/getNAME/getNAME.c b/usr/src/libexec/getNAME/getNAME.c index bb873d009b..1fe897e26c 100644 --- a/usr/src/libexec/getNAME/getNAME.c +++ b/usr/src/libexec/getNAME/getNAME.c @@ -5,7 +5,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)getNAME.c 5.2 (Berkeley) %G%"; +static char sccsid[] = "@(#)getNAME.c 5.3 (Berkeley) %G%"; #endif not lint /* @@ -14,8 +14,8 @@ static char sccsid[] = "@(#)getNAME.c 5.2 (Berkeley) %G%"; * -i for building intro entries * other apropos database */ -#include #include +#include int tocrc; int intro; diff --git a/usr/src/libexec/rlogind/rlogind.c b/usr/src/libexec/rlogind/rlogind.c index aad15b131e..bdaef4c900 100644 --- a/usr/src/libexec/rlogind/rlogind.c +++ b/usr/src/libexec/rlogind/rlogind.c @@ -22,7 +22,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)rlogind.c 5.41 (Berkeley) %G%"; +static char sccsid[] = "@(#)rlogind.c 5.42 (Berkeley) %G%"; #endif /* not lint */ #ifdef KERBEROS @@ -64,7 +64,7 @@ static char sccsid[] = "@(#)rlogind.c 5.41 (Berkeley) %G%"; #include #include #include -#include +#include #include #include #include "pathnames.h" diff --git a/usr/src/libexec/telnetd/defs.h b/usr/src/libexec/telnetd/defs.h index 4e3a0e3e05..8ef72ceeaf 100644 --- a/usr/src/libexec/telnetd/defs.h +++ b/usr/src/libexec/telnetd/defs.h @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)defs.h 5.4 (Berkeley) %G% + * @(#)defs.h 5.5 (Berkeley) %G% */ /* @@ -67,7 +67,7 @@ #define LOG_ODELAY 0 #endif #include -#include +#include #ifndef USE_TERMIO #include diff --git a/usr/src/old/tar/tar.c b/usr/src/old/tar/tar.c index 7e23904dc9..830c3d9528 100644 --- a/usr/src/old/tar/tar.c +++ b/usr/src/old/tar/tar.c @@ -11,7 +11,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)tar.c 5.14 (Berkeley) %G%"; +static char sccsid[] = "@(#)tar.c 5.15 (Berkeley) %G%"; #endif /* not lint */ /* @@ -27,7 +27,7 @@ static char sccsid[] = "@(#)tar.c 5.14 (Berkeley) %G%"; #include #include #include -#include +#include #include #include "pathnames.h" diff --git a/usr/src/usr.bin/f77/libI77/wsnmle.c b/usr/src/usr.bin/f77/libI77/wsnmle.c index f637a47a19..e09260d807 100644 --- a/usr/src/usr.bin/f77/libI77/wsnmle.c +++ b/usr/src/usr.bin/f77/libI77/wsnmle.c @@ -3,7 +3,7 @@ * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * - * @(#)wsnmle.c 5.2 %G% + * @(#)wsnmle.c 5.3 %G% */ /* @@ -13,7 +13,7 @@ #include "fio.h" #include "lio.h" #include "nmlio.h" -#include +#include int l_write(), t_putc(); LOCAL char nml_wrt[] = "namelist write"; diff --git a/usr/src/usr.bin/nm/nm.c b/usr/src/usr.bin/nm/nm.c index 21cf300114..f88e0c8500 100644 --- a/usr/src/usr.bin/nm/nm.c +++ b/usr/src/usr.bin/nm/nm.c @@ -25,7 +25,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)nm.c 5.3 (Berkeley) %G%"; +static char sccsid[] = "@(#)nm.c 5.4 (Berkeley) %G%"; #endif /* not lint */ #include @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)nm.c 5.3 (Berkeley) %G%"; #include #include #include -#include +#include extern int errno; diff --git a/usr/src/usr.bin/tsort/tsort.c b/usr/src/usr.bin/tsort/tsort.c index a49e1de27d..14ec4b56bb 100644 --- a/usr/src/usr.bin/tsort/tsort.c +++ b/usr/src/usr.bin/tsort/tsort.c @@ -25,14 +25,14 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)tsort.c 5.1 (Berkeley) %G%"; +static char sccsid[] = "@(#)tsort.c 5.2 (Berkeley) %G%"; #endif /* not lint */ #include #include #include #include -#include +#include /* * Topological sort. Input is a list of pairs of strings seperated by -- 2.20.1