aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lush.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/lush.c b/src/lush.c
index 6a3892f..c3bd831 100644
--- a/src/lush.c
+++ b/src/lush.c
@@ -867,27 +867,20 @@ static int is_operator(const char *str) {
}
static int operator_length(const char *str) {
- const char *operators[] = {"||", "&&", ">>", ">", "<", "&", ";", "|"};
+ const char *operators[] = {"||", "&&", ">>", ">", "&", ";", "|"};
int num_operators = sizeof(operators) / sizeof(operators[0]);
for (int i = 0; i < num_operators; i++) {
if (strncmp(str, operators[i], strlen(operators[i])) == 0) {
switch (i) {
case 0:
- return 2;
case 1:
- return 2;
case 2:
return 2;
case 3:
- return 1;
case 4:
- return 1;
case 5:
- return 1;
case 6:
return 1;
- case 7:
- return 1;
default:
return 0;
}
@@ -1133,19 +1126,21 @@ int lush_execute_chain(lua_State *L, char ***commands, int num_commands) {
int last_result = 0;
for (int i = 0; i < num_actions; i++) {
+ // Handle ; operator
+ if (is_operator(commands[0][0]) == OP_SEMICOLON) {
+ commands++;
+ }
- // Handle &&, ||, and ; operators
+ // Handle && and || operators
if (i > 0) {
commands--;
if (last_result != 0) {
- if (is_operator(commands[0][0]) == OP_AND ||
- is_operator(commands[0][0]) == OP_SEMICOLON) {
+ if (is_operator(commands[0][0]) == OP_AND) {
commands += 3;
continue;
}
- } else if (last_result == 0) {
- if (is_operator(commands[0][0]) == OP_OR ||
- is_operator(commands[0][0]) == OP_SEMICOLON) {
+ } else {
+ if (is_operator(commands[0][0]) == OP_OR) {
commands += 3;
continue;
}
=1'>Fixing the paxctl check.Gravatar Christoph Lohmann 1-1/+1 Thanks quinq for the tip. 2015-08-18Add PaX support.Gravatar Christoph Lohmann 1-0/+1 Mprotect needs to be turned off for Webkit. 2015-08-18Torified surf is unstableGravatar GhostAV 1-2/+6 On Tue, Aug 18, 2015 at 12:38:40PM +0200, Gabriel Pérez-Cerezo wrote: > It really seems to be a problem with torsocks. I have already solved > this problem with a patch GhostAV just sent me on this list that adds > SOCKS support to surf. It works fine now. As i failed to send the patch to the list, i resend it now: -- >8 -- From: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de> Subject: [PATCH] allow sock proxies Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-07-13Fix type of strictssl property.Gravatar Quentin Rameau 1-1/+1 Thanks to Mark Edgar <medgar123@gmail.com> for having spotted this. 2015-02-10Removing the debug print from the last commit.Gravatar Christoph Lohmann 1-1/+0 2015-02-10allow buttonrelease customization in config.hGravatar Markus Teich 2-8/+48 Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-02-03surf: see hover URL without changing titleGravatar Greg Reagle 1-0/+10 On Tue, Jan 27, 2015, at 11:52 AM, Christoph Lohmann wrote: > Then hook to the window leaving event in GTK or X11 and set the title to > your needs. I will welcome a patch. Patch is attached. I am a total novice in GTK programming, so I don't know what type the callback function is supposed to be (hence the void pointers) or whether I registered it properly. But it does work well for me. -- http://www.fastmail.com - Access your email from home and the web From a33f06da092bf920b6a286ea7688b32944d79a50 Mon Sep 17 00:00:00 2001 From: Greg Reagle <greg.reagle@umbc.edu> Date: Tue, 27 Jan 2015 13:22:15 -0500 Subject: [PATCH] ensure that window title is web page title (not hover link) when leaving window Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-02-03Some cleanup in style.Gravatar Christoph Lohmann 1-2/+2 2015-01-26Describe the web page indicators too.Gravatar Christoph Lohmann 1-0/+1 2015-01-26It wasn't really clear what was meant with site indicators in the manpage.Gravatar Christoph Lohmann 1-0/+1 2015-01-26surf: documented indicators in man pageGravatar Greg Reagle 1-0/+50 Patch attached. -- http://www.fastmail.com - The professional email service From 4a64624fee94c16c093d2b192389bad9bd6675d8 Mon Sep 17 00:00:00 2001 From: Greg Reagle <greg.reagle@umbc.edu> Date: Mon, 26 Jan 2015 14:29:05 -0500 Subject: [PATCH] Documented indicators Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-01-20fix stylesheet interna.Gravatar Markus Teich 1-19/+12 * no more segfault when running `surf -m` * allow to enable custom styles after `surf -m` with mod+shift+m * use enablestyles instead of the webkit-setting, which clears things up a bit Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-01-20Only plumb some URI, when it's ASCII.Gravatar Christoph Lohmann 1-1/+10 2015-01-20Oh my blob!Gravatar Christoph Lohmann 1-0/+1 Adding blob: to the URIS handled by the browser. 2015-01-19Data: is part of the browser too.Gravatar Christoph Lohmann 1-0/+1 2015-01-19file:// should be handled in surf too.Gravatar Christoph Lohmann 1-0/+1 2015-01-19Remove the debugging from the testing.Gravatar Christoph Lohmann 1-1/+0 2015-01-19Add some description for the plumb feature.Gravatar Christoph Lohmann 1-0/+3 2015-01-19Add plumbing functionality.Gravatar Christoph Lohmann 2-2/+28 2015-01-18Add a comment about how the styles are iterated.Gravatar Christoph Lohmann 1-0/+4 Thanks quing for noticing. 2015-01-18My CMD was too short. :OGravatar Christoph Lohmann 1-1/+1 Thanks Carlos Torres for mentioning this. 2015-01-17Add the manpage changes for the disk cache support.Gravatar Christoph Lohmann 1-1/+7 2015-01-17Adding disk cache support for soup.Gravatar Christoph Lohmann 2-9/+40 This is a merge of the patch of Ben Woolley <tautolog@gmail.com> 2015-01-17Fix extra newline, and add -g where other switches are forwarded.Gravatar Ben Woolley 1-1/+3 Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-01-17Newer libc want _DEFAULT_SOURCE.Gravatar Christoph Lohmann 1-1/+1 2015-01-17Major styles update.Gravatar Christoph Lohmann 3-11/+84 In config.h there is now some styles array to apply site-specific styles. This can be toggled using the -mM flags. If a stylefile is manually specified, then this will overwrite everything. 2015-01-02Fix a typo in surf manual.Gravatar Jakukyo Friel 1-1/+1 `Ctrl-/` displays incorrectly in `man surf` on my machine. A patch is attached. (You also access it here: https://github.com/weakish/surf/commit/07e97eccedd96eabf14b2fbf77de75ec1b594d97) ---- surf.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Christoph Lohmann <20h@r-36.net> 2014-09-28Minor style change.Gravatar Christoph Lohmann 1-1/+1 2014-09-28Make »Copy image address« work.Gravatar Christoph Lohmann 1-3/+10 Thanks yui@blekksprut.net for the patch! 2014-08-07Mention xdotool in SEE ALSO too.Gravatar Christoph Lohmann 1-1/+2 2014-08-07Fix the manpage about xid.Gravatar Christoph Lohmann 1-1/+3 Something was missing from this one sentence. Now it is complete.