aboutsummaryrefslogtreecommitdiff
path: root/x11/bbrun/files/patch-bbrun.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11/bbrun/files/patch-bbrun.c')
-rw-r--r--x11/bbrun/files/patch-bbrun.c37
1 files changed, 33 insertions, 4 deletions
diff --git a/x11/bbrun/files/patch-bbrun.c b/x11/bbrun/files/patch-bbrun.c
index 376c2989112b..87760e8469ae 100644
--- a/x11/bbrun/files/patch-bbrun.c
+++ b/x11/bbrun/files/patch-bbrun.c
@@ -1,5 +1,5 @@
---- bbrun.c.orig Sat Jul 20 13:24:53 2002
-+++ bbrun.c Sat Jul 20 20:31:49 2002
+--- bbrun.c.orig 2004-02-13 01:24:59.000000000 +0100
++++ bbrun.c 2012-06-01 20:42:51.000000000 +0200
@@ -3,7 +3,11 @@
#include <string.h>
#include <getopt.h>
@@ -17,7 +17,36 @@
#define ADVANCED_WINDOW_COLS 10
-#define u32 __u32
-+#define u32 u_int32_t
++#define u32 uintptr_t
#define __DEBUG__ 0
- #define VERSION "1.4"
+ #define VERSION "1.6"
+@@ -38,8 +42,8 @@ char historyFilename[MAXPATHLEN + 1];
+
+ // TOC = Table Of Contents, it is a dynamically allocated array of pointers to dynamically
+ // allocated history items.
+-u32 *histTOC; // Always keep track of the beginning, this one is NEVER incremented.
+-u32 *histTOC2; // We increment this one for each item
++u32 *histTOC = NULL; // Always keep track of the beginning, this one is NEVER incremented.
++u32 *histTOC2 = NULL; // We increment this one for each item
+
+ void parseArguments(int, char **);
+ void execDialogInformation();
+@@ -197,7 +201,7 @@ void readHistory(void) {
+
+ item = malloc(strlen(buf));
+ strncpy(item, buf, strlen(buf));
+- item[strlen(buf)- 1] = 0x0; // Remove the newline char
++ item[strlen(buf)- 1] = '\0'; // Remove the newline char
+
+ *histTOC2 = (u32) item;
+ } else {
+@@ -322,7 +326,7 @@ void writeHistory()
+ // Event handler for Ok and Cancel buttons
+ void callback (GtkWidget * widget, gpointer data)
+ {
+- if ((char *) data == "ok")
++ if ((strcmp(data, "ok")) == 0)
+ execDialogInformation();
+
+ gtk_main_quit();