From 69457273dcdb889a9fa74b8ec5b50848225f9ae8 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Tue, 14 Jul 2009 06:48:00 +0200 Subject: fix typo --- uzbl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 9e833d6..8626935 100644 --- a/uzbl.c +++ b/uzbl.c @@ -640,7 +640,7 @@ cmd_set_geometry() { the above setting and we don't want to end up with wrong geometry information */ - retreive_geometry(); + retrieve_geometry(); } static void @@ -2031,7 +2031,7 @@ configure_event_cb(GtkWidget* window, GdkEventConfigure* event) { (void) window; (void) event; - retreive_geometry(); + retrieve_geometry(); return FALSE; } @@ -2604,7 +2604,7 @@ dump_config() { //ADD "result" var so we can use this with uzblctrl } static void -retreive_geometry() { +retrieve_geometry() { int w, h, x, y; GString *buf = g_string_new(""); @@ -2728,7 +2728,7 @@ main (int argc, char* argv[]) { if(uzbl.gui.geometry) cmd_set_geometry(); else - retreive_geometry(); + retrieve_geometry(); gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); gboolean verbose_override = uzbl.state.verbose; -- cgit v1.2.3 From 7bcec7796b361986a83203869735c793871f7932 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Fri, 24 Jul 2009 13:10:00 +0200 Subject: statusbar fix --- uzbl.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 8626935..8390a47 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1667,6 +1667,10 @@ cmd_useragent() { static void move_statusbar() { + if (!uzbl.gui.scrolled_win && + !uzbl.gui.mainbar) + return; + gtk_widget_ref(uzbl.gui.scrolled_win); gtk_widget_ref(uzbl.gui.mainbar); gtk_container_remove(GTK_CONTAINER(uzbl.gui.vbox), uzbl.gui.scrolled_win); -- cgit v1.2.3 From 65e3e3ea23dbc494758521367e7c111a3ebb27d0 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Fri, 24 Jul 2009 13:37:48 +0200 Subject: added custom vars, currently somewhat broken --- uzbl.c | 22 ++++++++++++++++++++-- uzbl.h | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index cc5f125..8959c77 100644 --- a/uzbl.c +++ b/uzbl.c @@ -81,7 +81,7 @@ GOptionEntry entries[] = }; /* associate command names to their properties */ -typedef const struct { +typedef struct { /* TODO: Make this ambiguous void **ptr into a union { char *char_p; int *int_p; float *float_p; } val; the PTR() macro is kind of preventing this change at the moment. */ void **ptr; @@ -1702,6 +1702,7 @@ set_var_value(gchar *name, gchar *val) { uzbl_cmdprop *c = NULL; char *endp = NULL; char *buf = NULL; + char *invalid_chars = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½"; if( (c = g_hash_table_lookup(uzbl.comm.proto_var, name)) ) { if(!c->writeable) return FALSE; @@ -1725,6 +1726,23 @@ set_var_value(gchar *name, gchar *val) { /* invoke a command specific function */ if(c->func) c->func(); + } else { + /* check wether name violates our naming scheme */ + if(strpbrk(name, invalid_chars)) { + if (uzbl.state.verbose) + printf("Invalid variable name\n"); + return FALSE; + } + + /* custom vars */ + c = malloc(sizeof(uzbl_cmdprop)); + c->type = TYPE_STR; + c->dump = 0; + c->func = NULL; + buf = expand(val, 0); + *c->ptr = buf; + g_hash_table_insert(uzbl.comm.proto_var, + g_strdup(name), (gpointer) c); } return TRUE; } @@ -2606,7 +2624,7 @@ dump_config() { } void -retreive_geometry() { +retrieve_geometry() { int w, h, x, y; GString *buf = g_string_new(""); diff --git a/uzbl.h b/uzbl.h index c9d81b2..cbc362a 100644 --- a/uzbl.h +++ b/uzbl.h @@ -474,7 +474,7 @@ void dump_config(); void -retreive_geometry(); +retrieve_geometry(); gboolean configure_event_cb(GtkWidget* window, GdkEventConfigure* event); -- cgit v1.2.3 From c136130c24e415460825b5e92ad49877b6615237 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Fri, 24 Jul 2009 14:41:47 +0200 Subject: trying fix --- uzbl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 8959c77..765a5de 100644 --- a/uzbl.c +++ b/uzbl.c @@ -303,8 +303,11 @@ expand(char *s, guint recurse) { if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { + //printf("expand() RET: %s\n", ret); if(c->type == TYPE_STR && *c->ptr != NULL) { - g_string_append(buf, (gchar *)*c->ptr); + //printf("expand() buf: %s\n\n", (char *)*c->ptr); + gchar *tmp = g_strdup((char *)*c->ptr); + g_string_append(buf, tmp); } else if(c->type == TYPE_INT) { g_string_append_printf(buf, "%d", (int)*c->ptr); } @@ -1710,7 +1713,7 @@ set_var_value(gchar *name, gchar *val) { /* check for the variable type */ if (c->type == TYPE_STR) { buf = expand(val, 0); - g_free(*c->ptr); + if(*c->ptr) g_free(*c->ptr); *c->ptr = buf; } else if(c->type == TYPE_INT) { int *ip = (int *)c->ptr; @@ -1739,6 +1742,7 @@ set_var_value(gchar *name, gchar *val) { c->type = TYPE_STR; c->dump = 0; c->func = NULL; + c->writeable = 1; buf = expand(val, 0); *c->ptr = buf; g_hash_table_insert(uzbl.comm.proto_var, -- cgit v1.2.3 From 0ac06c15123580ae5bba7b6d8c27158d33c38d53 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Fri, 24 Jul 2009 17:21:54 +0200 Subject: fix malloc() bug --- uzbl.c | 1 + 1 file changed, 1 insertion(+) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 765a5de..db14966 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1744,6 +1744,7 @@ set_var_value(gchar *name, gchar *val) { c->func = NULL; c->writeable = 1; buf = expand(val, 0); + c->ptr = malloc(sizeof(char *)); *c->ptr = buf; g_hash_table_insert(uzbl.comm.proto_var, g_strdup(name), (gpointer) c); -- cgit v1.2.3 From 2fb1c9925397bec6834eb5e23f1aa64685c45d2a Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Fri, 24 Jul 2009 17:26:54 +0200 Subject: remove unnecessary g_strdup() --- uzbl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index db14966..e35218e 100644 --- a/uzbl.c +++ b/uzbl.c @@ -303,11 +303,8 @@ expand(char *s, guint recurse) { if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { - //printf("expand() RET: %s\n", ret); if(c->type == TYPE_STR && *c->ptr != NULL) { - //printf("expand() buf: %s\n\n", (char *)*c->ptr); - gchar *tmp = g_strdup((char *)*c->ptr); - g_string_append(buf, tmp); + g_string_append(buf, (gchar *)*c->ptr); } else if(c->type == TYPE_INT) { g_string_append_printf(buf, "%d", (int)*c->ptr); } -- cgit v1.2.3 From 23d8d0959459b0ae21536ce7e237ef466ac5dcb8 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Sat, 25 Jul 2009 11:32:42 +0200 Subject: remove unnecessary check --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index e35218e..9db9263 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1710,7 +1710,7 @@ set_var_value(gchar *name, gchar *val) { /* check for the variable type */ if (c->type == TYPE_STR) { buf = expand(val, 0); - if(*c->ptr) g_free(*c->ptr); + g_free(*c->ptr); *c->ptr = buf; } else if(c->type == TYPE_INT) { int *ip = (int *)c->ptr; -- cgit v1.2.3 From dd1460a17a757d151dd68e174c894c962c6545e7 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Sat, 25 Jul 2009 11:48:57 +0200 Subject: added update_gui command --- uzbl.c | 10 +++++++++- uzbl.h | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 9db9263..95667c6 100644 --- a/uzbl.c +++ b/uzbl.c @@ -821,7 +821,8 @@ struct {char *key; CommandInfo value;} cmdlist[] = { "keycmd_nl", {keycmd_nl, TRUE} }, { "keycmd_bs", {keycmd_bs, 0} }, { "chain", {chain, 0} }, - { "print", {print, TRUE} } + { "print", {print, TRUE} }, + { "update_gui", {update_gui, TRUE} } }; void @@ -875,6 +876,13 @@ set_var(WebKitWebView *page, GArray *argv, GString *result) { g_strfreev(split); } +void +update_gui(WebKitWebView *page, GArray *argv, GString *result) { + (void) page; (void) argv; (void) result; + + update_title(); +} + void print(WebKitWebView *page, GArray *argv, GString *result) { (void) page; (void) result; diff --git a/uzbl.h b/uzbl.h index cbc362a..632219e 100644 --- a/uzbl.h +++ b/uzbl.h @@ -476,6 +476,9 @@ dump_config(); void retrieve_geometry(); +void +update_gui(WebKitWebView *page, GArray *argv, GString *result); + gboolean configure_event_cb(GtkWidget* window, GdkEventConfigure* event); -- cgit v1.2.3 From b30ab6c1b30c134d4baedbf2dfb2dcec06f4274d Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Sat, 25 Jul 2009 17:34:39 +0200 Subject: fix overrun in expand() --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 95667c6..aa6556e 100644 --- a/uzbl.c +++ b/uzbl.c @@ -242,7 +242,7 @@ expand(char *s, guint recurse) { guint etype; char upto = ' '; char *end_simple_var = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½"; - char str_end[2]; + char str_end[3]; char ret[4096]; char *vend = NULL; GError *err = NULL; -- cgit v1.2.3 From b2780461a6f660102830b1001c34ca3a7f564b7b Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 25 Jul 2009 22:42:32 +0200 Subject: fixed buffer overrun --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index d9fac3a..2bc212c 100644 --- a/uzbl.c +++ b/uzbl.c @@ -242,7 +242,7 @@ expand(char *s, guint recurse) { guint etype; char upto = ' '; char *end_simple_var = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½"; - char str_end[2]; + char str_end[3]; char ret[4096]; char *vend = NULL; GError *err = NULL; -- cgit v1.2.3 From 2d52053290cb4a90e8383662cb3ea7cca50485e3 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 25 Jul 2009 22:43:01 +0200 Subject: cmd_load_uri doesn't take parameters --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 2bc212c..b6e670a 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2758,7 +2758,7 @@ main (int argc, char* argv[]) { set_var_value("uri", uri_override); g_free(uri_override); } else if (uzbl.state.uri) - cmd_load_uri(uzbl.gui.web_view, NULL); + cmd_load_uri(); gtk_main (); clean_up(); -- cgit v1.2.3 From 89fdd37dafb0fc3d259d16a92f5579b9a6bc92c5 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 25 Jul 2009 22:44:38 +0200 Subject: made type field for uzbl_cmdprop an enum --- uzbl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index b6e670a..dead7d5 100644 --- a/uzbl.c +++ b/uzbl.c @@ -80,19 +80,19 @@ GOptionEntry entries[] = { NULL, 0, 0, 0, NULL, NULL, NULL } }; +enum ptr_type {TYPE_INT, TYPE_STR, TYPE_FLOAT}; + /* associate command names to their properties */ typedef const struct { /* TODO: Make this ambiguous void **ptr into a union { char *char_p; int *int_p; float *float_p; } val; the PTR() macro is kind of preventing this change at the moment. */ void **ptr; - int type; + enum ptr_type type; int dump; int writeable; void (*func)(void); } uzbl_cmdprop; -enum {TYPE_INT, TYPE_STR, TYPE_FLOAT}; - /* abbreviations to help keep the table's width humane */ #define PTR_V(var, t, d, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = d, .writeable = 1, .func = fun } #define PTR_C(var, t, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = 0, .writeable = 0, .func = fun } -- cgit v1.2.3 From 127211c5f4b25b8032d1043a6840881e4d2a2e15 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 25 Jul 2009 22:44:58 +0200 Subject: var_name_to_ptr should have const names --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index dead7d5..bcc2e60 100644 --- a/uzbl.c +++ b/uzbl.c @@ -98,7 +98,7 @@ typedef const struct { #define PTR_C(var, t, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = 0, .writeable = 0, .func = fun } const struct { - char *name; + const char *name; uzbl_cmdprop cp; } var_name_to_ptr[] = { /* variable name pointer to variable in code type dump callback function */ -- cgit v1.2.3 From d99150bc20c6ea9a6a6c5bb3e3c2db8fd6fe4f69 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Sun, 26 Jul 2009 09:03:51 +0200 Subject: sanity fix --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index aa6556e..212e3d5 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2792,7 +2792,7 @@ main (int argc, char* argv[]) { set_var_value("uri", uri_override); g_free(uri_override); } else if (uzbl.state.uri) - cmd_load_uri(uzbl.gui.web_view, NULL); + cmd_load_uri(); gtk_main (); clean_up(); -- cgit v1.2.3 From 6ffc0e528db480a35f5024c48b1ba72f712e31c6 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 28 Jul 2009 14:18:36 +0200 Subject: pass char* as const char * where possible --- uzbl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index bcc2e60..afd1cf3 100644 --- a/uzbl.c +++ b/uzbl.c @@ -216,7 +216,7 @@ make_var_to_name_hash() { /* --- UTILITY FUNCTIONS --- */ enum {EXP_ERR, EXP_SIMPLE_VAR, EXP_BRACED_VAR, EXP_EXPR, EXP_JS, EXP_ESCAPE}; guint -get_exp_type(gchar *s) { +get_exp_type(const gchar *s) { /* variables */ if(*(s+1) == '(') return EXP_EXPR; @@ -237,7 +237,7 @@ return EXP_ERR; * recurse == 2: don't expand '@@' */ gchar * -expand(char *s, guint recurse) { +expand(const char *s, guint recurse) { uzbl_cmdprop *c; guint etype; char upto = ' '; -- cgit v1.2.3 From 4f9a17ad835697191e33481e9f3bca9cd6e4427e Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 28 Jul 2009 14:19:14 +0200 Subject: use EXIT_* macros instead of numerical values --- uzbl.c | 2 +- uzblctrl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index afd1cf3..ccd07e6 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2642,7 +2642,7 @@ initialize(int argc, char *argv[]) { if (uzbl.behave.print_version) { printf("Commit: %s\n", COMMIT); - exit(0); + exit(EXIT_SUCCESS); } /* initialize hash table */ diff --git a/uzblctrl.c b/uzblctrl.c index e768b7f..2547bc7 100644 --- a/uzblctrl.c +++ b/uzblctrl.c @@ -36,7 +36,7 @@ main(int argc, char* argv[]) { if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) == -1) { perror ("socket"); - exit (1); + exit (EXIT_FAILURE); } remote.sun_family = AF_UNIX; @@ -45,13 +45,13 @@ main(int argc, char* argv[]) { if (connect (s, (struct sockaddr *) &remote, len) == -1) { perror ("connect"); - exit (1); + exit (EXIT_FAILURE); } if ((send (s, command, strlen (command), 0) == -1) || (send (s, "\n", 1, 0) == -1)) { perror ("send"); - exit (1); + exit (EXIT_FAILURE); } while ((len = recv (s, &tmp, 1, 0))) { -- cgit v1.2.3 From 6eed1dc7ca8ab52606ec1a04426f2b99e73238d4 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 28 Jul 2009 14:22:31 +0200 Subject: improved expand function * removed unneeded variables * put an end to fixed length buffer ret * fixed a bug where string[-1] could be accessed --- uzbl.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index ccd07e6..afcdb6b 100644 --- a/uzbl.c +++ b/uzbl.c @@ -54,6 +54,7 @@ #include #include #include +#include #include "uzbl.h" #include "config.h" @@ -240,10 +241,8 @@ gchar * expand(const char *s, guint recurse) { uzbl_cmdprop *c; guint etype; - char upto = ' '; char *end_simple_var = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½"; - char str_end[3]; - char ret[4096]; + char *ret = NULL; char *vend = NULL; GError *err = NULL; gchar *cmd_stdout = NULL; @@ -268,37 +267,31 @@ expand(const char *s, guint recurse) { if(!vend) vend = strchr(s, '\0'); break; case EXP_BRACED_VAR: - s++; upto = '}'; - vend = strchr(s, upto); + s++; + vend = strchr(s, '}'); if(!vend) vend = strchr(s, '\0'); break; case EXP_EXPR: s++; - strcpy(str_end, ")@"); - str_end[2] = '\0'; - vend = strstr(s, str_end); + vend = strstr(s, ")@"); if(!vend) vend = strchr(s, '\0'); break; case EXP_JS: s++; - strcpy(str_end, ">@"); - str_end[2] = '\0'; - vend = strstr(s, str_end); + vend = strstr(s, ">@"); if(!vend) vend = strchr(s, '\0'); break; case EXP_ESCAPE: s++; - strcpy(str_end, "]@"); - str_end[2] = '\0'; - vend = strstr(s, str_end); + vend = strstr(s, "]@"); if(!vend) vend = strchr(s, '\0'); break; } + assert(vend); - if(vend) { - strncpy(ret, s, vend-s); - ret[vend-s] = '\0'; - } + ret = strndup(s, vend-s); + if(!ret) + abort(); if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { @@ -329,10 +322,10 @@ expand(const char *s, guint recurse) { g_error_free (err); } else if (*cmd_stdout) { - int len = strlen(cmd_stdout); + size_t len = strlen(cmd_stdout); - if(cmd_stdout[len-1] == '\n') - cmd_stdout[--len] = 0; /* strip trailing newline */ + if(len > 0 && cmd_stdout[len-1] == '\n') + cmd_stdout[--len] = '\0'; /* strip trailing newline */ g_string_append(buf, cmd_stdout); g_free(cmd_stdout); @@ -362,6 +355,9 @@ expand(const char *s, guint recurse) { g_free(mycmd); s = vend+2; } + + free(ret); + ret = NULL; break; default: -- cgit v1.2.3 From 2495f27a0fc9ab1e927cf1d0dd3d786a71482882 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 28 Jul 2009 14:29:07 +0200 Subject: added some splint comments --- config.h | 2 +- uzbl.c | 5 +++-- uzbl.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'uzbl.c') diff --git a/config.h b/config.h index c6e3f35..5c9835f 100644 --- a/config.h +++ b/config.h @@ -1,5 +1,5 @@ const struct { - char *command; + /*@null@*/ char *command; } default_config[] = { { "set reset_command_mode = 1"}, { "set status_format = \\@MODE \\@[\\@keycmd]\\@ (\\@LOAD_PROGRESS%) \\@[\\@TITLE]\\@ - Uzbl browser"}, diff --git a/uzbl.c b/uzbl.c index afcdb6b..95dafcf 100644 --- a/uzbl.c +++ b/uzbl.c @@ -91,7 +91,7 @@ typedef const struct { enum ptr_type type; int dump; int writeable; - void (*func)(void); + /*@null@*/ void (*func)(void); } uzbl_cmdprop; /* abbreviations to help keep the table's width humane */ @@ -181,7 +181,7 @@ const struct { const struct { - char *key; + /*@null@*/ char *key; guint mask; } modkeys[] = { { "SHIFT", GDK_SHIFT_MASK }, // shift @@ -230,6 +230,7 @@ get_exp_type(const gchar *s) { else return EXP_SIMPLE_VAR; + /*@notreached@*/ return EXP_ERR; } diff --git a/uzbl.h b/uzbl.h index d798258..76d88b3 100644 --- a/uzbl.h +++ b/uzbl.h @@ -20,7 +20,7 @@ enum { }; const struct { - gchar *symbol_name; + /*@null@*/ gchar *symbol_name; guint symbol_token; } symbols[] = { {"KEYCMD", SYM_KEYCMD}, -- cgit v1.2.3 From 3698971d9ba8fc4778ecee96b69192358575225a Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Tue, 28 Jul 2009 20:19:28 +0200 Subject: applied helmut's expand() patch --- uzbl.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index c578960..afa9a45 100644 --- a/uzbl.c +++ b/uzbl.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -249,10 +250,8 @@ gchar * expand(char *s, guint recurse) { uzbl_cmdprop *c; guint etype; - char upto = ' '; char *end_simple_var = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½"; - char str_end[3]; - char ret[4096]; + char *ret = NULL; char *vend = NULL; GError *err = NULL; gchar *cmd_stdout = NULL; @@ -277,37 +276,31 @@ expand(char *s, guint recurse) { if(!vend) vend = strchr(s, '\0'); break; case EXP_BRACED_VAR: - s++; upto = '}'; - vend = strchr(s, upto); + s++; + vend = strchr(s, '}'); if(!vend) vend = strchr(s, '\0'); break; case EXP_EXPR: s++; - strcpy(str_end, ")@"); - str_end[2] = '\0'; - vend = strstr(s, str_end); + vend = strstr(s, ")@"); if(!vend) vend = strchr(s, '\0'); break; case EXP_JS: s++; - strcpy(str_end, ">@"); - str_end[2] = '\0'; - vend = strstr(s, str_end); + vend = strstr(s, ">@"); if(!vend) vend = strchr(s, '\0'); break; case EXP_ESCAPE: s++; - strcpy(str_end, "]@"); - str_end[2] = '\0'; - vend = strstr(s, str_end); + vend = strstr(s, "]@"); if(!vend) vend = strchr(s, '\0'); break; } + assert(vend); - if(vend) { - strncpy(ret, s, vend-s); - ret[vend-s] = '\0'; - } + ret = g_strndup(s, vend-s); + if(!ret) + abort(); if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { @@ -338,10 +331,10 @@ expand(char *s, guint recurse) { g_error_free (err); } else if (*cmd_stdout) { - int len = strlen(cmd_stdout); + size_t len = strlen(cmd_stdout); - if(cmd_stdout[len-1] == '\n') - cmd_stdout[--len] = 0; /* strip trailing newline */ + if(len > 0 && cmd_stdout[len-1] == '\n') + cmd_stdout[--len] = '\0'; /* strip trailing newline */ g_string_append(buf, cmd_stdout); g_free(cmd_stdout); @@ -371,6 +364,9 @@ expand(char *s, guint recurse) { g_free(mycmd); s = vend+2; } + + free(ret); + ret = NULL; break; default: -- cgit v1.2.3 From e0ac0bcd4fd8eef5f1f214dafe31024abc8cd67b Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 12:28:01 +0200 Subject: removed useless MAX_BINDINGS macro --- uzbl.c | 1 - 1 file changed, 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 95dafcf..665fe76 100644 --- a/uzbl.c +++ b/uzbl.c @@ -31,7 +31,6 @@ #define LENGTH(x) (sizeof x / sizeof x[0]) -#define MAX_BINDINGS 256 #define _POSIX_SOURCE #include -- cgit v1.2.3 From 9b5ef7046bc743ca097b8022b9617e9ca3159c37 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 12:28:59 +0200 Subject: use g_strndup instead of strndup --- uzbl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 665fe76..0835f51 100644 --- a/uzbl.c +++ b/uzbl.c @@ -289,9 +289,7 @@ expand(const char *s, guint recurse) { } assert(vend); - ret = strndup(s, vend-s); - if(!ret) - abort(); + ret = g_strndup(s, vend-s); if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { -- cgit v1.2.3 From 899062bf4c568850579c496b04aee33e1fceb94f Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 13:45:03 +0200 Subject: added a gsize -> int cast for gcc --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 0835f51..7b0d1db 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1408,7 +1408,7 @@ parse_command(const char *cmd, const char *param, GString *result) { c->function(uzbl.gui.web_view, a, result_print); if (result_print->len) - printf("%*s\n", result_print->len, result_print->str); + printf("%*s\n", (int)result_print->len, result_print->str); g_string_free(result_print, TRUE); } else { -- cgit v1.2.3 From 08e7d9ae85dfb9b8977a377d78927b78a2076b4e Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 13:45:31 +0200 Subject: made this void **ptr; a union to remove magic --- uzbl.c | 178 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 92 insertions(+), 86 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 7b0d1db..d659294 100644 --- a/uzbl.c +++ b/uzbl.c @@ -86,96 +86,104 @@ enum ptr_type {TYPE_INT, TYPE_STR, TYPE_FLOAT}; typedef const struct { /* TODO: Make this ambiguous void **ptr into a union { char *char_p; int *int_p; float *float_p; } val; the PTR() macro is kind of preventing this change at the moment. */ - void **ptr; enum ptr_type type; + union { + int *i; + float *f; + gchar **s; + } ptr; int dump; int writeable; /*@null@*/ void (*func)(void); } uzbl_cmdprop; /* abbreviations to help keep the table's width humane */ -#define PTR_V(var, t, d, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = d, .writeable = 1, .func = fun } -#define PTR_C(var, t, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = 0, .writeable = 0, .func = fun } +#define PTR_V_STR(var, d, fun) { .ptr.s = &(var), .type = TYPE_STR, .dump = d, .writeable = 1, .func = fun } +#define PTR_V_INT(var, d, fun) { .ptr.i = (int*)&(var), .type = TYPE_INT, .dump = d, .writeable = 1, .func = fun } +#define PTR_V_FLOAT(var, d, fun) { .ptr.f = &(var), .type = TYPE_FLOAT, .dump = d, .writeable = 1, .func = fun } +#define PTR_C_STR(var, fun) { .ptr.s = &(var), .type = TYPE_STR, .dump = 0, .writeable = 0, .func = fun } +#define PTR_C_INT(var, fun) { .ptr.i = (int*)&(var), .type = TYPE_INT, .dump = 0, .writeable = 0, .func = fun } +#define PTR_C_FLOAT(var, fun) { .ptr.f = &(var), .type = TYPE_FLOAT, .dump = 0, .writeable = 0, .func = fun } const struct { const char *name; uzbl_cmdprop cp; } var_name_to_ptr[] = { -/* variable name pointer to variable in code type dump callback function */ +/* variable name pointer to variable in code dump callback function */ /* ---------------------------------------------------------------------------------------------- */ - { "uri", PTR_V(uzbl.state.uri, STR, 1, cmd_load_uri)}, - { "verbose", PTR_V(uzbl.state.verbose, INT, 1, NULL)}, - { "mode", PTR_V(uzbl.behave.mode, INT, 0, NULL)}, - { "inject_html", PTR_V(uzbl.behave.inject_html, STR, 0, cmd_inject_html)}, - { "base_url", PTR_V(uzbl.behave.base_url, STR, 1, NULL)}, - { "html_endmarker", PTR_V(uzbl.behave.html_endmarker, STR, 1, NULL)}, - { "html_mode_timeout", PTR_V(uzbl.behave.html_timeout, INT, 1, NULL)}, - { "keycmd", PTR_V(uzbl.state.keycmd, STR, 1, set_keycmd)}, - { "status_message", PTR_V(uzbl.gui.sbar.msg, STR, 1, update_title)}, - { "show_status", PTR_V(uzbl.behave.show_status, INT, 1, cmd_set_status)}, - { "status_top", PTR_V(uzbl.behave.status_top, INT, 1, move_statusbar)}, - { "status_format", PTR_V(uzbl.behave.status_format, STR, 1, update_title)}, - { "status_pbar_done", PTR_V(uzbl.gui.sbar.progress_s, STR, 1, update_title)}, - { "status_pbar_pending", PTR_V(uzbl.gui.sbar.progress_u, STR, 1, update_title)}, - { "status_pbar_width", PTR_V(uzbl.gui.sbar.progress_w, INT, 1, update_title)}, - { "status_background", PTR_V(uzbl.behave.status_background, STR, 1, update_title)}, - { "insert_indicator", PTR_V(uzbl.behave.insert_indicator, STR, 1, update_indicator)}, - { "command_indicator", PTR_V(uzbl.behave.cmd_indicator, STR, 1, update_indicator)}, - { "title_format_long", PTR_V(uzbl.behave.title_format_long, STR, 1, update_title)}, - { "title_format_short", PTR_V(uzbl.behave.title_format_short, STR, 1, update_title)}, - { "icon", PTR_V(uzbl.gui.icon, STR, 1, set_icon)}, - { "insert_mode", PTR_V(uzbl.behave.insert_mode, INT, 1, set_mode_indicator)}, - { "always_insert_mode", PTR_V(uzbl.behave.always_insert_mode, INT, 1, cmd_always_insert_mode)}, - { "reset_command_mode", PTR_V(uzbl.behave.reset_command_mode, INT, 1, NULL)}, - { "modkey", PTR_V(uzbl.behave.modkey, STR, 1, cmd_modkey)}, - { "load_finish_handler", PTR_V(uzbl.behave.load_finish_handler, STR, 1, NULL)}, - { "load_start_handler", PTR_V(uzbl.behave.load_start_handler, STR, 1, NULL)}, - { "load_commit_handler", PTR_V(uzbl.behave.load_commit_handler, STR, 1, NULL)}, - { "history_handler", PTR_V(uzbl.behave.history_handler, STR, 1, NULL)}, - { "download_handler", PTR_V(uzbl.behave.download_handler, STR, 1, NULL)}, - { "cookie_handler", PTR_V(uzbl.behave.cookie_handler, STR, 1, cmd_cookie_handler)}, - { "new_window", PTR_V(uzbl.behave.new_window, STR, 1, cmd_new_window)}, - { "fifo_dir", PTR_V(uzbl.behave.fifo_dir, STR, 1, cmd_fifo_dir)}, - { "socket_dir", PTR_V(uzbl.behave.socket_dir, STR, 1, cmd_socket_dir)}, - { "http_debug", PTR_V(uzbl.behave.http_debug, INT, 1, cmd_http_debug)}, - { "shell_cmd", PTR_V(uzbl.behave.shell_cmd, STR, 1, NULL)}, - { "proxy_url", PTR_V(uzbl.net.proxy_url, STR, 1, set_proxy_url)}, - { "max_conns", PTR_V(uzbl.net.max_conns, INT, 1, cmd_max_conns)}, - { "max_conns_host", PTR_V(uzbl.net.max_conns_host, INT, 1, cmd_max_conns_host)}, - { "useragent", PTR_V(uzbl.net.useragent, STR, 1, cmd_useragent)}, + { "uri", PTR_V_STR(uzbl.state.uri, 1, cmd_load_uri)}, + { "verbose", PTR_V_INT(uzbl.state.verbose, 1, NULL)}, + { "mode", PTR_V_INT(uzbl.behave.mode, 0, NULL)}, + { "inject_html", PTR_V_STR(uzbl.behave.inject_html, 0, cmd_inject_html)}, + { "base_url", PTR_V_STR(uzbl.behave.base_url, 1, NULL)}, + { "html_endmarker", PTR_V_STR(uzbl.behave.html_endmarker, 1, NULL)}, + { "html_mode_timeout", PTR_V_INT(uzbl.behave.html_timeout, 1, NULL)}, + { "keycmd", PTR_V_STR(uzbl.state.keycmd, 1, set_keycmd)}, + { "status_message", PTR_V_STR(uzbl.gui.sbar.msg, 1, update_title)}, + { "show_status", PTR_V_INT(uzbl.behave.show_status, 1, cmd_set_status)}, + { "status_top", PTR_V_INT(uzbl.behave.status_top, 1, move_statusbar)}, + { "status_format", PTR_V_STR(uzbl.behave.status_format, 1, update_title)}, + { "status_pbar_done", PTR_V_STR(uzbl.gui.sbar.progress_s, 1, update_title)}, + { "status_pbar_pending", PTR_V_STR(uzbl.gui.sbar.progress_u, 1, update_title)}, + { "status_pbar_width", PTR_V_INT(uzbl.gui.sbar.progress_w, 1, update_title)}, + { "status_background", PTR_V_STR(uzbl.behave.status_background, 1, update_title)}, + { "insert_indicator", PTR_V_STR(uzbl.behave.insert_indicator, 1, update_indicator)}, + { "command_indicator", PTR_V_STR(uzbl.behave.cmd_indicator, 1, update_indicator)}, + { "title_format_long", PTR_V_STR(uzbl.behave.title_format_long, 1, update_title)}, + { "title_format_short", PTR_V_STR(uzbl.behave.title_format_short, 1, update_title)}, + { "icon", PTR_V_STR(uzbl.gui.icon, 1, set_icon)}, + { "insert_mode", PTR_V_INT(uzbl.behave.insert_mode, 1, set_mode_indicator)}, + { "always_insert_mode", PTR_V_INT(uzbl.behave.always_insert_mode, 1, cmd_always_insert_mode)}, + { "reset_command_mode", PTR_V_INT(uzbl.behave.reset_command_mode, 1, NULL)}, + { "modkey", PTR_V_STR(uzbl.behave.modkey, 1, cmd_modkey)}, + { "load_finish_handler", PTR_V_STR(uzbl.behave.load_finish_handler, 1, NULL)}, + { "load_start_handler", PTR_V_STR(uzbl.behave.load_start_handler, 1, NULL)}, + { "load_commit_handler", PTR_V_STR(uzbl.behave.load_commit_handler, 1, NULL)}, + { "history_handler", PTR_V_STR(uzbl.behave.history_handler, 1, NULL)}, + { "download_handler", PTR_V_STR(uzbl.behave.download_handler, 1, NULL)}, + { "cookie_handler", PTR_V_STR(uzbl.behave.cookie_handler, 1, cmd_cookie_handler)}, + { "new_window", PTR_V_STR(uzbl.behave.new_window, 1, cmd_new_window)}, + { "fifo_dir", PTR_V_STR(uzbl.behave.fifo_dir, 1, cmd_fifo_dir)}, + { "socket_dir", PTR_V_STR(uzbl.behave.socket_dir, 1, cmd_socket_dir)}, + { "http_debug", PTR_V_INT(uzbl.behave.http_debug, 1, cmd_http_debug)}, + { "shell_cmd", PTR_V_STR(uzbl.behave.shell_cmd, 1, NULL)}, + { "proxy_url", PTR_V_STR(uzbl.net.proxy_url, 1, set_proxy_url)}, + { "max_conns", PTR_V_INT(uzbl.net.max_conns, 1, cmd_max_conns)}, + { "max_conns_host", PTR_V_INT(uzbl.net.max_conns_host, 1, cmd_max_conns_host)}, + { "useragent", PTR_V_STR(uzbl.net.useragent, 1, cmd_useragent)}, /* exported WebKitWebSettings properties */ - { "zoom_level", PTR_V(uzbl.behave.zoom_level, FLOAT,1, cmd_zoom_level)}, - { "font_size", PTR_V(uzbl.behave.font_size, INT, 1, cmd_font_size)}, - { "monospace_size", PTR_V(uzbl.behave.monospace_size, INT, 1, cmd_font_size)}, - { "minimum_font_size", PTR_V(uzbl.behave.minimum_font_size, INT, 1, cmd_minimum_font_size)}, - { "disable_plugins", PTR_V(uzbl.behave.disable_plugins, INT, 1, cmd_disable_plugins)}, - { "disable_scripts", PTR_V(uzbl.behave.disable_scripts, INT, 1, cmd_disable_scripts)}, - { "autoload_images", PTR_V(uzbl.behave.autoload_img, INT, 1, cmd_autoload_img)}, - { "autoshrink_images", PTR_V(uzbl.behave.autoshrink_img, INT, 1, cmd_autoshrink_img)}, - { "enable_spellcheck", PTR_V(uzbl.behave.enable_spellcheck, INT, 1, cmd_enable_spellcheck)}, - { "enable_private", PTR_V(uzbl.behave.enable_private, INT, 1, cmd_enable_private)}, - { "print_backgrounds", PTR_V(uzbl.behave.print_bg, INT, 1, cmd_print_bg)}, - { "stylesheet_uri", PTR_V(uzbl.behave.style_uri, STR, 1, cmd_style_uri)}, - { "resizable_text_areas",PTR_V(uzbl.behave.resizable_txt, INT, 1, cmd_resizable_txt)}, - { "default_encoding", PTR_V(uzbl.behave.default_encoding, STR, 1, cmd_default_encoding)}, - { "enforce_96_dpi", PTR_V(uzbl.behave.enforce_96dpi, INT, 1, cmd_enforce_96dpi)}, - { "caret_browsing", PTR_V(uzbl.behave.caret_browsing, INT, 1, cmd_caret_browsing)}, + { "zoom_level", PTR_V_FLOAT(uzbl.behave.zoom_level, 1, cmd_zoom_level)}, + { "font_size", PTR_V_INT(uzbl.behave.font_size, 1, cmd_font_size)}, + { "monospace_size", PTR_V_INT(uzbl.behave.monospace_size, 1, cmd_font_size)}, + { "minimum_font_size", PTR_V_INT(uzbl.behave.minimum_font_size, 1, cmd_minimum_font_size)}, + { "disable_plugins", PTR_V_INT(uzbl.behave.disable_plugins, 1, cmd_disable_plugins)}, + { "disable_scripts", PTR_V_INT(uzbl.behave.disable_scripts, 1, cmd_disable_scripts)}, + { "autoload_images", PTR_V_INT(uzbl.behave.autoload_img, 1, cmd_autoload_img)}, + { "autoshrink_images", PTR_V_INT(uzbl.behave.autoshrink_img, 1, cmd_autoshrink_img)}, + { "enable_spellcheck", PTR_V_INT(uzbl.behave.enable_spellcheck, 1, cmd_enable_spellcheck)}, + { "enable_private", PTR_V_INT(uzbl.behave.enable_private, 1, cmd_enable_private)}, + { "print_backgrounds", PTR_V_INT(uzbl.behave.print_bg, 1, cmd_print_bg)}, + { "stylesheet_uri", PTR_V_STR(uzbl.behave.style_uri, 1, cmd_style_uri)}, + { "resizable_text_areas",PTR_V_INT(uzbl.behave.resizable_txt, 1, cmd_resizable_txt)}, + { "default_encoding", PTR_V_STR(uzbl.behave.default_encoding, 1, cmd_default_encoding)}, + { "enforce_96_dpi", PTR_V_INT(uzbl.behave.enforce_96dpi, 1, cmd_enforce_96dpi)}, + { "caret_browsing", PTR_V_INT(uzbl.behave.caret_browsing, 1, cmd_caret_browsing)}, /* constants (not dumpable or writeable) */ - { "WEBKIT_MAJOR", PTR_C(uzbl.info.webkit_major, INT, NULL)}, - { "WEBKIT_MINOR", PTR_C(uzbl.info.webkit_minor, INT, NULL)}, - { "WEBKIT_MICRO", PTR_C(uzbl.info.webkit_micro, INT, NULL)}, - { "ARCH_UZBL", PTR_C(uzbl.info.arch, STR, NULL)}, - { "COMMIT", PTR_C(uzbl.info.commit, STR, NULL)}, - { "LOAD_PROGRESS", PTR_C(uzbl.gui.sbar.load_progress, INT, NULL)}, - { "LOAD_PROGRESSBAR", PTR_C(uzbl.gui.sbar.progress_bar, STR, NULL)}, - { "TITLE", PTR_C(uzbl.gui.main_title, STR, NULL)}, - { "SELECTED_URI", PTR_C(uzbl.state.selected_url, STR, NULL)}, - { "MODE", PTR_C(uzbl.gui.sbar.mode_indicator, STR, NULL)}, - { "NAME", PTR_C(uzbl.state.instance_name, STR, NULL)}, - - { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} + { "WEBKIT_MAJOR", PTR_C_INT(uzbl.info.webkit_major, NULL)}, + { "WEBKIT_MINOR", PTR_C_INT(uzbl.info.webkit_minor, NULL)}, + { "WEBKIT_MICRO", PTR_C_INT(uzbl.info.webkit_micro, NULL)}, + { "ARCH_UZBL", PTR_C_STR(uzbl.info.arch, NULL)}, + { "COMMIT", PTR_C_STR(uzbl.info.commit, NULL)}, + { "LOAD_PROGRESS", PTR_C_INT(uzbl.gui.sbar.load_progress, NULL)}, + { "LOAD_PROGRESSBAR", PTR_C_STR(uzbl.gui.sbar.progress_bar, NULL)}, + { "TITLE", PTR_C_STR(uzbl.gui.main_title, NULL)}, + { "SELECTED_URI", PTR_C_STR(uzbl.state.selected_url, NULL)}, + { "MODE", PTR_C_STR(uzbl.gui.sbar.mode_indicator, NULL)}, + { "NAME", PTR_C_STR(uzbl.state.instance_name, NULL)}, + + { NULL, {.ptr.s = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} }, *n2v_p = var_name_to_ptr; @@ -294,13 +302,13 @@ expand(const char *s, guint recurse) { if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { - if(c->type == TYPE_STR && *c->ptr != NULL) { - g_string_append(buf, (gchar *)*c->ptr); + if(c->type == TYPE_STR && *c->ptr.s != NULL) { + g_string_append(buf, (gchar *)*c->ptr.s); } else if(c->type == TYPE_INT) { - g_string_append_printf(buf, "%d", (int)*c->ptr); + g_string_append_printf(buf, "%d", *c->ptr.i); } else if(c->type == TYPE_FLOAT) { - g_string_append_printf(buf, "%f", *(float *)c->ptr); + g_string_append_printf(buf, "%f", *c->ptr.f); } } @@ -1699,17 +1707,15 @@ set_var_value(gchar *name, gchar *val) { /* check for the variable type */ if (c->type == TYPE_STR) { buf = expand(val, 0); - g_free(*c->ptr); - *c->ptr = buf; + g_free(*c->ptr.s); + *c->ptr.s = buf; } else if(c->type == TYPE_INT) { - int *ip = (int *)c->ptr; buf = expand(val, 0); - *ip = (int)strtoul(buf, &endp, 10); + *c->ptr.i = (int)strtoul(buf, &endp, 10); g_free(buf); } else if (c->type == TYPE_FLOAT) { - float *fp = (float *)c->ptr; buf = expand(val, 0); - *fp = strtod(buf, &endp); + *c->ptr.f = strtod(buf, &endp); g_free(buf); } @@ -2580,11 +2586,11 @@ dump_var_hash(gpointer k, gpointer v, gpointer ud) { return; if(c->type == TYPE_STR) - printf("set %s = %s\n", (char *)k, *c->ptr ? (char *)*c->ptr : " "); + printf("set %s = %s\n", (char *)k, *c->ptr.s ? *c->ptr.s : " "); else if(c->type == TYPE_INT) - printf("set %s = %d\n", (char *)k, (int)*c->ptr); + printf("set %s = %d\n", (char *)k, *c->ptr.i); else if(c->type == TYPE_FLOAT) - printf("set %s = %f\n", (char *)k, *(float *)c->ptr); + printf("set %s = %f\n", (char *)k, *c->ptr.f); } void -- cgit v1.2.3 From 5f8df96111a5f586a4955f19b440d56e576400f9 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 13:53:09 +0200 Subject: fixed strndup -> g_strndup using free -> g_free --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index d659294..0fd30ac 100644 --- a/uzbl.c +++ b/uzbl.c @@ -362,7 +362,7 @@ expand(const char *s, guint recurse) { s = vend+2; } - free(ret); + g_free(ret); ret = NULL; break; -- cgit v1.2.3 From 52b12112a541d5a5e431e0fa271c0e1e55bcd439 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 21:03:25 +0200 Subject: made global variable n2v_p be local --- uzbl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 0fd30ac..6164f53 100644 --- a/uzbl.c +++ b/uzbl.c @@ -105,7 +105,7 @@ typedef const struct { #define PTR_C_INT(var, fun) { .ptr.i = (int*)&(var), .type = TYPE_INT, .dump = 0, .writeable = 0, .func = fun } #define PTR_C_FLOAT(var, fun) { .ptr.f = &(var), .type = TYPE_FLOAT, .dump = 0, .writeable = 0, .func = fun } -const struct { +const struct var_name_to_ptr_t { const char *name; uzbl_cmdprop cp; } var_name_to_ptr[] = { @@ -184,7 +184,7 @@ const struct { { "NAME", PTR_C_STR(uzbl.state.instance_name, NULL)}, { NULL, {.ptr.s = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} -}, *n2v_p = var_name_to_ptr; +}; const struct { @@ -214,6 +214,7 @@ const struct { /* construct a hash from the var_name_to_ptr array for quick access */ void make_var_to_name_hash() { + struct var_name_to_ptr_t *n2v_p = &var_name_to_ptr; uzbl.comm.proto_var = g_hash_table_new(g_str_hash, g_str_equal); while(n2v_p->name) { g_hash_table_insert(uzbl.comm.proto_var, n2v_p->name, (gpointer) &n2v_p->cp); -- cgit v1.2.3 From 6c6f2bf26f15513f56aa43d737b8abc9984da184 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 21:06:01 +0200 Subject: made get_exp_type return an enum as it should --- uzbl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 6164f53..16844b7 100644 --- a/uzbl.c +++ b/uzbl.c @@ -223,8 +223,8 @@ make_var_to_name_hash() { } /* --- UTILITY FUNCTIONS --- */ -enum {EXP_ERR, EXP_SIMPLE_VAR, EXP_BRACED_VAR, EXP_EXPR, EXP_JS, EXP_ESCAPE}; -guint +enum exp_type {EXP_ERR, EXP_SIMPLE_VAR, EXP_BRACED_VAR, EXP_EXPR, EXP_JS, EXP_ESCAPE}; +enum exp_type get_exp_type(const gchar *s) { /* variables */ if(*(s+1) == '(') @@ -249,7 +249,7 @@ return EXP_ERR; gchar * expand(const char *s, guint recurse) { uzbl_cmdprop *c; - guint etype; + enum exp_type etype; char *end_simple_var = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½"; char *ret = NULL; char *vend = NULL; -- cgit v1.2.3 From bdcc36e6f4af1f31736571b8f99fdc3725adf533 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 21:30:41 +0200 Subject: fixed possible null pointer dereference --- uzbl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 16844b7..44994f1 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1434,8 +1434,7 @@ void set_proxy_url() { SoupURI *suri; - if(*uzbl.net.proxy_url == ' ' - || uzbl.net.proxy_url == NULL) { + if(uzbl.net.proxy_url == NULL || *uzbl.net.proxy_url == ' ') { soup_session_remove_feature_by_type(uzbl.net.soup_session, (GType) SOUP_SESSION_PROXY_URI); } -- cgit v1.2.3 From 4c29bee394f815afee118f0d7c1f9fb27ae26cbc Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 22:10:55 +0200 Subject: fixed possible memory leak in find_xdg_file --- uzbl.c | 1 + 1 file changed, 1 insertion(+) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 44994f1..fd44975 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2405,6 +2405,7 @@ find_xdg_file (int xdg_type, char* filename) { if (file_exists (temporary_file)) { return temporary_file; } else { + g_free(temporary_file); return NULL; } } -- cgit v1.2.3 From f5423bfe2855f4aeccfcf38dad6840160ebe96ad Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 22:11:21 +0200 Subject: added more /*@null@*/ and const annotations --- uzbl.c | 22 +++++++++++----------- uzbl.h | 18 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index fd44975..e08d0c0 100644 --- a/uzbl.c +++ b/uzbl.c @@ -404,7 +404,7 @@ str_replace (const char* search, const char* replace, const char* string) { } GArray* -read_file_by_line (gchar *path) { +read_file_by_line (const gchar *path) { GIOChannel *chan = NULL; gchar *readbuf = NULL; gsize len; @@ -553,7 +553,7 @@ mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequ return TRUE; } -WebKitWebView* +/*@null@*/ WebKitWebView* create_web_view_cb (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data) { (void) web_view; (void) frame; @@ -789,7 +789,7 @@ VIEWFUNC(go_forward) #undef VIEWFUNC /* -- command to callback/function map for things we cannot attach to any signals */ -struct {char *key; CommandInfo value;} cmdlist[] = +struct {const char *key; CommandInfo value;} cmdlist[] = { /* key function no_split */ { "back", {view_go_back, 0} }, { "forward", {view_go_forward, 0} }, @@ -1299,7 +1299,7 @@ run_command (const gchar *command, const guint npre, const gchar **args, return result; } -gchar** +/*@null@*/ gchar** split_quoted(const gchar* src, const gboolean unquote) { /* split on unquoted space, return array of strings; remove a layer of quotes and backslashes if unquote */ @@ -1696,7 +1696,7 @@ move_statusbar() { } gboolean -set_var_value(gchar *name, gchar *val) { +set_var_value(const gchar *name, gchar *val) { uzbl_cmdprop *c = NULL; char *endp = NULL; char *buf = NULL; @@ -1778,7 +1778,7 @@ parse_cmd_line(const char *ctl_line, GString *result) { } } -gchar* +/*@null@*/ gchar* build_stream_name(int type, const gchar* dir) { State *s = &uzbl.state; gchar *str = NULL; @@ -1819,7 +1819,7 @@ control_fifo(GIOChannel *gio, GIOCondition condition) { return TRUE; } -gchar* +/*@null@*/ gchar* init_fifo(gchar *dir) { /* return dir or, on error, free dir and return NULL */ if (uzbl.comm.fifo_path) { /* get rid of the old fifo if one exists */ if (unlink(uzbl.comm.fifo_path) == -1) @@ -1943,7 +1943,7 @@ control_client_socket(GIOChannel *clientchan) { return TRUE; } -gchar* +/*@null@*/ gchar* init_socket(gchar *dir) { /* return dir or, on error, free dir and return NULL */ if (uzbl.comm.socket_path) { /* remove an existing socket should one exist */ if (unlink(uzbl.comm.socket_path) == -1) @@ -2356,7 +2356,7 @@ add_binding (const gchar *key, const gchar *act) { g_strfreev(parts); } -gchar* +/*@null@*/ gchar* get_xdg_var (XDG_Var xdg) { const gchar* actual_value = getenv (xdg.environmental); const gchar* home = getenv ("HOME"); @@ -2375,8 +2375,8 @@ get_xdg_var (XDG_Var xdg) { return return_value; } -gchar* -find_xdg_file (int xdg_type, char* filename) { +/*@null@*/ gchar* +find_xdg_file (int xdg_type, const char* filename) { /* xdg_type = 0 => config xdg_type = 1 => data xdg_type = 2 => cache*/ diff --git a/uzbl.h b/uzbl.h index 76d88b3..c7f295b 100644 --- a/uzbl.h +++ b/uzbl.h @@ -220,7 +220,7 @@ char * str_replace (const char* search, const char* replace, const char* string); GArray* -read_file_by_line (gchar *path); +read_file_by_line (const gchar *path); gchar* parseenv (char* string); @@ -235,7 +235,7 @@ sigfunc * setup_signal(int signe, sigfunc *shandler); gboolean -set_var_value(gchar *name, gchar *val); +set_var_value(const gchar *name, gchar *val); void print(WebKitWebView *page, GArray *argv, GString *result); @@ -246,7 +246,7 @@ new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequ gboolean mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gchar *mime_type, WebKitWebPolicyDecision *policy_decision, gpointer user_data); -WebKitWebView* +/*@null@*/ WebKitWebView* create_web_view_cb (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data); gboolean @@ -355,13 +355,13 @@ parse_command(const char *cmd, const char *param, GString *result); void parse_cmd_line(const char *ctl_line, GString *result); -gchar* +/*@null@*/ gchar* build_stream_name(int type, const gchar *dir); gboolean control_fifo(GIOChannel *gio, GIOCondition condition); -gchar* +/*@null@*/ gchar* init_fifo(gchar *dir); gboolean @@ -370,7 +370,7 @@ control_stdin(GIOChannel *gio, GIOCondition condition); void create_stdin(); -gchar* +/*@null@*/ gchar* init_socket(gchar *dir); gboolean @@ -412,11 +412,11 @@ run_handler (const gchar *act, const gchar *args); void add_binding (const gchar *key, const gchar *act); -gchar* +/*@null@*/ gchar* get_xdg_var (XDG_Var xdg); -gchar* -find_xdg_file (int xdg_type, char* filename); +/*@null@*/ gchar* +find_xdg_file (int xdg_type, const char* filename); void settings_init (); -- cgit v1.2.3 From 69b825b098d7181b04886f13183c098ca20dcf3a Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 22:36:45 +0200 Subject: converted further void**ptr usages to union --- uzbl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 6127680..ea2e910 100644 --- a/uzbl.c +++ b/uzbl.c @@ -1908,8 +1908,8 @@ set_var_value(const gchar *name, gchar *val) { c->func = NULL; c->writeable = 1; buf = expand(val, 0); - c->ptr = malloc(sizeof(char *)); - *c->ptr = buf; + c->ptr.s = malloc(sizeof(char *)); + *c->ptr.s = buf; g_hash_table_insert(uzbl.comm.proto_var, g_strdup(name), (gpointer) c); } -- cgit v1.2.3 From 4fdd27afd3c84f9ccd25e2b964a99815ff65388a Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Wed, 29 Jul 2009 22:43:59 +0200 Subject: cast fixes --- uzbl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index ea2e910..dd3e7e3 100644 --- a/uzbl.c +++ b/uzbl.c @@ -227,7 +227,9 @@ make_var_to_name_hash() { struct var_name_to_ptr_t *n2v_p = &var_name_to_ptr; uzbl.comm.proto_var = g_hash_table_new(g_str_hash, g_str_equal); while(n2v_p->name) { - g_hash_table_insert(uzbl.comm.proto_var, n2v_p->name, (gpointer) &n2v_p->cp); + g_hash_table_insert(uzbl.comm.proto_var, + (gpointer) n2v_p->name, + (gpointer) &n2v_p->cp); n2v_p++; } } @@ -305,6 +307,9 @@ expand(const char *s, guint recurse) { vend = strstr(s, "]@"); if(!vend) vend = strchr(s, '\0'); break; + /*@notreached@*/ + case EXP_ERR: + break; } assert(vend); @@ -846,7 +851,7 @@ commands_hash(void) uzbl.behave.commands = g_hash_table_new(g_str_hash, g_str_equal); for (i = 0; i < LENGTH(cmdlist); i++) - g_hash_table_insert(uzbl.behave.commands, cmdlist[i].key, &cmdlist[i].value); + g_hash_table_insert(uzbl.behave.commands, (gpointer) cmdlist[i].key, &cmdlist[i].value); } /* -- CORE FUNCTIONS -- */ -- cgit v1.2.3 From fef79b52fd1c650efc5e4c6458a3ccdf35f452f3 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 29 Jul 2009 22:45:53 +0200 Subject: fixed wrong n2v_p local variable conversion --- uzbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index e08d0c0..a8e6fd7 100644 --- a/uzbl.c +++ b/uzbl.c @@ -214,7 +214,7 @@ const struct { /* construct a hash from the var_name_to_ptr array for quick access */ void make_var_to_name_hash() { - struct var_name_to_ptr_t *n2v_p = &var_name_to_ptr; + const struct var_name_to_ptr_t *n2v_p = var_name_to_ptr; uzbl.comm.proto_var = g_hash_table_new(g_str_hash, g_str_equal); while(n2v_p->name) { g_hash_table_insert(uzbl.comm.proto_var, n2v_p->name, (gpointer) &n2v_p->cp); -- cgit v1.2.3 From 818eb5b0cfb22ff2dbe839ca6c0d1ca31d7f7e8f Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Wed, 29 Jul 2009 22:54:13 +0200 Subject: removed obsolete comment --- uzbl.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index 006b778..facbf0c 100644 --- a/uzbl.c +++ b/uzbl.c @@ -88,8 +88,6 @@ enum ptr_type {TYPE_INT, TYPE_STR, TYPE_FLOAT}; /* associate command names to their properties */ typedef struct { - /* TODO: Make this ambiguous void **ptr into a union { char *char_p; int *int_p; float *float_p; } val; - the PTR() macro is kind of preventing this change at the moment. */ enum ptr_type type; union { int *i; -- cgit v1.2.3 From a3adc8f8c27fb8246bc8aa584aab4a589625a70c Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Thu, 30 Jul 2009 13:54:47 +0200 Subject: alignment --- uzbl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'uzbl.c') diff --git a/uzbl.c b/uzbl.c index facbf0c..8c3674b 100644 --- a/uzbl.c +++ b/uzbl.c @@ -318,7 +318,8 @@ expand(const char *s, guint recurse) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { if(c->type == TYPE_STR && *c->ptr.s != NULL) { g_string_append(buf, (gchar *)*c->ptr.s); - } else if(c->type == TYPE_INT) { + } + else if(c->type == TYPE_INT) { g_string_append_printf(buf, "%d", *c->ptr.i); } else if(c->type == TYPE_FLOAT) { -- cgit v1.2.3