25c9022b46
GNOME Nettool is a set of front-ends to various networking command-line tools, like ping, netstat, ifconfig, whois, traceroute, finger.
51 lines
1.1 KiB
Plaintext
51 lines
1.1 KiB
Plaintext
$OpenBSD: patch-src_nettool_c,v 1.1.1.1 2010/04/10 16:51:07 ajacoutot Exp $
|
|
--- src/nettool.c.orig Tue Sep 22 15:30:34 2009
|
|
+++ src/nettool.c Tue Mar 30 15:38:15 2010
|
|
@@ -24,6 +24,7 @@
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
+#include <netinet/in.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#include <sys/wait.h>
|
|
@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
|
|
len, NULL);
|
|
}
|
|
|
|
+ g_free (text);
|
|
+
|
|
+ return TRUE;
|
|
+
|
|
} else if (status == G_IO_STATUS_AGAIN) {
|
|
char buf[1];
|
|
|
|
@@ -385,6 +390,8 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
|
|
}
|
|
g_string_append_c (netinfo->command_output, buf[0]);
|
|
}
|
|
+ g_free (text);
|
|
+ return TRUE;
|
|
} else if (status == G_IO_STATUS_EOF) {
|
|
|
|
} else if (status == G_IO_STATUS_ERROR) {
|
|
@@ -402,15 +409,15 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
|
|
|
|
} else {
|
|
g_warning ("Error: %s\n", err->message);
|
|
- g_free (text);
|
|
g_free (err);
|
|
}
|
|
|
|
+ g_free (text);
|
|
+ return TRUE;
|
|
+
|
|
}
|
|
|
|
g_free (text);
|
|
-
|
|
- return TRUE;
|
|
}
|
|
|
|
/* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so
|