From a64569fb24cf8abce85eec72a80b5898aab06a4b Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 6 Dec 2003 22:14:16 +0000
Subject: Reuse some of the Linux code instead of duplicating it.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1402 df743ca5-7f9a-e211-a948-0013205c9059
---
 .../files/patch-src_netstatus-sysdeps.c            | 64 ++++++++--------------
 1 file changed, 24 insertions(+), 40 deletions(-)

(limited to 'net/gnome-netstatus')

diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
index 5427e0687..9a29aefb1 100644
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
@@ -1,5 +1,5 @@
 --- src/netstatus-sysdeps.c.orig	Mon Jun  9 13:18:04 2003
-+++ src/netstatus-sysdeps.c	Sat Dec  6 01:19:49 2003
++++ src/netstatus-sysdeps.c	Sat Dec  6 17:11:01 2003
 @@ -27,10 +27,13 @@
  
  #include <stdio.h>
@@ -14,7 +14,24 @@
  static inline char *
  parse_iface_name (const char *buf)
  {
-@@ -206,3 +209,158 @@
+@@ -90,6 +93,7 @@
+ 	}
+     }
+ }
++#endif
+ 
+ static inline int
+ parse_stats (char  *buf,
+@@ -124,6 +128,8 @@
+   return TRUE;
+ }
+ 
++#if !defined(__FreeBSD__)
++
+ static inline FILE *
+ get_proc_net_dev_fh (void)
+ {
+@@ -206,3 +212,125 @@
  
    return error_message;
  }
@@ -34,8 +51,8 @@
 +   *prx_idx = *ptx_idx = -1;
 +   *brx_idx = *btx_idx = -1;
 +
-+   p = strtok (buf, " ");
-+   for (i = 0; p; i++, p = strtok (NULL, " "))
++   p = strtok (buf, " \n\t");
++   for (i = 0; p; i++, p = strtok (NULL, " \t\n"))
 +     {
 +        if (!strcmp (p, "Ipkts"))
 +	  {
@@ -56,39 +73,6 @@
 +     }
 +}
 +
-+static inline int
-+parse_stats (char  *buf,
-+	     int    prx_idx,
-+	     int    ptx_idx,
-+	     long  *in_packets,
-+	     long  *out_packets,
-+	     int    brx_idx,
-+	     int    btx_idx,
-+	     long  *in_bytes,
-+	     long  *out_bytes)
-+{
-+   char *p;
-+   int   i;
-+
-+   p = strtok (buf, " ");
-+   for (i = 0; p; i++, p = strtok (NULL, " "))
-+     {
-+        if (i == prx_idx)
-+	   *in_packets = g_ascii_strtoull (p, NULL, 10);
-+	if (i == ptx_idx)
-+	   *out_packets = g_ascii_strtoull (p, NULL, 10);
-+	if (i == brx_idx)
-+	   *in_bytes = g_ascii_strtoull (p, NULL, 10);
-+	if (i == btx_idx)
-+	   *out_bytes = g_ascii_strtoull (p, NULL, 10);
-+     }
-+ 
-+   if (i <= prx_idx || i <= ptx_idx || i <= brx_idx || i <=btx_idx)
-+      return FALSE;
-+
-+   return TRUE;
-+}
-+
 +char *
 +netstatus_sysdeps_read_iface_statistics (const char *iface,
 +					 long       *in_packets,
@@ -162,9 +146,9 @@
 +   }
 +   else {
 +      if (error_message)
-+         g_free (error_message);
-+      error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", iface,
-+	      	       err->message);
++        g_free (error_message);
++      error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", 
++	iface, err->message);
 +      g_error_free (err);
 +   }
 +
-- 
cgit v1.2.3