# HG changeset patch # User michael # Date 1198944783 0 # Node ID 22467d1cf49cc1baab150836863ef05fbbb8823c # Parent 57818580a457357bec8370ca3be9834611c6e342 Try to fix url_split() so that the ?foobar part is in the path and only the path. diff -r 57818580a457 -r 22467d1cf49c utils.c --- a/utils.c Fri Dec 28 13:07:43 2007 +0000 +++ b/utils.c Sat Dec 29 16:13:03 2007 +0000 @@ -2941,7 +2941,7 @@ char *path, int path_size, const char *url) { - const char *p, *ls, *at, *col, *brk, *q; + const char *p, *ls, *at, *col, *brk; if (port_ptr) *port_ptr = -1; if (proto_size > 0) proto[0] = 0; @@ -2962,12 +2962,12 @@ } /* separate path from hostname */ - if ((ls = strchr(p, '/'))) { - if ((q = strchr(ls, '?'))) - av_strlcpy(path, ls, FFMIN(path_size, q - ls + 1)); - else + ls = strchr(p, '/'); + if(!ls) + ls = strchr(p, '?'); + if(ls) av_strlcpy(path, ls, path_size); - } else if (!(ls = strchr(p, '?'))) + else ls = &p[strlen(p)]; // XXX /* the rest is hostname, use that to parse auth/port */