comparison utils.c @ 2621:2aea27e618ba libavformat

Make url_split() strip url options (?opt=var) from the returned hostname or location. This fixes a regression introduced by the rewrite of url_split() in r10605. Patch by Ronald S. Bultje: rsbultje gmail com Original thread: [FFmpeg-devel] [PATCH] Make RTP work with IPv6 enabled Date: 10/12/2007 08:19 PM

2620:792383dd085e

               char *hostname, int hostname_size,
               int *port_ptr,
               char *path, int path_size,
               const char *url)
{
    const char *p, *ls, *at, *col, *brk;

    if (port_ptr)               *port_ptr = -1;
    if (proto_size > 0)         proto[0] = 0;
    if (authorization_size > 0) authorization[0] = 0;
    if (hostname_size > 0)      hostname[0] = 0;

        av_strlcpy(path, url, path_size);
        return;
    }

    /* separate path from hostname */
    if ((ls = strchr(p, '/')))
        av_strlcpy(path, ls, path_size);
    else
        ls = &p[strlen(p)]; // XXX

    /* the rest is hostname, use that to parse auth/port */
    if (ls != p) {
        /* authorization (user[:pass]@hostname) */

2621:2aea27e618ba

               char *hostname, int hostname_size,
               int *port_ptr,
               char *path, int path_size,
               const char *url)
{
    const char *p, *ls, *at, *col, *brk, *q;

    if (port_ptr)               *port_ptr = -1;
    if (proto_size > 0)         proto[0] = 0;
    if (authorization_size > 0) authorization[0] = 0;
    if (hostname_size > 0)      hostname[0] = 0;

        av_strlcpy(path, url, path_size);
        return;
    }

    /* separate path from hostname */
    if ((ls = strchr(p, '/'))) {
        if ((q = strchr(ls, '?')))
            av_strlcpy(path, ls, FFMIN(path_size, q - ls + 1));
        else
            av_strlcpy(path, ls, path_size);
    } else if (!(ls = strchr(p, '?')))
        ls = &p[strlen(p)]; // XXX

    /* the rest is hostname, use that to parse auth/port */
    if (ls != p) {
        /* authorization (user[:pass]@hostname) */