Changeset 185 for trunk/src/sh_string.c

Timestamp:

Oct 29, 2008, 8:59:18 PM (16 years ago)

Author:

katerina

Message:

Bugfixes for log monitoring, samba logfile parser.

File:

• trunk/src/sh_string.c (modified) (1 diff)

trunk/src/sh_string.c

@@ -204 +204 @@
 #define SH_STRING_PARCEL 120
 
+static
+size_t sh_string_read_int(sh_string * s, FILE * fp, size_t maxlen, char *start);
+
 size_t sh_string_read(sh_string * s, FILE * fp, size_t maxlen)
 {
+  return sh_string_read_int(s, fp, maxlen, NULL);
+}
+
+size_t sh_string_read_cont(sh_string * s, FILE * fp, size_t maxlen, char *cont)
+{
+  return sh_string_read_int(s, fp, maxlen, cont);
+}
+
+size_t sh_string_read_int(sh_string * s, FILE * fp, size_t maxlen, char *start)
+{
+
+  /* case 0) start != NULL and first char not in 'start'
+   */
+  if (start)
+    {
+      int first = fgetc(fp);
+
+      if (first == EOF)
+        {
+          sh_string_truncate(s, 0);
+          if (ferror(fp))
+            return -1;
+          return 0;
+        }
+
+      if (NULL == strchr(start, first))
+        {
+          ungetc(first, fp);
+          return 0;
+        }
+      ungetc(first, fp);
+    }
 
   /* case 1) EOF or error