File 0001-Fix-up-some-weird-git-damage.patch of Package kerneloops

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-up-some-weird-git-damage.patch of Package kerneloops (Revision 5091790bee37b030c925660313c49e35)

Currently displaying revision 5091790bee37b030c925660313c49e35 , Show latest

From 85476aba715c47b61a5fc38dd7cb32c10223a2a4 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Tue, 24 Jun 2008 22:12:27 -0700
Subject: [PATCH] Fix up some weird git damage

diff --git a/dmesg.c b/dmesg.c
index cbea8c2..301584e 100644
--- a/dmesg.c
+++ b/dmesg.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 /*
  * Copyright 2007, Intel Corporation
  *
@@ -54,20 +55,25 @@ static void fill_linepointers(char *buffer, int remove_syslog)
 	linecount = 0;
 	c = buffer;
 	while (c) {
+		int len = 0;
+		char *c9;
+
+		c9 = strchr(c, '\n');
+		if (c9)
+			len = c9 - c;
+
 		/* in /var/log/messages, we need to strip the first part off, upto the 3rd ':' */
 		if (remove_syslog) {
 			char *c2;
-			char *c3;
 
-			c3 = strchr(c, '\n');
 			/* skip non-kernel lines */
-			c2 = strstr(c, "kernel:");
-			if (!c2 || (c2 > c3))
-				c2 = strstr(c, "kerneloops:");
-			if (!c2 || (c2 > c3)) {
-				c2 = strchr(c, '\n');
+			c2 = memmem(c, len, "kernel:", 7);
+			if (!c2)
+				c2 = memmem(c, len, "kerneloops:", 11);
+			if (!c2) {
+				c2 = c9;
 				if (c2) {
-					c = c2+1;
+					c = c2 + 1;
 					continue;
 				} else
 					break;
@@ -166,10 +172,14 @@ static void extract_oops(char *buffer, size_t buflen, int remove_syslog)
 				oopsstart = i;
 			if (strstr(c, "kernel BUG at"))
 				oopsstart = i;
+			if (strstr(c, "do_IRQ: stack overflow:"))
+				oopsstart = i;
 			if (strstr(c, "RTNL: assertion failed"))
 				oopsstart = i;
 			if (strstr(c, "Eeek! page_mapcount(page) went negative!"))
 				oopsstart = i;
+			if (strstr(c, "near stack overflow (cur:"))
+				oopsstart = i;
 			if (strstr(c, "double fault:"))
 				oopsstart = i;
 			if (strstr(c, "Badness at"))
diff --git a/kerneloops-applet.c b/kerneloops-applet.c
index a7b62a9..0497f9d 100644
--- a/kerneloops-applet.c
+++ b/kerneloops-applet.c
@@ -267,6 +267,8 @@ static void got_a_message(void)
 	notify_notification_show(notify, NULL);
 }
 
+char url_to_oops[4095];
+
 /*
  * open a notification window (expires in 5 seconds) to say thank you
  * to the user for his bug feedback.
@@ -274,15 +276,32 @@ static void got_a_message(void)
 static void sent_an_oops(void)
 {
 	char *summary = _("Kernel bug diagnostic information sent");
-	char *message =
+	char message[8200];
+	char *message_1 =
 		_("Diagnostic information from your Linux kernel has been "
 		  "sent to <a href=\"http://www.kerneloops.org\">www.kerneloops.org</a> "
 		  "for the Linux kernel developers to work on. \n"
 		  "Thank you for contributing to improve the quality of the Linux kernel.\n");
+
+	char *message_2 =
+		_("Diagnostic information from your Linux kernel has been "
+		  "sent to <a href=\"http://www.kerneloops.org\">www.kerneloops.org</a> "
+		  "for the Linux kernel developers to work on. \n"
+		  "Thank you for contributing to improve the quality of the Linux kernel.\n"
+		"You can watch your submitted oops <a href=\"%s\">here</a>\n");
 	NotifyActionCallback callback = notify_action;
 
 	close_notification();
 
+
+	if (strlen(url_to_oops)==0)
+		sprintf(message, message_1);
+	else
+		sprintf(message, message_2, url_to_oops);
+
+
+	url_to_oops[0] = 0;
+
 	notify = notify_notification_new(summary, message,
 				"/usr/share/kerneloops/icon.png", NULL);
 
@@ -302,6 +321,17 @@ static void sent_an_oops(void)
 	notify_notification_show(notify, NULL);
 }
 
+/*
+ * store the URL for the user
+ */
+static void got_an_url(DBusMessage *message)
+{
+	char *string = NULL;
+	dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &string, DBUS_TYPE_INVALID);
+	if (string)
+		strncpy(url_to_oops, string, 4095);
+
+}
 
 
 /*
@@ -362,6 +392,13 @@ static DBusHandlerResult dbus_gotmessage(DBusConnection __unused *connection,
 		gtk_status_icon_set_visible(statusicon, FALSE);
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
+	/* check if it's the daemon that asks for permission */
+	if (dbus_message_is_signal(message,
+			"org.kerneloops.submit.url", "url")) {
+
+		got_an_url(message);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
@@ -439,6 +476,7 @@ int main(int argc, char *argv[])
 	/* set the dbus message to listen for */
 	dbus_bus_add_match(bus, "type='signal',interface='org.kerneloops.submit.permission'", &error);
 	dbus_bus_add_match(bus, "type='signal',interface='org.kerneloops.submit.sent'", &error);
+	dbus_bus_add_match(bus, "type='signal',interface='org.kerneloops.submit.url'", &error);
 	dbus_connection_add_filter(bus, dbus_gotmessage, NULL, NULL);
 
 	/*
diff --git a/kerneloops.8 b/kerneloops.8
index 1ca8a27..4a8aa3c 100644
--- a/kerneloops.8
+++ b/kerneloops.8
@@ -35,6 +35,9 @@ for statistical analysis and presentation to the Linux kernel developers.
 .LP
  
 .TP
+\fB\-\-file filename\fR
+Parse the file denoted with filename as if it were /var/log/messages
+.TP
 \fB\-\-debug\fR
 Enable debug mode
 .TP
diff --git a/kerneloops.c b/kerneloops.c
index 23a4227..47ec535 100644
--- a/kerneloops.c
+++ b/kerneloops.c
@@ -106,11 +106,19 @@ void dbus_ask_permission(char * detail_file_name)
 	dbus_message_unref(message);
 }
 
-void dbus_say_thanks(void)
+void dbus_say_thanks(char *url)
 {
 	DBusMessage *message;
 	if (!bus)
 		return;
+	if (url && strlen(url)) {
+		message = dbus_message_new_signal("/org/kerneloops/submit/url",
+			"org.kerneloops.submit.url", "url");
+		dbus_message_append_args (message, DBUS_TYPE_STRING, &url, DBUS_TYPE_INVALID);
+		dbus_connection_send(bus, message, NULL);
+		dbus_message_unref(message);
+	}
+
 	message = dbus_message_new_signal("/org/kerneloops/submit/sent",
 			"org.kerneloops.submit.sent", "sent");
 	dbus_connection_send(bus, message, NULL);
@@ -169,9 +177,14 @@ int main(int argc, char**argv)
 	}
 
 
+
 	/* we scan dmesg before /var/log/messages; dmesg is a more accurate source normally */
 	scan_dmesg(NULL);
 	scan_filename("/var/log/messages", 1);
+
+	if (argc > 2 && strstr(argv[1], "--file"))
+		scan_filename(argv[2], 1);
+
 	if (testmode && argc > 2) {
 		int q;
 		for (q = 2; q < argc; q++) {
diff --git a/kerneloops.dbus b/kerneloops.dbus
index 7e05d8c..3aeef17 100644
--- a/kerneloops.dbus
+++ b/kerneloops.dbus
@@ -12,6 +12,7 @@
     <allow own="org.kerneloops.submit.ping"/>
     <allow own="org.kerneloops.submit.permission"/>
     <allow own="org.kerneloops.submit.sent"/>
+    <allow own="org.kerneloops.submit.url"/>
   </policy>
 
   <policy at_console="true">
@@ -20,6 +21,7 @@
     <allow receive_sender="org.kerneloops.submit"/>
     <allow receive_sender="org.kerneloops.submit.permission"/>
     <allow receive_sender="org.kerneloops.submit.sent"/>
+    <allow receive_sender="org.kerneloops.submit.url"/>
 
     <allow send_path="/org/kerneloops/submit"/>
 
diff --git a/kerneloops.h b/kerneloops.h
index 38bec4b..b2e0ea3 100644
--- a/kerneloops.h
+++ b/kerneloops.h
@@ -40,7 +40,7 @@ extern void read_config_file(char *filename);
 
 extern void ask_permission(void);
 extern void dbus_ask_permission(char * detail_file_name);
-extern void dbus_say_thanks(void);
+extern void dbus_say_thanks(char *url);
 
 extern int opted_in;
 extern int allow_distro_to_pass_on;
diff --git a/kerneloops.init b/kerneloops.init
index d7e8663..25f5465 100755
--- a/kerneloops.init
+++ b/kerneloops.init
@@ -34,7 +34,7 @@ lockfile=/var/lock/subsys/$prog
 
 start() {
  	echo -n $"Starting $prog:"
-	daemon $prog 
+	daemon $prog  $OPTS
 	retval=$?
 	echo
 	[ $retval -eq 0 ] && touch $lockfile
diff --git a/submit.c b/submit.c
index 93e8857..13e1b75 100644
--- a/submit.c
+++ b/submit.c
@@ -182,6 +182,25 @@ static void write_logfile(int count)
 	closelog();
 }
 
+char result_url[4096];
+
+size_t writefunction( void *ptr, size_t size, size_t nmemb, void __attribute((unused)) *stream)
+{
+	char *c, *c1, *c2;
+	c = malloc(size*nmemb + 1);
+	memset(c, 0, size*nmemb + 1);
+	memcpy(c, ptr, size*nmemb);
+	printf("received %s \n", c);
+	c1 = strstr(c, "201 ");
+	if (c1) {
+		c1+=4;
+		c2 = strchr(c1, '\n');
+		if (c2) *c2 = 0;
+		strncpy(result_url, c1, 4095);
+	}
+	return size * nmemb;
+}
+
 void submit_queue(void)
 {
 	int result;
@@ -189,6 +208,8 @@ void submit_queue(void)
 	struct oops *queue;
 	int count = 0;
 
+	memset(result_url, 0, 4096);
+
 	if (testmode) {
 		print_queue();
 		return;
@@ -204,8 +225,9 @@ void submit_queue(void)
 		struct curl_httppost *last = NULL;
 		struct oops *next;
 
-
 		handle = curl_easy_init();
+
+		printf("DEBUG SUBMIT URL is %s \n", submit_url);
 		curl_easy_setopt(handle, CURLOPT_URL, submit_url);
 
 		/* set up the POST data */
@@ -220,6 +242,7 @@ void submit_queue(void)
 		}
 
 		curl_easy_setopt(handle, CURLOPT_HTTPPOST, post);
+		curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, writefunction);
 		result = curl_easy_perform(handle);
 
 		curl_formfree(post);
@@ -235,7 +258,7 @@ void submit_queue(void)
 		write_logfile(count);
 
 	if (count)
-		dbus_say_thanks();
+		dbus_say_thanks(result_url);
 	/*
 	 * If we've reached the maximum count, we'll exit the program,
 	 * the program won't do any useful work anymore going forward.
-- 
1.5.6

Places

File 0001-Fix-up-some-weird-git-damage.patch of Package kerneloops (Revision 5091790bee37b030c925660313c49e35)

Places