wrap new GSSAPI code (from Simon) in #ifdef GSSAPI

[gssapi-openssh.git] / openssh / openbsd-compat / strsep.c

diff --git a/openssh/openbsd-compat/strsep.c b/openssh/openbsd-compat/strsep.c
index b13671343a7495f481fdcb88d11246da3e3d8b82..c03649cffba2d10bd88f0dc0e8e7e646bea3a3a8 100644 (file)
--- a/openssh/openbsd-compat/strsep.c
+++ b/openssh/openbsd-compat/strsep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $      */
+/*     $OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $      */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -12,7 +12,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include "config.h"
 
 #if !defined(HAVE_STRSEP)
 
@@ -40,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)strsep.c   8.1 (Berkeley) 6/4/93";
 #else
-static char *rcsid = "$OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -58,9 +62,9 @@ static char *rcsid = "$OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $
 char *
 strsep(char **stringp, const char *delim)
 {
-       char *s;
-       const char *spanp;
-       int c, sc;
+       register char *s;
+       register const char *spanp;
+       register int c, sc;
        char *tok;
 
        if ((s = *stringp) == NULL)