Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/d6c34b803926022f1aab6... ...commit http://git.netsurf-browser.org/netsurf.git/commit/d6c34b803926022f1aab6c1... ...tree http://git.netsurf-browser.org/netsurf.git/tree/d6c34b803926022f1aab6c120... The branch, master has been updated via d6c34b803926022f1aab6c120cf66b94f39d2bc5 (commit) via b962d3db820e60863b03c664cad0a32341cc6d79 (commit) from d7907bfe4ca4180dd926dbe4088e9b2be477c2bc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d6c34b803926022f1aa... commit d6c34b803926022f1aab6c120cf66b94f39d2bc5 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Soak up -v so command line processing still works with logging enabled diff --git a/amiga/gui.c b/amiga/gui.c index dbcc2f3..43b1fb3 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -797,10 +797,11 @@ static struct RDArgs *ami_gui_commandline(int *argc, char **argv, int *nargc, ch { int new_argc = 1; struct RDArgs *args; - CONST_STRPTR template = "NSOPTS/M,URL/K,USERSDIR/K,FORCE/S"; + CONST_STRPTR template = "-v/S,NSOPTS/M,URL/K,USERSDIR/K,FORCE/S"; long rarray[] = {0,0,0,0}; enum { + A_VERBOSE, /* ignored */ A_NSOPTS, /* ignored */ A_URL, A_USERSDIR, commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b962d3db820e60863b0... commit b962d3db820e60863b03c664cad0a32341cc6d79 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Revert "Skip invalid commandline args instead of aborting" This reverts commit 4ad94124a693528f2ac47a9b4b2e12880586aedf. diff --git a/utils/nsoption.c b/utils/nsoption.c index c83f779..ccdd23a 100644 --- a/utils/nsoption.c +++ b/utils/nsoption.c @@ -734,10 +734,8 @@ nsoption_commandline(int *pargc, char **argv, struct nsoption_s *opts) /* check we have an option */ /* option must start -- and be as long as the shortest option*/ - if ((arglen < (2+5) ) || (arg[0] != '-') || (arg[1] != '-')) { - idx++; - continue; - } + if ((arglen < (2+5) ) || (arg[0] != '-') || (arg[1] != '-')) + break; arg += 2; /* skip -- */ ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 3 ++- utils/nsoption.c | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index dbcc2f3..43b1fb3 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -797,10 +797,11 @@ static struct RDArgs *ami_gui_commandline(int *argc, char **argv, int *nargc, ch { int new_argc = 1; struct RDArgs *args; - CONST_STRPTR template = "NSOPTS/M,URL/K,USERSDIR/K,FORCE/S"; + CONST_STRPTR template = "-v/S,NSOPTS/M,URL/K,USERSDIR/K,FORCE/S"; long rarray[] = {0,0,0,0}; enum { + A_VERBOSE, /* ignored */ A_NSOPTS, /* ignored */ A_URL, A_USERSDIR, diff --git a/utils/nsoption.c b/utils/nsoption.c index c83f779..ccdd23a 100644 --- a/utils/nsoption.c +++ b/utils/nsoption.c @@ -734,10 +734,8 @@ nsoption_commandline(int *pargc, char **argv, struct nsoption_s *opts) /* check we have an option */ /* option must start -- and be as long as the shortest option*/ - if ((arglen < (2+5) ) || (arg[0] != '-') || (arg[1] != '-')) { - idx++; - continue; - } + if ((arglen < (2+5) ) || (arg[0] != '-') || (arg[1] != '-')) + break; arg += 2; /* skip -- */ -- NetSurf Browser