summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-03-17 12:24:23 +0200
committerLuca Barbato <lu_zero@gentoo.org>2011-03-17 12:28:37 +0100
commitf1f60f5252b0b448adcce0c1c52f3161ee69b9bf (patch)
tree0a8803e4bd4073efeff698fec9161ab1f1762ee8 /libavformat/utils.c
parentdc6fdad5dcbf4e796543929ccbce0de1f8535efd (diff)
lavf: Make make_absolute_url a lavf internal function
This is shared by both applehttp demuxer and protocol. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c51
1 files changed, 51 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index ad00ce83e7..d6a17009db 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3814,3 +3814,54 @@ int ff_find_stream_index(AVFormatContext *s, int id)
}
return -1;
}
+
+void ff_make_absolute_url(char *buf, int size, const char *base,
+ const char *rel)
+{
+ char *sep;
+ /* Absolute path, relative to the current server */
+ if (base && strstr(base, "://") && rel[0] == '/') {
+ if (base != buf)
+ av_strlcpy(buf, base, size);
+ sep = strstr(buf, "://");
+ if (sep) {
+ sep += 3;
+ sep = strchr(sep, '/');
+ if (sep)
+ *sep = '\0';
+ }
+ av_strlcat(buf, rel, size);
+ return;
+ }
+ /* If rel actually is an absolute url, just copy it */
+ if (!base || strstr(rel, "://") || rel[0] == '/') {
+ av_strlcpy(buf, rel, size);
+ return;
+ }
+ if (base != buf)
+ av_strlcpy(buf, base, size);
+ /* Remove the file name from the base url */
+ sep = strrchr(buf, '/');
+ if (sep)
+ sep[1] = '\0';
+ else
+ buf[0] = '\0';
+ while (av_strstart(rel, "../", NULL) && sep) {
+ /* Remove the path delimiter at the end */
+ sep[0] = '\0';
+ sep = strrchr(buf, '/');
+ /* If the next directory name to pop off is "..", break here */
+ if (!strcmp(sep ? &sep[1] : buf, "..")) {
+ /* Readd the slash we just removed */
+ av_strlcat(buf, "/", size);
+ break;
+ }
+ /* Cut off the directory name */
+ if (sep)
+ sep[1] = '\0';
+ else
+ buf[0] = '\0';
+ rel += 3;
+ }
+ av_strlcat(buf, rel, size);
+}