updated version #, imlib2 fixed, i forgot when the window size changes we totally...

[monky] / src / proc.c

diff --git a/src/proc.c b/src/proc.c
index 50ee571..63855c2 100644 (file)
--- a/src/proc.c
+++ b/src/proc.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,8 +28,8 @@
  *
  */
 
-#include <logging.h>
 #include "conky.h"
+#include "logging.h"
 #include "proc.h"
 #include <unistd.h>
 #include <ctype.h>
@@ -115,18 +115,22 @@ void print_pid_cmdline(struct text_object *obj, char *p, int p_max_size)
        char* buf;
        int i, bytes_read;
 
-       asprintf(&buf, PROCDIR "/%s/cmdline", obj->data.s);
-       strcpy(obj->data.s, buf);
-       free(buf);
-       buf = readfile(obj->data.s, &bytes_read, 1);
-       if(buf != NULL) {
-               for(i = 0; i < bytes_read-1; i++) {
-                       if(buf[i] == 0) {
-                               buf[i] = ' ';
+       if(*(obj->data.s) != 0) {
+               asprintf(&buf, PROCDIR "/%s/cmdline", obj->data.s);
+               strcpy(obj->data.s, buf);
+               free(buf);
+               buf = readfile(obj->data.s, &bytes_read, 1);
+               if(buf != NULL) {
+                       for(i = 0; i < bytes_read-1; i++) {
+                               if(buf[i] == 0) {
+                                       buf[i] = ' ';
+                               }
                        }
+                       snprintf(p, p_max_size, "%s", buf);
+                       free(buf);
                }
-               snprintf(p, p_max_size, "%s", buf);
-               free(buf);
+       } else {
+               NORM_ERR("$pid_cmdline didn't receive a argument");
        }
 }
 
@@ -815,3 +819,53 @@ void print_pid_vmlib(struct text_object *obj, char *p, int p_max_size) {
 void print_pid_vmpte(struct text_object *obj, char *p, int p_max_size) {
        internal_print_pid_vm(obj->data.s, p, p_max_size, "VmPTE:\t", "Can't find the process page table entries size in '%s'");
 }
+
+#define READ_ENTRY "read_bytes: "
+#define READNOTFOUND   "Can't find the amount of bytes read in '%s'"
+void print_pid_read(struct text_object *obj, char *p, int p_max_size) {
+       char *begin, *end, *buf = NULL;
+       int bytes_read;
+
+       asprintf(&buf, PROCDIR "/%s/io", obj->data.s);
+       strcpy(obj->data.s, buf);
+       free(buf);
+       buf = readfile(obj->data.s, &bytes_read, 1);
+       if(buf != NULL) {
+               begin = strstr(buf, READ_ENTRY);
+               if(begin != NULL) {
+                       end = strchr(begin, '\n');
+                       if(end != NULL) {
+                               *(end) = 0;
+                       }
+                       snprintf(p, p_max_size, "%s", begin);
+               } else {
+                       NORM_ERR(READNOTFOUND, obj->data.s);
+               }
+               free(buf);
+       }
+}
+
+#define WRITE_ENTRY "write_bytes: "
+#define WRITENOTFOUND  "Can't find the amount of bytes written in '%s'"
+void print_pid_write(struct text_object *obj, char *p, int p_max_size) {
+       char *begin, *end, *buf = NULL;
+       int bytes_read;
+
+       asprintf(&buf, PROCDIR "/%s/io", obj->data.s);
+       strcpy(obj->data.s, buf);
+       free(buf);
+       buf = readfile(obj->data.s, &bytes_read, 1);
+       if(buf != NULL) {
+               begin = strstr(buf, WRITE_ENTRY);
+               if(begin != NULL) {
+                       end = strchr(begin, '\n');
+                       if(end != NULL) {
+                               *(end) = 0;
+                       }
+                       snprintf(p, p_max_size, "%s", begin);
+               } else {
+                       NORM_ERR(WRITENOTFOUND, obj->data.s);
+               }
+               free(buf);
+       }
+}