fixes for power kernel 47 breaking temperature and voltage readings

[monky] / src / tailhead.c

diff --git a/src/tailhead.c b/src/tailhead.c
index 43478ff..f0488cb 100644 (file)
--- a/src/tailhead.c
+++ b/src/tailhead.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -28,10 +28,14 @@
  *
  */
 
+#define _GNU_SOURCE
+#include "common.h"
 #include "text_object.h"
 #include "logging.h"
 #include <sys/stat.h>
+#include <ctype.h>
 #include <fcntl.h>
+#include <string.h>
 #include <unistd.h>
 
 #define MAX_HEADTAIL_LINES 30
@@ -175,3 +179,60 @@ void print_tailhead(const char* type, struct text_object *obj, char *p, int p_ma
        }
        return;
 }
+
+/* FIXME: use something more general (see also tail.c, head.c */
+#define BUFSZ 0x1000
+
+void print_lines(struct text_object *obj, char *p, int p_max_size)
+{
+       static int rep = 0;
+       FILE *fp = open_file(obj->data.s, &rep);
+       char buf[BUFSZ];
+       int j, lines;
+
+       if (!fp) {
+               snprintf(p, p_max_size, "File Unreadable");
+               return;
+       }
+
+       lines = 0;
+       while(fgets(buf, BUFSZ, fp) != NULL){
+               for(j = 0; buf[j] != 0; j++) {
+                       if(buf[j] == '\n') {
+                               lines++;
+                       }
+               }
+       }
+       snprintf(p, p_max_size, "%d", lines);
+       fclose(fp);
+}
+
+void print_words(struct text_object *obj, char *p, int p_max_size)
+{
+       static int rep = 0;
+       FILE *fp = open_file(obj->data.s, &rep);
+       char buf[BUFSZ];
+       int j, words;
+       char inword = 0;
+
+       if(!fp) {
+               snprintf(p, p_max_size, "File Unreadable");
+               return;
+       }
+
+       words = 0;
+       while(fgets(buf, BUFSZ, fp) != NULL){
+               for(j = 0; buf[j] != 0; j++) {
+                       if(!isspace(buf[j])) {
+                               if(!inword) {
+                                       words++;
+                                       inword = 1;
+                               }
+                       } else {
+                               inword = 0;
+                       }
+               }
+       }
+       snprintf(p, p_max_size, "%d", words);
+       fclose(fp);
+}