diff options
| author | deraadt <> | 1996-05-01 12:57:54 +0000 |
|---|---|---|
| committer | deraadt <> | 1996-05-01 12:57:54 +0000 |
| commit | 2686d34ae2184cc85034a4afb5eacf55b9732934 (patch) | |
| tree | 70f1f93a5298feae7003283e3209b83aec055f19 | |
| parent | 1bff96637c43ff8d699b4b2095e0b6ad787e7e76 (diff) | |
| download | openbsd-2686d34ae2184cc85034a4afb5eacf55b9732934.tar.gz openbsd-2686d34ae2184cc85034a4afb5eacf55b9732934.tar.bz2 openbsd-2686d34ae2184cc85034a4afb5eacf55b9732934.zip | |
switch on _KERNEL to load proper include file
| -rw-r--r-- | src/lib/libc/string/bcmp.c | 8 | ||||
| -rw-r--r-- | src/lib/libc/string/bzero.c | 6 | ||||
| -rw-r--r-- | src/lib/libc/string/ffs.c | 6 | ||||
| -rw-r--r-- | src/lib/libc/string/strcat.c | 8 | ||||
| -rw-r--r-- | src/lib/libc/string/strcmp.c | 6 | ||||
| -rw-r--r-- | src/lib/libc/string/strcpy.c | 8 | ||||
| -rw-r--r-- | src/lib/libc/string/strlen.c | 6 | ||||
| -rw-r--r-- | src/lib/libc/string/strncmp.c | 6 |
8 files changed, 43 insertions, 11 deletions
diff --git a/src/lib/libc/string/bcmp.c b/src/lib/libc/string/bcmp.c index edd83c2686..782aa1a30b 100644 --- a/src/lib/libc/string/bcmp.c +++ b/src/lib/libc/string/bcmp.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bcmp.c,v 1.2 1996/03/09 02:42:54 niklas Exp $ */ | 1 | /* $OpenBSD: bcmp.c,v 1.3 1996/05/01 12:57:37 deraadt Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1987 Regents of the University of California. | 4 | * Copyright (c) 1987 Regents of the University of California. |
| @@ -35,10 +35,14 @@ | |||
| 35 | 35 | ||
| 36 | #if defined(LIBC_SCCS) && !defined(lint) | 36 | #if defined(LIBC_SCCS) && !defined(lint) |
| 37 | /*static char *sccsid = "from: @(#)bcmp.c 5.6 (Berkeley) 2/24/91";*/ | 37 | /*static char *sccsid = "from: @(#)bcmp.c 5.6 (Berkeley) 2/24/91";*/ |
| 38 | static char *rcsid = "$Id: bcmp.c,v 1.2 1996/03/09 02:42:54 niklas Exp $"; | 38 | static char *rcsid = "$Id: bcmp.c,v 1.3 1996/05/01 12:57:37 deraadt Exp $"; |
| 39 | #endif /* LIBC_SCCS and not lint */ | 39 | #endif /* LIBC_SCCS and not lint */ |
| 40 | 40 | ||
| 41 | #ifndef _KERNEL | ||
| 41 | #include <string.h> | 42 | #include <string.h> |
| 43 | #else | ||
| 44 | #include <lib/libkern/libkern.h> | ||
| 45 | #endif | ||
| 42 | 46 | ||
| 43 | /* | 47 | /* |
| 44 | * bcmp -- vax cmpc3 instruction | 48 | * bcmp -- vax cmpc3 instruction |
diff --git a/src/lib/libc/string/bzero.c b/src/lib/libc/string/bzero.c index 4865e396ef..7d89de23f3 100644 --- a/src/lib/libc/string/bzero.c +++ b/src/lib/libc/string/bzero.c | |||
| @@ -33,10 +33,14 @@ | |||
| 33 | 33 | ||
| 34 | #if defined(LIBC_SCCS) && !defined(lint) | 34 | #if defined(LIBC_SCCS) && !defined(lint) |
| 35 | /*static char *sccsid = "from: @(#)bzero.c 5.7 (Berkeley) 2/24/91";*/ | 35 | /*static char *sccsid = "from: @(#)bzero.c 5.7 (Berkeley) 2/24/91";*/ |
| 36 | static char *rcsid = "$Id: bzero.c,v 1.1.1.1 1995/10/18 08:42:21 deraadt Exp $"; | 36 | static char *rcsid = "$Id: bzero.c,v 1.2 1996/05/01 12:57:40 deraadt Exp $"; |
| 37 | #endif /* LIBC_SCCS and not lint */ | 37 | #endif /* LIBC_SCCS and not lint */ |
| 38 | 38 | ||
| 39 | #ifndef _KERNEL | ||
| 39 | #include <string.h> | 40 | #include <string.h> |
| 41 | #else | ||
| 42 | #include <lib/libkern/libkern.h> | ||
| 43 | #endif | ||
| 40 | 44 | ||
| 41 | /* | 45 | /* |
| 42 | * bzero -- vax movc5 instruction | 46 | * bzero -- vax movc5 instruction |
diff --git a/src/lib/libc/string/ffs.c b/src/lib/libc/string/ffs.c index 42bc87ddea..6a8ff26593 100644 --- a/src/lib/libc/string/ffs.c +++ b/src/lib/libc/string/ffs.c | |||
| @@ -33,10 +33,14 @@ | |||
| 33 | 33 | ||
| 34 | #if defined(LIBC_SCCS) && !defined(lint) | 34 | #if defined(LIBC_SCCS) && !defined(lint) |
| 35 | /*static char *sccsid = "from: @(#)ffs.c 5.4 (Berkeley) 5/17/90";*/ | 35 | /*static char *sccsid = "from: @(#)ffs.c 5.4 (Berkeley) 5/17/90";*/ |
| 36 | static char *rcsid = "$Id: ffs.c,v 1.1.1.1 1995/10/18 08:42:21 deraadt Exp $"; | 36 | static char *rcsid = "$Id: ffs.c,v 1.2 1996/05/01 12:57:42 deraadt Exp $"; |
| 37 | #endif /* LIBC_SCCS and not lint */ | 37 | #endif /* LIBC_SCCS and not lint */ |
| 38 | 38 | ||
| 39 | #ifndef _KERNEL | ||
| 39 | #include <string.h> | 40 | #include <string.h> |
| 41 | #else | ||
| 42 | #include <lib/libkern/libkern.h> | ||
| 43 | #endif | ||
| 40 | 44 | ||
| 41 | /* | 45 | /* |
| 42 | * ffs -- vax ffs instruction | 46 | * ffs -- vax ffs instruction |
diff --git a/src/lib/libc/string/strcat.c b/src/lib/libc/string/strcat.c index 10e0aefe12..2958d5e78c 100644 --- a/src/lib/libc/string/strcat.c +++ b/src/lib/libc/string/strcat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: strcat.c,v 1.2 1996/03/09 02:42:56 niklas Exp $ */ | 1 | /* $OpenBSD: strcat.c,v 1.3 1996/05/01 12:57:45 deraadt Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1988 Regents of the University of California. | 4 | * Copyright (c) 1988 Regents of the University of California. |
| @@ -35,10 +35,14 @@ | |||
| 35 | 35 | ||
| 36 | #if defined(LIBC_SCCS) && !defined(lint) | 36 | #if defined(LIBC_SCCS) && !defined(lint) |
| 37 | /*static char *sccsid = "from: @(#)strcat.c 5.6 (Berkeley) 2/24/91";*/ | 37 | /*static char *sccsid = "from: @(#)strcat.c 5.6 (Berkeley) 2/24/91";*/ |
| 38 | static char *rcsid = "$Id: strcat.c,v 1.2 1996/03/09 02:42:56 niklas Exp $"; | 38 | static char *rcsid = "$Id: strcat.c,v 1.3 1996/05/01 12:57:45 deraadt Exp $"; |
| 39 | #endif /* LIBC_SCCS and not lint */ | 39 | #endif /* LIBC_SCCS and not lint */ |
| 40 | 40 | ||
| 41 | #ifndef _KERNEL | ||
| 41 | #include <string.h> | 42 | #include <string.h> |
| 43 | #else | ||
| 44 | #include <lib/libkern/libkern.h> | ||
| 45 | #endif | ||
| 42 | 46 | ||
| 43 | char * | 47 | char * |
| 44 | strcat(s, append) | 48 | strcat(s, append) |
diff --git a/src/lib/libc/string/strcmp.c b/src/lib/libc/string/strcmp.c index ae19e2e26e..690da8f3fb 100644 --- a/src/lib/libc/string/strcmp.c +++ b/src/lib/libc/string/strcmp.c | |||
| @@ -36,10 +36,14 @@ | |||
| 36 | 36 | ||
| 37 | #if defined(LIBC_SCCS) && !defined(lint) | 37 | #if defined(LIBC_SCCS) && !defined(lint) |
| 38 | /*static char *sccsid = "from: @(#)strcmp.c 5.5 (Berkeley) 1/26/91";*/ | 38 | /*static char *sccsid = "from: @(#)strcmp.c 5.5 (Berkeley) 1/26/91";*/ |
| 39 | static char *rcsid = "$Id: strcmp.c,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $"; | 39 | static char *rcsid = "$Id: strcmp.c,v 1.2 1996/05/01 12:57:47 deraadt Exp $"; |
| 40 | #endif /* LIBC_SCCS and not lint */ | 40 | #endif /* LIBC_SCCS and not lint */ |
| 41 | 41 | ||
| 42 | #ifndef _KERNEL | ||
| 42 | #include <string.h> | 43 | #include <string.h> |
| 44 | #else | ||
| 45 | #include <lib/libkern/libkern.h> | ||
| 46 | #endif | ||
| 43 | 47 | ||
| 44 | /* | 48 | /* |
| 45 | * Compare strings. | 49 | * Compare strings. |
diff --git a/src/lib/libc/string/strcpy.c b/src/lib/libc/string/strcpy.c index 86956cdb95..04bf0fa67f 100644 --- a/src/lib/libc/string/strcpy.c +++ b/src/lib/libc/string/strcpy.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: strcpy.c,v 1.2 1996/03/09 02:42:57 niklas Exp $ */ | 1 | /* $OpenBSD: strcpy.c,v 1.3 1996/05/01 12:57:49 deraadt Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1988 Regents of the University of California. | 4 | * Copyright (c) 1988 Regents of the University of California. |
| @@ -35,10 +35,14 @@ | |||
| 35 | 35 | ||
| 36 | #if defined(LIBC_SCCS) && !defined(lint) | 36 | #if defined(LIBC_SCCS) && !defined(lint) |
| 37 | /*static char *sccsid = "from: @(#)strcpy.c 5.7 (Berkeley) 2/24/91";*/ | 37 | /*static char *sccsid = "from: @(#)strcpy.c 5.7 (Berkeley) 2/24/91";*/ |
| 38 | static char *rcsid = "$Id: strcpy.c,v 1.2 1996/03/09 02:42:57 niklas Exp $"; | 38 | static char *rcsid = "$Id: strcpy.c,v 1.3 1996/05/01 12:57:49 deraadt Exp $"; |
| 39 | #endif /* LIBC_SCCS and not lint */ | 39 | #endif /* LIBC_SCCS and not lint */ |
| 40 | 40 | ||
| 41 | #ifndef _KERNEL | ||
| 41 | #include <string.h> | 42 | #include <string.h> |
| 43 | #else | ||
| 44 | #include <lib/libkern/libkern.h> | ||
| 45 | #endif | ||
| 42 | 46 | ||
| 43 | char * | 47 | char * |
| 44 | strcpy(to, from) | 48 | strcpy(to, from) |
diff --git a/src/lib/libc/string/strlen.c b/src/lib/libc/string/strlen.c index d23aadafc0..f5d526d9c4 100644 --- a/src/lib/libc/string/strlen.c +++ b/src/lib/libc/string/strlen.c | |||
| @@ -33,10 +33,14 @@ | |||
| 33 | 33 | ||
| 34 | #if defined(LIBC_SCCS) && !defined(lint) | 34 | #if defined(LIBC_SCCS) && !defined(lint) |
| 35 | /*static char *sccsid = "from: @(#)strlen.c 5.5 (Berkeley) 1/26/91";*/ | 35 | /*static char *sccsid = "from: @(#)strlen.c 5.5 (Berkeley) 1/26/91";*/ |
| 36 | static char *rcsid = "$Id: strlen.c,v 1.1.1.1 1995/10/18 08:42:22 deraadt Exp $"; | 36 | static char *rcsid = "$Id: strlen.c,v 1.2 1996/05/01 12:57:52 deraadt Exp $"; |
| 37 | #endif /* LIBC_SCCS and not lint */ | 37 | #endif /* LIBC_SCCS and not lint */ |
| 38 | 38 | ||
| 39 | #ifndef _KERNEL | ||
| 39 | #include <string.h> | 40 | #include <string.h> |
| 41 | #else | ||
| 42 | #include <lib/libkern/libkern.h> | ||
| 43 | #endif | ||
| 40 | 44 | ||
| 41 | size_t | 45 | size_t |
| 42 | strlen(str) | 46 | strlen(str) |
diff --git a/src/lib/libc/string/strncmp.c b/src/lib/libc/string/strncmp.c index 0638d4dcf2..43217391d0 100644 --- a/src/lib/libc/string/strncmp.c +++ b/src/lib/libc/string/strncmp.c | |||
| @@ -33,10 +33,14 @@ | |||
| 33 | 33 | ||
| 34 | #if defined(LIBC_SCCS) && !defined(lint) | 34 | #if defined(LIBC_SCCS) && !defined(lint) |
| 35 | /*static char *sccsid = "from: @(#)strncmp.c 5.6 (Berkeley) 1/26/91";*/ | 35 | /*static char *sccsid = "from: @(#)strncmp.c 5.6 (Berkeley) 1/26/91";*/ |
| 36 | static char *rcsid = "$Id: strncmp.c,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $"; | 36 | static char *rcsid = "$Id: strncmp.c,v 1.2 1996/05/01 12:57:54 deraadt Exp $"; |
| 37 | #endif /* LIBC_SCCS and not lint */ | 37 | #endif /* LIBC_SCCS and not lint */ |
| 38 | 38 | ||
| 39 | #ifndef _KERNEL | ||
| 39 | #include <string.h> | 40 | #include <string.h> |
| 41 | #else | ||
| 42 | #include <lib/libkern/libkern.h> | ||
| 43 | #endif | ||
| 40 | 44 | ||
| 41 | int | 45 | int |
| 42 | strncmp(s1, s2, n) | 46 | strncmp(s1, s2, n) |