diff -up thunderbird-45.0/mozilla/b2g/installer/package-manifest.in.moz-1134537-gnomevfsservice thunderbird-45.0/mozilla/b2g/installer/package-manifest.in

--- thunderbird-45.0/mozilla/b2g/installer/package-manifest.in.moz-1134537-gnomevfsservice	2016-04-07 23:33:14.000000000 +0200

+++ thunderbird-45.0/mozilla/b2g/installer/package-manifest.in	2016-05-09 13:19:52.317048303 +0200

@@ -912,6 +912,12 @@ bin/libfreebl_32int64_3.so

 @RESPATH@/crashreporter-override.ini

 #endif

+; [Extensions]

+;

+#ifdef MOZ_ENABLE_GNOMEVFS

+bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@

+#endif

+

 [b2g]

 #ifndef MOZ_WIDGET_GONK

 #ifdef XP_WIN32

diff -up thunderbird-45.0/mozilla/browser/installer/package-manifest.in.moz-1134537-gnomevfsservice thunderbird-45.0/mozilla/browser/installer/package-manifest.in

--- thunderbird-45.0/mozilla/browser/installer/package-manifest.in.moz-1134537-gnomevfsservice	2016-05-09 13:19:52.318048303 +0200

+++ thunderbird-45.0/mozilla/browser/installer/package-manifest.in	2016-05-09 13:24:23.525852797 +0200

@@ -495,6 +495,9 @@

 #ifdef XP_MACOSX

 @RESPATH@/browser/components/SafariProfileMigrator.js

 #endif

+#ifdef MOZ_ENABLE_GNOMEVFS

+@RESPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@

+#endif

 @RESPATH@/components/nsINIProcessor.manifest

 @RESPATH@/components/nsINIProcessor.js

 @RESPATH@/components/nsPrompter.manifest

diff -up thunderbird-45.0/mozilla/config/system-headers.moz-1134537-gnomevfsservice thunderbird-45.0/mozilla/config/system-headers

--- thunderbird-45.0/mozilla/config/system-headers.moz-1134537-gnomevfsservice	2016-05-09 13:19:52.298048317 +0200

+++ thunderbird-45.0/mozilla/config/system-headers	2016-05-09 13:19:52.318048303 +0200

@@ -630,6 +630,14 @@ libgnome/libgnome.h

 libgnomeui/gnome-icon-lookup.h

 libgnomeui/gnome-icon-theme.h

 libgnomeui/gnome-ui-init.h

+libgnomevfs/gnome-vfs-file-info.h

+libgnomevfs/gnome-vfs.h

+libgnomevfs/gnome-vfs-init.h

+libgnomevfs/gnome-vfs-mime.h

+libgnomevfs/gnome-vfs-mime-handlers.h

+libgnomevfs/gnome-vfs-mime-utils.h

+libgnomevfs/gnome-vfs-ops.h

+libgnomevfs/gnome-vfs-standard-callbacks.h

 lib$routines.h

 limits

 limits.h

diff -up thunderbird-45.0/mozilla/configure.in.moz-1134537-gnomevfsservice thunderbird-45.0/mozilla/configure.in

--- thunderbird-45.0/mozilla/configure.in.moz-1134537-gnomevfsservice	2016-05-09 13:19:52.299048316 +0200

+++ thunderbird-45.0/mozilla/configure.in	2016-05-09 13:21:31.457976836 +0200

@@ -71,6 +71,7 @@ GTK3_VERSION=3.4.0

 GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4

 WINDRES_VERSION=2.14.90

 W32API_VERSION=3.14

+GNOMEVFS_VERSION=2.0

 GNOMEUI_VERSION=2.2.0

 GCONF_VERSION=1.2.1

 STARTUP_NOTIFICATION_VERSION=0.8

@@ -4632,7 +4633,7 @@ then

 fi

 dnl ========================================================

-dnl = GIO and GConf support module

+dnl = GnomeVFS, GIO and GConf support module

 dnl ========================================================

 if test "$MOZ_X11"

