aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2004-07-01 02:03:31 +0800
committerXan Lopez <xan@src.gnome.org>2004-07-01 02:03:31 +0800
commitc260e516d7bb7aec504793170a48eb79f61fb50c (patch)
tree489ed0b1e2728ad815b9ee587af7c4563a9c67d6
parentbca7f0c0b59fc4f0c15daf830b7fc760bebeebd7 (diff)
downloadgsoc2013-epiphany-c260e516d7bb7aec504793170a48eb79f61fb50c.tar
gsoc2013-epiphany-c260e516d7bb7aec504793170a48eb79f61fb50c.tar.gz
gsoc2013-epiphany-c260e516d7bb7aec504793170a48eb79f61fb50c.tar.bz2
gsoc2013-epiphany-c260e516d7bb7aec504793170a48eb79f61fb50c.tar.lz
gsoc2013-epiphany-c260e516d7bb7aec504793170a48eb79f61fb50c.tar.xz
gsoc2013-epiphany-c260e516d7bb7aec504793170a48eb79f61fb50c.tar.zst
gsoc2013-epiphany-c260e516d7bb7aec504793170a48eb79f61fb50c.zip
Be a bit smarter about double extensions.
* embed/mozilla/MozDownload.cpp: Be a bit smarter about double extensions.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/MozDownload.cpp57
2 files changed, 61 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1c0f935d..8f9b2d2d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-30 Xan Lopez <xan@gnome.org>
+
+ * embed/mozilla/MozDownload.cpp:
+
+ Be a bit smarter about double extensions.
+
2004-06-30 Marco Pesenti Gritti <marco@gnome.org>
* src/ephy-notebook.c:
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index cd836599b..8fef252a2 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -622,6 +622,58 @@ GetFilePath (const char *filename)
return path;
}
+static const char*
+file_is_compressed (const char *filename)
+{
+ int i;
+ const char *compression[] = {".gz", ".bz2", ".Z", ".lz", NULL};
+
+ for (i = 0; compression[i] != NULL; i++)
+ {
+ if (g_str_has_suffix (filename, compression[i]))
+ return compression[i];
+ }
+
+ return NULL;
+}
+
+static const char*
+parse_extension (const char *filename)
+{
+ const char *compression;
+
+ compression = file_is_compressed (filename);
+
+ /* If the file is compressed we might have a double extension */
+ if (compression != NULL)
+ {
+ int i;
+ const char *extensions[] = {"tar", "ps", "xcf", "dvi", "txt", "text", NULL};
+
+ for (i = 0; extensions[i] != NULL; i++)
+ {
+ char *suffix;
+ suffix = g_strdup_printf (".%s%s", extensions[i],
+ compression);
+
+ if (g_str_has_suffix (filename, suffix))
+ {
+ char *p;
+
+ p = g_strrstr (filename, suffix);
+ g_free (suffix);
+
+ return p;
+ }
+
+ g_free (suffix);
+ }
+ }
+
+ /* default case */
+ return g_strrstr (filename, ".");
+}
+
nsresult BuildDownloadPath (const char *defaultFileName, nsILocalFile **_retval)
{
char *path;
@@ -631,11 +683,12 @@ nsresult BuildDownloadPath (const char *defaultFileName, nsILocalFile **_retval)
if (g_file_test (path, G_FILE_TEST_EXISTS))
{
int i = 1;
- char *dot_pos, *serial = NULL;
+ const char *dot_pos;
+ char *serial = NULL;
GString *tmp_path;
gssize position;
- dot_pos = g_strrstr (defaultFileName, ".");
+ dot_pos = parse_extension (defaultFileName);
if (dot_pos)
{
position = dot_pos - defaultFileName;