1 files changed, 66 insertions, 1 deletions

diff --git a/misc.c b/misc.c
index 8cb411ccc..2e366f81b 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.25 2004/08/11 21:43:05 avsm Exp $");
+RCSID("$OpenBSD: misc.c,v 1.28 2005/03/01 10:09:52 djm Exp $");
 
 #include "misc.h"
 #include "log.h"
@@ -275,6 +275,48 @@ convtime(const char *s)
         return total;
 }
 
+/*
+ * Search for next delimiter between hostnames/addresses and ports.
+ * Argument may be modified (for termination).
+ * Returns *cp if parsing succeeds.
+ * *cp is set to the start of the next delimiter, if one was found.
+ * If this is the last field, *cp is set to NULL.
+ */
+char *
+hpdelim(char **cp)
+{
+        char *s, *old;
+
+        if (cp == NULL || *cp == NULL)
+                return NULL;
+
+        old = s = *cp;
+        if (*s == '[') {
+                if ((s = strchr(s, ']')) == NULL)
+                        return NULL;
+                else
+                        s++;
+        } else if ((s = strpbrk(s, ":/")) == NULL)
+                s = *cp + strlen(*cp); /* skip to end (see first case below) */
+
+        switch (*s) {
+        case '\0':
+                *cp = NULL;     /* no more fields*/
+                break;
+        
+        case ':':
+        case '/':
+                *s = '\0';      /* terminate */
+                *cp = s + 1;
+                break;
+        
+        default:
+                return NULL;
+        }
+
+        return old;
+}
+
 char *
 cleanhostname(char *host)
 {
@@ -332,3 +374,26 @@ addargs(arglist *args, char *fmt, ...)
         args->list[args->num++] = xstrdup(buf);
         args->list[args->num] = NULL;
 }
+
+/*
+ * Read an entire line from a public key file into a static buffer, discarding
+ * lines that exceed the buffer size.  Returns 0 on success, -1 on failure.
+ */
+int
+read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
+   u_long *lineno)
+{
+        while (fgets(buf, bufsz, f) != NULL) {
+                (*lineno)++;
+                if (buf[strlen(buf) - 1] == '\n' || feof(f)) {
+                        return 0;
+                } else {
+                        debug("%s: %s line %lu exceeds size limit", __func__,
+                            filename, *lineno);
+                        /* discard remainder of line */
+                        while(fgetc(f) != '\n' && !feof(f))
+                                ;       /* nothing */
+                }
+        }
+        return -1;
+}