@@ -4646,6 +4647,31 @@ then

     fi

     dnl ========================================================

+    dnl = GnomeVFS support module

+    dnl ========================================================

+    MOZ_ARG_ENABLE_BOOL(gnomevfs,

+    [  --enable-gnomevfs       Enable GnomeVFS support (default: disabled)],

+        MOZ_ENABLE_GNOMEVFS=force,

+        MOZ_ENABLE_GNOMEVFS=)

+

+    if test "$MOZ_ENABLE_GNOMEVFS"

+    then

+        PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[

+            MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'`

+            MOZ_ENABLE_GNOMEVFS=1

+            AC_DEFINE(MOZ_ENABLE_GNOMEVFS)

+        ],[

+            if test "$MOZ_ENABLE_GNOMEVFS" = "force"

+            then

+                AC_MSG_ERROR([* * * Could not find gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION])

+            fi

+            MOZ_ENABLE_GNOMEVFS=

+        ])

+    fi

+

+    AC_SUBST(MOZ_ENABLE_GNOMEVFS)

+

+    dnl ========================================================

     dnl = GIO support module

     dnl ========================================================

     MOZ_ARG_DISABLE_BOOL(gio,

@@ -6297,6 +6323,19 @@ MOZ_ARG_ENABLE_STRING(extensions,

 done],

     MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT")

+if test -z "$MOZ_ENABLE_GNOMEVFS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then

+    # Suppress warning on non-X11 platforms

+    if test -n "$MOZ_X11"; then

+        AC_MSG_WARN([Removing gnomevfs from MOZ_EXTENSIONS due to no --enable-gnomevfs.])

+    fi

+    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`

+fi

+

+dnl Do not build gnomevfs with libxul based apps

+if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then

+    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`

+fi

+

 if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then

     # Suppress warning on non-X11 platforms

     if test -n "$MOZ_X11"; then

diff -up thunderbird-45.0/mozilla/extensions/gnomevfs/moz.build.moz-1134537-gnomevfsservice thunderbird-45.0/mozilla/extensions/gnomevfs/moz.build

--- thunderbird-45.0/mozilla/extensions/gnomevfs/moz.build.moz-1134537-gnomevfsservice	2016-05-09 13:19:52.321048300 +0200

+++ thunderbird-45.0/mozilla/extensions/gnomevfs/moz.build	2016-05-09 13:19:52.321048300 +0200

@@ -0,0 +1,19 @@

+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-

+# vim: set filetype=python:

+# This Source Code Form is subject to the terms of the Mozilla Public

+# License, v. 2.0. If a copy of the MPL was not distributed with this

+# file, You can obtain one at http://mozilla.org/MPL/2.0/.

+

+SOURCES += [

+    'nsGnomeVFSProtocolHandler.cpp',

+]

+

+XPCOMBinaryComponent('nkgnomevfs')

+

+# make sure this component is never statically linked into the main

+# application.  this is necessary since we don't want to force users

+# to install gnome-vfs2 in order to use the rest of mozilla ;-)

+

+CXXFLAGS += CONFIG['MOZ_GNOMEVFS_CFLAGS']

+

+OS_LIBS += CONFIG['MOZ_GNOMEVFS_LIBS']

diff -up thunderbird-45.0/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp.moz-1134537-gnomevfsservice thunderbird-45.0/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp

--- thunderbird-45.0/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp.moz-1134537-gnomevfsservice	2016-05-09 13:19:52.322048300 +0200

+++ thunderbird-45.0/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp	2016-05-09 13:19:52.322048300 +0200

@@ -0,0 +1,988 @@

+/* vim:set ts=2 sw=2 et cindent: */

+/* This Source Code Form is subject to the terms of the Mozilla Public

+ * License, v. 2.0. If a copy of the MPL was not distributed with this

+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

+

+// GnomeVFS v2.2.2 is missing G_BEGIN_DECLS in gnome-vfs-module-callback.h

+extern "C" {

+#include <libgnomevfs/gnome-vfs.h>

+#include <libgnomevfs/gnome-vfs-standard-callbacks.h>

+#include <libgnomevfs/gnome-vfs-mime-utils.h>

+}

+

+#include <algorithm>

+

+#include "nsServiceManagerUtils.h"

+#include "nsComponentManagerUtils.h"

+#include "mozilla/ModuleUtils.h"

+#include "nsIInterfaceRequestorUtils.h"

+#include "nsIPrefService.h"

+#include "nsIPrefBranch.h"

+#include "nsIObserver.h"

+#include "nsThreadUtils.h"

+#include "nsProxyRelease.h"

+#include "nsIAuthPrompt.h"

+#include "nsIStringBundle.h"

+#include "nsIStandardURL.h"

+#include "nsIURL.h"

+#include "nsMimeTypes.h"

+#include "nsNetUtil.h"

+#include "nsINetUtil.h"

+#include "nsAutoPtr.h"

+#include "nsError.h"

+#include "prlog.h"

+#include "prtime.h"

+#include "prprf.h"

+#include "plstr.h"

+#include "mozilla/Attributes.h"

+

+#define MOZ_GNOMEVFS_SCHEME              "moz-gnomevfs"

+#define MOZ_GNOMEVFS_SUPPORTED_PROTOCOLS "network.gnomevfs.supported-protocols"

+

+//-----------------------------------------------------------------------------

+

+// NSPR_LOG_MODULES=gnomevfs:5

+#ifdef PR_LOGGING

+static PRLogModuleInfo *sGnomeVFSLog;

+#define LOG(args) PR_LOG(sGnomeVFSLog, PR_LOG_DEBUG, args)

+#else

+#define LOG(args)

+#endif

+

+//-----------------------------------------------------------------------------

+

+static nsresult

+MapGnomeVFSResult(GnomeVFSResult result)

+{

+  switch (result)

+  {

+    case GNOME_VFS_OK:                           return NS_OK;

+    case GNOME_VFS_ERROR_NOT_FOUND:              return NS_ERROR_FILE_NOT_FOUND;

+    case GNOME_VFS_ERROR_INTERNAL:               return NS_ERROR_UNEXPECTED;

+    case GNOME_VFS_ERROR_BAD_PARAMETERS:         return NS_ERROR_INVALID_ARG;

+    case GNOME_VFS_ERROR_NOT_SUPPORTED:          return NS_ERROR_NOT_AVAILABLE;

+    case GNOME_VFS_ERROR_CORRUPTED_DATA:         return NS_ERROR_FILE_CORRUPTED;

+    case GNOME_VFS_ERROR_TOO_BIG:                return NS_ERROR_FILE_TOO_BIG;

+    case GNOME_VFS_ERROR_NO_SPACE:               return NS_ERROR_FILE_NO_DEVICE_SPACE;

+    case GNOME_VFS_ERROR_READ_ONLY:

+    case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM:  return NS_ERROR_FILE_READ_ONLY;

+    case GNOME_VFS_ERROR_INVALID_URI:

+    case GNOME_VFS_ERROR_INVALID_HOST_NAME:      return NS_ERROR_MALFORMED_URI;

+    case GNOME_VFS_ERROR_ACCESS_DENIED:

+    case GNOME_VFS_ERROR_NOT_PERMITTED:

+    case GNOME_VFS_ERROR_LOGIN_FAILED:           return NS_ERROR_FILE_ACCESS_DENIED;

+    case GNOME_VFS_ERROR_EOF:                    return NS_BASE_STREAM_CLOSED;

+    case GNOME_VFS_ERROR_NOT_A_DIRECTORY:        return NS_ERROR_FILE_NOT_DIRECTORY;

+    case GNOME_VFS_ERROR_IN_PROGRESS:            return NS_ERROR_IN_PROGRESS;

+    case GNOME_VFS_ERROR_FILE_EXISTS:            return NS_ERROR_FILE_ALREADY_EXISTS;

+    case GNOME_VFS_ERROR_IS_DIRECTORY:           return NS_ERROR_FILE_IS_DIRECTORY;

+    case GNOME_VFS_ERROR_NO_MEMORY:              return NS_ERROR_OUT_OF_MEMORY;

+    case GNOME_VFS_ERROR_HOST_NOT_FOUND:

+    case GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS:    return NS_ERROR_UNKNOWN_HOST;

+    case GNOME_VFS_ERROR_CANCELLED:

+    case GNOME_VFS_ERROR_INTERRUPTED:            return NS_ERROR_ABORT;

+    case GNOME_VFS_ERROR_DIRECTORY_NOT_EMPTY:    return NS_ERROR_FILE_DIR_NOT_EMPTY;

+    case GNOME_VFS_ERROR_NAME_TOO_LONG:          return NS_ERROR_FILE_NAME_TOO_LONG;

+    case GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE:  return NS_ERROR_UNKNOWN_PROTOCOL;

+

+    /* No special mapping for these error codes...

+

+    case GNOME_VFS_ERROR_GENERIC:

+    case GNOME_VFS_ERROR_IO:

+    case GNOME_VFS_ERROR_WRONG_FORMAT:

+    case GNOME_VFS_ERROR_BAD_FILE:

+    case GNOME_VFS_ERROR_NOT_OPEN:

+    case GNOME_VFS_ERROR_INVALID_OPEN_MODE:

+    case GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES:

+    case GNOME_VFS_ERROR_LOOP:

+    case GNOME_VFS_ERROR_DIRECTORY_BUSY:

+    case GNOME_VFS_ERROR_TOO_MANY_LINKS:

+    case GNOME_VFS_ERROR_NOT_SAME_FILE_SYSTEM:

+    case GNOME_VFS_ERROR_SERVICE_OBSOLETE:

+    case GNOME_VFS_ERROR_PROTOCOL_ERROR:

+    case GNOME_VFS_ERROR_NO_MASTER_BROWSER:

+

+    */

+

+    // Make GCC happy

+    default:

+      return NS_ERROR_FAILURE;

+  }

