diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 17:28:35 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 17:28:35 +1100 |
commit | 4e8c2490bbb87345abc44995b448f5c59a939788 (patch) | |
tree | 08a1f0628f3af9068a5c226b536f3c18cf732bfa | |
parent | b10b49768234f02343c7ae6a95ebc33279d04ea2 (diff) |
- (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | openbsd-compat/strsep.c | 10 |
2 files changed, 3 insertions, 10 deletions
@@ -36,6 +36,7 @@ | |||
36 | - (dtucker) [openbsd-compat/inet_ntoa.c] Update from OpenBSD 1.4 -> 1.6. | 36 | - (dtucker) [openbsd-compat/inet_ntoa.c] Update from OpenBSD 1.4 -> 1.6. |
37 | - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7. | 37 | - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7. |
38 | - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6. | 38 | - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6. |
39 | - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6. | ||
39 | 40 | ||
40 | 20051105 | 41 | 20051105 |
41 | - (djm) OpenBSD CVS Sync | 42 | - (djm) OpenBSD CVS Sync |
@@ -3278,4 +3279,4 @@ | |||
3278 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3279 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3279 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3280 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3280 | 3281 | ||
3281 | $Id: ChangeLog,v 1.3978 2005/11/10 06:27:25 dtucker Exp $ | 3282 | $Id: ChangeLog,v 1.3979 2005/11/10 06:28:35 dtucker Exp $ |
diff --git a/openbsd-compat/strsep.c b/openbsd-compat/strsep.c index 9e81980c7..b36eb8fda 100644 --- a/openbsd-compat/strsep.c +++ b/openbsd-compat/strsep.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $ */ | 1 | /* $OpenBSD: strsep.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */ |
2 | 2 | ||
3 | /*- | 3 | /*- |
4 | * Copyright (c) 1990, 1993 | 4 | * Copyright (c) 1990, 1993 |
@@ -38,14 +38,6 @@ | |||
38 | #include <string.h> | 38 | #include <string.h> |
39 | #include <stdio.h> | 39 | #include <stdio.h> |
40 | 40 | ||
41 | #if defined(LIBC_SCCS) && !defined(lint) | ||
42 | #if 0 | ||
43 | static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93"; | ||
44 | #else | ||
45 | static char *rcsid = "$OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $"; | ||
46 | #endif | ||
47 | #endif /* LIBC_SCCS and not lint */ | ||
48 | |||
49 | /* | 41 | /* |
50 | * Get next token from string *stringp, where tokens are possibly-empty | 42 | * Get next token from string *stringp, where tokens are possibly-empty |
51 | * strings separated by characters from delim. | 43 | * strings separated by characters from delim. |