+

+  return NS_ERROR_FAILURE;

+}

+

+//-----------------------------------------------------------------------------

+

+static void

+ProxiedAuthCallback(gconstpointer in,

+                    gsize         in_size,

+                    gpointer      out,

+                    gsize         out_size,

+                    gpointer      callback_data)

+{

+  GnomeVFSModuleCallbackAuthenticationIn *authIn =

+      (GnomeVFSModuleCallbackAuthenticationIn *) in;

+  GnomeVFSModuleCallbackAuthenticationOut *authOut =

+      (GnomeVFSModuleCallbackAuthenticationOut *) out;

+

+  LOG(("gnomevfs: ProxiedAuthCallback [uri=%s]\n", authIn->uri));

+

+  // Without a channel, we have no way of getting a prompter.

+  nsIChannel *channel = (nsIChannel *) callback_data;

+  if (!channel)

+    return;

+

+  nsCOMPtr<nsIAuthPrompt> prompt;

+  NS_QueryNotificationCallbacks(channel, prompt);

+

+  // If no auth prompt, then give up.  We could failover to using the

+  // WindowWatcher service, but that might defeat a consumer's purposeful

+  // attempt to disable authentication (for whatever reason).

+  if (!prompt)

+    return;

+

+  // Parse out the host and port...

+  nsCOMPtr<nsIURI> uri;

+  channel->GetURI(getter_AddRefs(uri));

+  if (!uri)

+    return;

+

+#ifdef DEBUG

+  {

+    //

+    // Make sure authIn->uri is consistent with the channel's URI.

+    //

+    // XXX This check is probably not IDN safe, and it might incorrectly

+    //     fire as a result of escaping differences.  It's unclear what

+    //     kind of transforms GnomeVFS might have applied to the URI spec

+    //     that we originally gave to it.  In spite of the likelihood of

+    //     false hits, this check is probably still valuable.

+    //

+    nsAutoCString spec;

+    uri->GetSpec(spec);

+    int uriLen = strlen(authIn->uri);

+    if (!StringHead(spec, uriLen).Equals(nsDependentCString(authIn->uri, uriLen)))

+    {

+      LOG(("gnomevfs: [spec=%s authIn->uri=%s]\n", spec.get(), authIn->uri));

+      NS_ERROR("URI mismatch");

+    }

+  }

+#endif

+

+  nsAutoCString scheme, hostPort;

+  uri->GetScheme(scheme);

+  uri->GetHostPort(hostPort);

+

+  // It doesn't make sense for either of these strings to be empty.  What kind

+  // of funky URI is this?

+  if (scheme.IsEmpty() || hostPort.IsEmpty())

+    return;

+

+  // Construct the single signon key.  Altering the value of this key will

+  // cause people's remembered passwords to be forgotten.  Think carefully

+  // before changing the way this key is constructed.

+  nsAutoString key, realm;

+

+  NS_ConvertUTF8toUTF16 dispHost(scheme);

+  dispHost.AppendLiteral("://");

+  dispHost.Append(NS_ConvertUTF8toUTF16(hostPort));

+

+  key = dispHost;

+  if (authIn->realm)

+  {

+    // We assume the realm string is ASCII.  That might be a bogus assumption,

+    // but we have no idea what encoding GnomeVFS is using, so for now we'll

+    // limit ourselves to ISO-Latin-1.  XXX What is a better solution?

+    realm.Append('"');

+    realm.Append(NS_ConvertASCIItoUTF16(authIn->realm));

+    realm.Append('"');

+    key.Append(' ');

+    key.Append(realm);

+  }

+

+  // Construct the message string...

+  //

+  // We use Necko's string bundle here.  This code really should be encapsulated

+  // behind some Necko API, after all this code is based closely on the code in

+  // nsHttpChannel.cpp.

+

+  nsCOMPtr<nsIStringBundleService> bundleSvc =

+      do_GetService(NS_STRINGBUNDLE_CONTRACTID);

+  if (!bundleSvc)

+    return;

+

+  nsCOMPtr<nsIStringBundle> bundle;

+  bundleSvc->CreateBundle("chrome://global/locale/commonDialogs.properties",

+                          getter_AddRefs(bundle));

+  if (!bundle)

+    return;

+

+  nsString message;

+  if (!realm.IsEmpty())

+  {

+    const char16_t *strings[] = { realm.get(), dispHost.get() };

+    bundle->FormatStringFromName(MOZ_UTF16("EnterUserPasswordForRealm"),

+                                 strings, 2, getter_Copies(message));

+  }

+  else

+  {

+    const char16_t *strings[] = { dispHost.get() };

+    bundle->FormatStringFromName(MOZ_UTF16("EnterUserPasswordFor"),

+                                 strings, 1, getter_Copies(message));

+  }

+  if (message.IsEmpty())

+    return;

+

+  // Prompt the user...

+  nsresult rv;

+  bool retval = false;

+  char16_t *user = nullptr, *pass = nullptr;

+

+  rv = prompt->PromptUsernameAndPassword(nullptr, message.get(),

+                                         key.get(),

+                                         nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY,

+                                         &user, &pass, &retval);

+  if (NS_FAILED(rv))

+    return;

+  if (!retval || !user || !pass)

+    return;

+

+  // XXX We need to convert the UTF-16 username and password from our dialog to

+  // strings that GnomeVFS can understand.  It's unclear what encoding GnomeVFS

+  // expects, so for now we assume 7-bit ASCII.  Hopefully, we can get a better

+  // solution at some point.

+

+  // One copy is never enough...

+  authOut->username = g_strdup(NS_LossyConvertUTF16toASCII(user).get());

+  authOut->password = g_strdup(NS_LossyConvertUTF16toASCII(pass).get());

+

+  nsMemory::Free(user);

+  nsMemory::Free(pass);

+}

+

+struct nsGnomeVFSAuthCallbackEvent : public nsRunnable

+{

+  gconstpointer in;

+  gsize         in_size;

+  gpointer      out;

+  gsize         out_size;

+  gpointer      callback_data;

+

+  NS_IMETHOD Run() {

+    ProxiedAuthCallback(in, in_size, out, out_size, callback_data);

+    return NS_OK;

+  }

+};

+

+static void

+AuthCallback(gconstpointer in,

+             gsize         in_size,

+             gpointer      out,

+             gsize         out_size,

+             gpointer      callback_data)

+{

+  // Need to proxy this callback over to the main thread.  Synchronous dispatch

+  // is required in order to provide data to the GnomeVFS callback.

+

+  nsRefPtr<nsGnomeVFSAuthCallbackEvent> ev = new nsGnomeVFSAuthCallbackEvent();

+  if (!ev)

+    return;  // OOM

+

+  ev->in = in;

+  ev->in_size = in_size;

+  ev->out = out;

+  ev->out_size = out_size;

+  ev->callback_data = callback_data;

+

+  NS_DispatchToMainThread(ev, NS_DISPATCH_SYNC);

+}

+

+//-----------------------------------------------------------------------------

+

+static gint

+FileInfoComparator(gconstpointer a, gconstpointer b)

+{

+  const GnomeVFSFileInfo *ia = (const GnomeVFSFileInfo *) a;

+  const GnomeVFSFileInfo *ib = (const GnomeVFSFileInfo *) b;

+

+  return strcasecmp(ia->name, ib->name);

+}

+

+//-----------------------------------------------------------------------------

+

+class nsGnomeVFSInputStream : public nsIInputStream

+{

+  public:

+    NS_DECL_THREADSAFE_ISUPPORTS

+    NS_DECL_NSIINPUTSTREAM

+

+    nsGnomeVFSInputStream(const nsCString &uriSpec)

+      : mSpec(uriSpec)

+      , mChannel(nullptr)

+      , mHandle(nullptr)

+      , mBytesRemaining(UINT64_MAX)

+      , mStatus(NS_OK)

+      , mDirList(nullptr)

+      , mDirListPtr(nullptr)

+      , mDirBufCursor(0)

+      , mDirOpen(false) {}

+

+   ~nsGnomeVFSInputStream() { Close(); }

+

+    void SetChannel(nsIChannel *channel)

+    {

+      // We need to hold an owning reference to our channel.  This is done

+      // so we can access the channel's notification callbacks to acquire

+      // a reference to a nsIAuthPrompt if we need to handle a GnomeVFS

+      // authentication callback.

+      //

+      // However, the channel can only be accessed on the main thread, so

+      // we have to be very careful with ownership.  Moreover, it doesn't

+      // support threadsafe addref/release, so proxying is the answer.

+      //

+      // Also, it's important to note that this likely creates a reference

+      // cycle since the channel likely owns this stream.  This reference

+      // cycle is broken in our Close method.

+

+      NS_ADDREF(mChannel = channel);

+    }

+

+  private:

+    GnomeVFSResult DoOpen();

+    GnomeVFSResult DoRead(char *aBuf, uint32_t aCount, uint32_t *aCountRead);

+    nsresult       SetContentTypeOfChannel(const char *contentType);

+

+  private:

+    nsCString                mSpec;

+    nsIChannel              *mChannel; // manually refcounted

+    GnomeVFSHandle          *mHandle;

+    uint64_t                 mBytesRemaining;

+    nsresult                 mStatus;

+    GList                   *mDirList;

+    GList                   *mDirListPtr;

+    nsCString                mDirBuf;

+    uint32_t                 mDirBufCursor;

+    bool                     mDirOpen;

+};

+

+GnomeVFSResult

+nsGnomeVFSInputStream::DoOpen()

+{

+  GnomeVFSResult rv;

+

+  NS_ASSERTION(mHandle == nullptr, "already open");

+

+  // Push a callback handler on the stack for this thread, so we can intercept

+  // authentication requests from GnomeVFS.  We'll use the channel to get a

+  // nsIAuthPrompt instance.

+

+  gnome_vfs_module_callback_push(GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION,

+                                 AuthCallback, mChannel, nullptr);

+

+  // Query the mime type first (this could return nullptr). 

+  //

+  // XXX We need to do this up-front in order to determine how to open the URI.

+  //     Unfortunately, the error code GNOME_VFS_ERROR_IS_DIRECTORY is not

+  //     always returned by gnome_vfs_open when we pass it a URI to a directory!

+  //     Otherwise, we could have used that as a way to failover to opening the

+  //     URI as a directory.  Also, it would have been ideal if

+  //     gnome_vfs_get_file_info_from_handle were actually implemented by the

+  //     smb:// module, since that would have allowed us to potentially save a

+  //     round trip to the server to discover the mime type of the document in

+  //     the case where gnome_vfs_open would have been used.  (Oh well!  /me

+  //     throws hands up in the air and moves on...)

+

+  GnomeVFSFileInfo info = {0};

+  rv = gnome_vfs_get_file_info(mSpec.get(), &info, GnomeVFSFileInfoOptions(

+                               GNOME_VFS_FILE_INFO_DEFAULT |

+                               GNOME_VFS_FILE_INFO_FOLLOW_LINKS));

+  if (rv == GNOME_VFS_OK)

+  {

+    if (info.type == GNOME_VFS_FILE_TYPE_DIRECTORY)

+    {

+      rv = gnome_vfs_directory_list_load(&mDirList, mSpec.get(),

+                                         GNOME_VFS_FILE_INFO_DEFAULT);

+

+      LOG(("gnomevfs: gnome_vfs_directory_list_load returned %d (%s) [spec=\"%s\"]\n",

+          rv, gnome_vfs_result_to_string(rv), mSpec.get()));

+    }

+    else

+    {

+      rv = gnome_vfs_open(&mHandle, mSpec.get(), GNOME_VFS_OPEN_READ);

+

+      LOG(("gnomevfs: gnome_vfs_open returned %d (%s) [spec=\"%s\"]\n",

+          rv, gnome_vfs_result_to_string(rv), mSpec.get()));

+    }

+  }

+

+  gnome_vfs_module_callback_pop(GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION);

+

+  if (rv == GNOME_VFS_OK)

+  {

+    if (mHandle)

+    {

+      // Here we set the content type of the channel to the value of the mime

+      // type determined by GnomeVFS.  However, if GnomeVFS is telling us that

+      // the document is binary, we'll ignore that and keep the channel's

+      // content type unspecified.  That will enable our content type sniffing

+      // algorithms.  This should provide more consistent mime type handling.

+

+      if (info.mime_type && (strcmp(info.mime_type, APPLICATION_OCTET_STREAM) != 0))

+        SetContentTypeOfChannel(info.mime_type);

+

+      mBytesRemaining = info.size;

+

+      // Update the content length attribute on the channel.  We do this

+      // synchronously without proxying.  This hack is not as bad as it looks!

+      if (mBytesRemaining > INT64_MAX) {

+        mChannel->SetContentLength(-1);

+      } else {

+        mChannel->SetContentLength(mBytesRemaining);

+      }

+    }

+    else

+    {

+      mDirOpen = true;

+

+      // Sort mDirList

+      mDirList = g_list_sort(mDirList, FileInfoComparator);

+      mDirListPtr = mDirList;

+

+      // Write base URL (make sure it ends with a '/')

+      mDirBuf.AppendLiteral("300: ");

+      mDirBuf.Append(mSpec);

+      if (mSpec.get()[mSpec.Length() - 1] != '/')

+        mDirBuf.Append('/');

+      mDirBuf.Append('\n');

+

+      // Write column names

+      mDirBuf.AppendLiteral("200: filename content-length last-modified file-type\n");

+

+      // Write charset (assume UTF-8)

+      // XXX is this correct?

+      mDirBuf.AppendLiteral("301: UTF-8\n");

+

+      SetContentTypeOfChannel(APPLICATION_HTTP_INDEX_FORMAT);

+    }

+  }

+

+  gnome_vfs_file_info_clear(&info;;

+  return rv;

+}

+

+GnomeVFSResult

+nsGnomeVFSInputStream::DoRead(char *aBuf, uint32_t aCount, uint32_t *aCountRead)

+{

+  GnomeVFSResult rv;

+

+  if (mHandle)

+  {

+    GnomeVFSFileSize bytesRead;

+    rv = gnome_vfs_read(mHandle, aBuf, aCount, &bytesRead);

+    if (rv == GNOME_VFS_OK)

+    {

+      // aCount is 32-bit, so aCountRead is under 32-bit value.

+      *aCountRead = (uint32_t) bytesRead;

+      mBytesRemaining -= *aCountRead;

+    }

+  }

+  else if (mDirOpen)

+  {

+    rv = GNOME_VFS_OK;

+

+    while (aCount && rv != GNOME_VFS_ERROR_EOF)

+    {

+      // Copy data out of our buffer

+      uint32_t bufLen = mDirBuf.Length() - mDirBufCursor;

+      if (bufLen)

+      {

+        uint32_t n = std::min(bufLen, aCount);

+        memcpy(aBuf, mDirBuf.get() + mDirBufCursor, n);

+        *aCountRead += n;

+        aBuf += n;

+        aCount -= n;

+        mDirBufCursor += n;

+      }

+

+      if (!mDirListPtr)    // Are we at the end of the directory list?

+      {

+        rv = GNOME_VFS_ERROR_EOF;

+      }

+      else if (aCount)     // Do we need more data?

+      {

+        GnomeVFSFileInfo *info = (GnomeVFSFileInfo *) mDirListPtr->data;

+

+        // Prune '.' and '..' from directory listing.

+        if (info->name[0] == '.' &&

+               (info->name[1] == '\0' ||

+                   (info->name[1] == '.' && info->name[2] == '\0')))

+        {

+          mDirListPtr = mDirListPtr->next;

+          continue;

+        }

+

+        mDirBuf.AssignLiteral("201: ");

+

+        // The "filename" field

+        nsCString escName;

+        nsCOMPtr<nsINetUtil> nu = do_GetService(NS_NETUTIL_CONTRACTID);

+        if (nu) {

+          nu->EscapeString(nsDependentCString(info->name),

+                           nsINetUtil::ESCAPE_URL_PATH, escName);

+

+          mDirBuf.Append(escName);

+          mDirBuf.Append(' ');

+        }

+

+        // The "content-length" field

+        // XXX truncates size from 64-bit to 32-bit

+        mDirBuf.AppendInt(int32_t(info->size));

+        mDirBuf.Append(' ');

+

+        // The "last-modified" field

+        // 

+        // NSPR promises: PRTime is compatible with time_t

+        // we just need to convert from seconds to microseconds

+        PRExplodedTime tm;

+        PRTime pt = ((PRTime) info->mtime) * 1000000;

+        PR_ExplodeTime(pt, PR_GMTParameters, &tm;;

+        {

+          char buf[64];

+          PR_FormatTimeUSEnglish(buf, sizeof(buf),

+              "%a,%%20%d%%20%b%%20%Y%%20%H:%M:%S%%20GMT ", &tm;;

+          mDirBuf.Append(buf);

+        }

+

+        // The "file-type" field

+        switch (info->type)

+        {

+          case GNOME_VFS_FILE_TYPE_REGULAR:

+            mDirBuf.AppendLiteral("FILE ");

+            break;

+          case GNOME_VFS_FILE_TYPE_DIRECTORY:

+            mDirBuf.AppendLiteral("DIRECTORY ");

+            break;

+          case GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK:

+            mDirBuf.AppendLiteral("SYMBOLIC-LINK ");

+            break;

+          default:

+            break;

+        }

+

+        mDirBuf.Append('\n');