<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.kde.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.6"
          urlbase="https://bugs.kde.org/"
          
          maintainer="sysadmin@kde.org"
>

    <bug>
          <bug_id>145293</bug_id>
          
          <creation_ts>2007-05-11 00:58:29 +0000</creation_ts>
          <short_desc>Speed up scan for new images in kphotoalbum</short_desc>
          <delta_ts>2007-07-22 23:58:06 +0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>2</classification_id>
          <classification>Applications</classification>
          <product>kphotoalbum</product>
          <component>Backend</component>
          <version>unspecified</version>
          <rep_platform>openSUSE</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>NOR</priority>
          <bug_severity>wishlist</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>0</everconfirmed>
          <reporter>rlk</reporter>
          <assigned_to name="KPhotoAlbum Bugs">kphotoalbum-bugs-null</assigned_to>
          
          
          <cf_commitlink></cf_commitlink>
          <cf_versionfixedin></cf_versionfixedin>
          <cf_sentryurl></cf_sentryurl>
          <votes>0</votes>

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>525262</commentid>
    <comment_count>0</comment_count>
    <who name="">rlk</who>
    <bug_when>2007-05-11 00:58:29 +0000</bug_when>
    <thetext>Version:            (using KDE KDE 3.5.6)
Installed from:    SuSE RPMs

Scanning for new images is very slow if the filesystem metadata isn&apos;t currently in memory.  This is because (among other things) the QDir class always stat&apos;s every file in the directory, which forces the inode to be pulled in off disk.  With 20000 files in my database, it takes a minute or two just to complete the scan.

In addition, there are certain file types we can ignore, because the raw decoder already ignores them in some cases.

With this patch, scanning for new images takes about 3 seconds on a cold system.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>525263</commentid>
    <comment_count>1</comment_count>
      <attachid>20532</attachid>
    <who name="">rlk</who>
    <bug_when>2007-05-11 00:59:03 +0000</bug_when>
    <thetext>Created attachment 20532
Patch to greatly speed up scanning for new images</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>525387</commentid>
    <comment_count>2</comment_count>
      <attachid>20544</attachid>
    <who name="">rlk</who>
    <bug_when>2007-05-12 01:31:44 +0000</bug_when>
    <thetext>Created attachment 20544
Patch to greatly speed up scanning for new images

Updated per review comments.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>537465</commentid>
    <comment_count>3</comment_count>
    <who name="">rlk</who>
    <bug_when>2007-07-22 17:22:15 +0000</bug_when>
    <thetext>Just a reminder that this patch is still in the queue -- it makes a tremendous difference to startup speed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>537481</commentid>
    <comment_count>4</comment_count>
    <who name="Jan Kundrát">jkt</who>
    <bug_when>2007-07-22 19:00:24 +0000</bug_when>
    <thetext>OK, some comments:

a) it isn&apos;t common in KPA&apos;s sources to use void for specifying &quot;no arguments&quot;
b) &quot;extensions&quot; in RAWImageDecoder::_skipThisFile is a duplicate of stuff from RAWImageDecoder::_mightDecode. I think it should be merged somewhere... (as already suggested by Shawn Wilden on the ML)
c) using an array of QString doesn&apos;t look C++-ish to me. I see it&apos;s already done in KPA&apos;s sources, but I wonder why? Is it for performance reasons? Why don&apos;t use QStringList?
d) I&apos;d use Set&lt;QString&gt; instead of QDict&lt;void&gt;
e) could you please sign the comment in FastDir with your name?
f) KPA uses private variable names prefixed by underscore, you use suffix (name_)
g) I&apos;ll try to make some Gentoo security dev look at the readdir calls</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>537491</commentid>
    <comment_count>5</comment_count>
    <who name="Jan Kundrát">jkt</who>
    <bug_when>2007-07-22 20:14:53 +0000</bug_when>
    <thetext>20:07 &lt;+p-y&gt; but since here you&apos;re using MAXNAMELEN, I think it&apos;s ok

So g) is solved.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>537509</commentid>
    <comment_count>6</comment_count>
    <who name="">rlk</who>
    <bug_when>2007-07-22 22:14:24 +0000</bug_when>
    <thetext>a) I see.  I don&apos;t agree with this practice but I&apos;ll make the change to be consistent.

b) I agree, I&apos;m working on factoring out the common bits.  It can&apos;t be entirely merged, but there&apos;s a lot that can be factored out.

c) I&apos;m going to fix this up in the process of doing (b) in this place.  I&apos;m not going to fix it elsewhere.

d) I agree, I&apos;m using QDict&lt;void&gt; because the caller (and its caller) already uses QDict&lt;void&gt; for the list of loaded files and I&apos;d prefer not to touch code outside of this change.

e) OK

f) OK</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>537511</commentid>
    <comment_count>7</comment_count>
      <attachid>21223</attachid>
    <who name="">rlk</who>
    <bug_when>2007-07-22 23:07:39 +0000</bug_when>
    <thetext>Created attachment 21223
Patch to greatly speed up scanning for new images

This addresses comments a-f above.

In addition, I&apos;ve added some additional suffixes to the list to be ignored (by
the raw decoder, at any rate) unconditionally, including HTML/XML files and
compressed files.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>537514</commentid>
    <comment_count>8</comment_count>
    <who name="Jan Kundrát">jkt</who>
    <bug_when>2007-07-22 23:58:03 +0000</bug_when>
    <thetext>SVN commit 691078 by jkt:

Speed up scan for new images by using readdir_r() instead of QDir. Patch by
Robert Krawitz, I&apos;ve just made three RAWImageDecoder::_fileSOMETHING() functions
private.

BUG: 145293


 M  +67 -6     DB/NewImageFinder.cpp  
 M  +120 -35   ImageManager/RawImageDecoder.cpp  
 M  +13 -1     ImageManager/RawImageDecoder.h  


--- branches/extragear/kde3/graphics/kphotoalbum/DB/NewImageFinder.cpp #691077:691078
@@ -20,7 +20,9 @@
 #include &lt;qfileinfo.h&gt;
 #include &quot;Settings/SettingsData.h&quot;
 #include &quot;Browser/BrowserWidget.h&quot;
-#include &lt;qdir.h&gt;
+#include &quot;ImageManager/RawImageDecoder.h&quot;
+#include &lt;sys/types.h&gt;
+#include &lt;dirent.h&gt;
 #include &quot;Utilities/Util.h&quot;
 #include &lt;qprogressdialog.h&gt;
 #include &lt;klocale.h&gt;
@@ -56,6 +58,59 @@
     return (!_pendingLoad.isEmpty()); // returns if new images was found.
 }
 
+// FastDir is used in place of QDir because QDir stat()s every file in
+// the directory, even if we tell it not to restrict anything.  When
+// scanning for new images, we don&apos;t want to look at files we already
+// have in our database, and we also don&apos;t want to look at files whose
+// names indicate that we don&apos;t care about them.  So what we do is
+// simply read the names from the directory and let the higher layers
+// decide what to do with them.
+//
+// On my sample database with ~20,000 images, this improves the time
+// to rescan for images on a cold system from about 100 seconds to
+// about 3 seconds.
+//
+// -- Robert Krawitz, rlk@alum.mit.edu 2007-07-22
+class FastDir
+{
+public:
+    FastDir(const QString &amp;path);
+    QStringList entryList() const;
+private:
+    const QString _path;
+};
+
+FastDir::FastDir(const QString &amp;path)
+  : _path(path)
+{
+}
+
+QStringList FastDir::entryList() const
+{
+    QStringList answer;
+    DIR *dir;
+    dirent *file;
+    dir = opendir( QFile::encodeName(_path) );
+    if ( !dir )
+	return answer; // cannot read the directory
+
+#if defined(QT_THREAD_SUPPORT) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN)
+    union dirent_buf {
+	struct dirent mt_file;
+	char b[sizeof(struct dirent) + MAXNAMLEN + 1];
+    } *u = new union dirent_buf;
+    while ( readdir_r(dir, &amp;(u-&gt;mt_file), &amp;file ) == 0 &amp;&amp; file )
+#else
+    while ( (file = readdir(dir)) )
+#endif // QT_THREAD_SUPPORT &amp;&amp; _POSIX_THREAD_SAFE_FUNCTIONS
+	answer.append(QFile::decodeName(file-&gt;d_name));
+#if defined(QT_THREAD_SUPPORT) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN)
+    delete u;
+#endif
+    (void) closedir(dir);
+    return answer;
+}
+
 void NewImageFinder::searchForNewFiles( const QDict&lt;void&gt;&amp; loadedFiles, QString directory )
 {
     if ( directory.endsWith( QString::fromLatin1(&quot;/&quot;) ) )
@@ -65,18 +120,24 @@
     if ( imageDir.endsWith( QString::fromLatin1(&quot;/&quot;) ) )
         imageDir = imageDir.mid( 0, imageDir.length()-1 );
 
-    QDir dir( directory );
-    QStringList dirList = dir.entryList( QDir::All );
+    FastDir dir( directory );
+    QStringList dirList = dir.entryList( );
+    ImageManager::RAWImageDecoder dec;
     for( QStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it ) {
         QString file = directory + QString::fromLatin1(&quot;/&quot;) + *it;
-        QFileInfo fi( file );
         if ( (*it) == QString::fromLatin1(&quot;.&quot;) || (*it) == QString::fromLatin1(&quot;..&quot;) ||
              (*it) == QString::fromLatin1(&quot;ThumbNails&quot;) ||
              (*it) == QString::fromLatin1(&quot;CategoryImages&quot;) ||
-             !fi.isReadable() )
+	     loadedFiles.find( file ) ||
+	     dec._skipThisFile(loadedFiles, file) )
             continue;
 
-        if ( fi.isFile() &amp;&amp; loadedFiles.find( file ) == 0) {
+        QFileInfo fi( file );
+
+	if ( !fi.isReadable() )
+	    continue;
+
+        if ( fi.isFile() ) {
             QString baseName = file.mid( imageDir.length()+1 );
             if ( ! DB::ImageDB::instance()-&gt;isBlocking( baseName ) ) {
                 if ( Utilities::canReadImage(file) )
--- branches/extragear/kde3/graphics/kphotoalbum/ImageManager/RawImageDecoder.cpp #691077:691078
@@ -21,6 +21,7 @@
 #include &lt;qfile.h&gt;
 #include &lt;qimage.h&gt;
 #include &lt;qwmatrix.h&gt;
+#include &lt;qstringlist.h&gt;
 #include &quot;Settings/SettingsData.h&quot;
 
 /* Main entry point into raw parser */
@@ -54,46 +55,130 @@
   return true;
 }
 
-bool RAWImageDecoder::_mightDecode( const QString&amp; imageFile )
+QStringList RAWImageDecoder::_rawExtensions;
+QStringList RAWImageDecoder::_standardExtensions;
+QStringList RAWImageDecoder::_ignoredExtensions;
+
+void RAWImageDecoder::_initializeExtensionLists()
 {
-	/* Known RAW file extensions. TODO: Complete */
-	static const QString extensions[] = { QString::fromLatin1(&quot;crw&quot;),
-										  QString::fromLatin1(&quot;cr2&quot;),
-										  QString::fromLatin1(&quot;nef&quot;),
-										  QString::fromLatin1(&quot;bay&quot;),
-										  QString::fromLatin1(&quot;mos&quot;),
-										  QString::fromLatin1(&quot;mrw&quot;),
-										  QString::fromLatin1(&quot;orf&quot;),
-										  QString::fromLatin1(&quot;cs1&quot;),
-										  QString::fromLatin1(&quot;dc2&quot;),
-										  QString::fromLatin1(&quot;kdc&quot;),
-										  QString::fromLatin1(&quot;raf&quot;),
-										  QString::fromLatin1(&quot;rdc&quot;),
-										  QString::fromLatin1(&quot;x3f&quot;),
-										  QString::fromLatin1(&quot;erf&quot;),
-										  QString::fromLatin1(&quot;pef&quot;),
-										  QString::null };
-	if (Settings::SettingsData::instance()-&gt;dontReadRawFilesWithOtherMatchingFile()) {
-            static const QString standardExtensions[] = {
-                QString::fromLatin1(&quot;jpg&quot;),
-                QString::fromLatin1(&quot;JPG&quot;),
-                QString::fromLatin1(&quot;tif&quot;),
-                QString::fromLatin1(&quot;TIF&quot;),
-                QString::fromLatin1(&quot;png&quot;),
-                QString::fromLatin1(&quot;PNG&quot;),
-                QString::null };
-            QString baseFileName = imageFile;
-            baseFileName.remove(baseFileName.length() - 3, 3);
-            for (int i = 0; !standardExtensions[i].isNull(); ++i) {
-                if (QFile::exists(baseFileName + standardExtensions[i]))
-                    return false;
-            }
+  static bool extensionListsInitialized = 0;
+  if (! extensionListsInitialized) {
+    /* Known RAW file extensions. TODO: Complete */
+    _rawExtensions &lt;&lt; QString::fromLatin1(&quot;crw&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;cr2&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;nef&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;bay&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;mos&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;mrw&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;orf&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;cs1&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;dc2&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;kdc&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;raf&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;rdc&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;x3f&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;erf&quot;)
+		   &lt;&lt; QString::fromLatin1(&quot;pef&quot;);
+    _standardExtensions &lt;&lt; QString::fromLatin1(&quot;jpg&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;JPG&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;jpeg&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;JPEG&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;tif&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;TIF&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;tiff&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;TIFF&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;png&quot;)
+			&lt;&lt; QString::fromLatin1(&quot;PNG&quot;);
+    _ignoredExtensions &lt;&lt; QString::fromLatin1(&quot;thm&quot;) // Thumbnails
+		       &lt;&lt; QString::fromLatin1(&quot;THM&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;thumb&quot;) // thumbnail files
+						       // from dcraw
+		       &lt;&lt; QString::fromLatin1(&quot;ctg&quot;) // Catalog files
+		       &lt;&lt; QString::fromLatin1(&quot;gz&quot;) // Compressed files
+		       &lt;&lt; QString::fromLatin1(&quot;Z&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;bz2&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;zip&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;xml&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;XML&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;html&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;HTML&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;htm&quot;)
+		       &lt;&lt; QString::fromLatin1(&quot;HTM&quot;);
+    extensionListsInitialized = 1;
+  }
+}
+
+bool RAWImageDecoder::_fileExistsWithExtensions( const QString&amp; fileName,
+						const QStringList&amp; extensionList) const
+{
+	QString baseFileName = fileName;
+	int extStart = fileName.findRev(&apos;.&apos;) + 1;
+	// We&apos;re interested in xxx.yyy, not .yyy
+	if (extStart &lt;= 1) return false;
+	baseFileName.remove(extStart, baseFileName.length() - extStart);
+	for ( QStringList::ConstIterator it = extensionList.begin();
+	      it != extensionList.end(); ++it ) {
+	    if (QFile::exists(baseFileName + *it)) return true;
 	}
+	return false;
+}
 
-	for( int i = 0; !extensions[i].isNull(); ++i ) {
-		if( imageFile.endsWith( extensions[i], false ) ) return true;
+bool RAWImageDecoder::_fileIsKnownWithExtensions( const QDict&lt;void&gt;&amp; files,
+						 const QString&amp; fileName,
+						 const QStringList&amp; extensionList) const
+{
+	QString baseFileName = fileName;
+	int extStart = fileName.findRev(&apos;.&apos;) + 1;
+	if (extStart &lt;= 1) return false;
+	baseFileName.remove(extStart, baseFileName.length() - extStart);
+	for ( QStringList::ConstIterator it = extensionList.begin();
+	      it != extensionList.end(); ++it ) {
+	    if (files.find(baseFileName + *it) ) return true;
 	}
 	return false;
 }
 
+bool RAWImageDecoder::_fileEndsWithExtensions( const QString&amp; fileName,
+					      const QStringList&amp; extensionList) const
+{
+	for ( QStringList::ConstIterator it = extensionList.begin();
+	      it != extensionList.end(); ++it ) {
+	    if( fileName.endsWith( *it, false ) ) return true;
+	}
+	return false;
 }
+
+bool RAWImageDecoder::_mightDecode( const QString&amp; imageFile )
+{
+	if (Settings::SettingsData::instance()-&gt;dontReadRawFilesWithOtherMatchingFile() &amp;&amp;
+	    _fileExistsWithExtensions(imageFile, _standardExtensions)) return false;
+	if (_fileEndsWithExtensions(imageFile, _rawExtensions)) return true;
+	return false;
+}
+
+bool RAWImageDecoder::_skipThisFile( const QDict&lt;void&gt;&amp; loadedFiles, const QString&amp; imageFile )
+{
+	// We&apos;re not interested in thumbnail and other files.
+	if (_fileEndsWithExtensions(imageFile, _ignoredExtensions)) return true;
+
+	// If we *are* interested in raw files even when other equivalent
+	// non-raw files are available, then we&apos;re interested in this file.
+	if (! (Settings::SettingsData::instance()-&gt;dontReadRawFilesWithOtherMatchingFile())) return false;
+
+	// If the file ends with something other than a known raw extension,
+	// we&apos;re interested in it.
+	if (! _fileEndsWithExtensions(imageFile, _rawExtensions)) return false;
+
+	// At this point, the file ends with a known raw extension, and we&apos;re
+	// not interested in raw files when other non-raw files are available.
+	// So search for an existing file with one of the standard
+	// extensions.
+	//
+	// This may not be the best way to do this, but it&apos;s using the
+	// same algorithm as _mightDecode above.
+	// -- Robert Krawitz rlk@alum.mit.edu 2007-07-22
+
+	return _fileIsKnownWithExtensions(loadedFiles, imageFile, _standardExtensions);
+}
+
+}
--- branches/extragear/kde3/graphics/kphotoalbum/ImageManager/RawImageDecoder.h #691077:691078
@@ -19,16 +19,28 @@
 #define RAWIMAGEDECODER_H
 
 #include &quot;ImageDecoder.h&quot;
+#include &lt;qdict.h&gt;
 
 namespace ImageManager
 {
 
 class RAWImageDecoder : public ImageDecoder {
 public:
-	RAWImageDecoder() {}
+	RAWImageDecoder() { _initializeExtensionLists(); }
 
 	virtual bool _decode(QImage *img, const QString&amp; imageFile, QSize* fullSize, int dim=-1);
 	virtual bool _mightDecode( const QString&amp; imageFile );
+	virtual bool _skipThisFile( const QDict&lt;void&gt;&amp; loadedFiles, const QString&amp; imageFile );
+
+private:
+	bool _fileExistsWithExtensions( const QString&amp; fileName, const QStringList&amp; extensionList ) const;
+	bool _fileEndsWithExtensions( const QString&amp; fileName, const QStringList&amp; extensionList ) const;
+	bool _fileIsKnownWithExtensions( const QDict&lt;void&gt;&amp; files, const QString&amp; fileName, const QStringList&amp; extensionList ) const;
+
+	static QStringList _rawExtensions;
+	static QStringList _standardExtensions;
+	static QStringList _ignoredExtensions;
+	static void _initializeExtensionLists();
 };
 
 }
</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>20532</attachid>
            <date>2007-05-11 00:59:03 +0000</date>
            <delta_ts>2007-05-12 01:31:44 +0000</delta_ts>
            <desc>Patch to greatly speed up scanning for new images</desc>
            <filename>scan-speedup.patch</filename>
            <type>text/plain</type>
            <size>5871</size>
            <attacher>rlk</attacher>
            
              <data encoding="base64">SW5kZXg6IERCL05ld0ltYWdlRmluZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBEQi9OZXdJbWFnZUZp
bmRlci5jcHAJKHJldmlzaW9uIDY2MzM0MikKKysrIERCL05ld0ltYWdlRmluZGVyLmNwcAkod29y
a2luZyBjb3B5KQpAQCAtMjAsNyArMjAsOSBAQAogI2luY2x1ZGUgPHFmaWxlaW5mby5oPgogI2lu
Y2x1ZGUgIlNldHRpbmdzL1NldHRpbmdzRGF0YS5oIgogI2luY2x1ZGUgIkJyb3dzZXIvQnJvd3Nl
cldpZGdldC5oIgotI2luY2x1ZGUgPHFkaXIuaD4KKyNpbmNsdWRlICJJbWFnZU1hbmFnZXIvUmF3
SW1hZ2VEZWNvZGVyLmgiCisjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CisjaW5jbHVkZSA8ZGlyZW50
Lmg+CiAjaW5jbHVkZSAiVXRpbGl0aWVzL1V0aWwuaCIKICNpbmNsdWRlIDxxcHJvZ3Jlc3NkaWFs
b2cuaD4KICNpbmNsdWRlIDxrbG9jYWxlLmg+CkBAIC01Niw2ICs1OCw1NCBAQAogICAgIHJldHVy
biAoIV9wZW5kaW5nTG9hZC5pc0VtcHR5KCkpOyAvLyByZXR1cm5zIGlmIG5ldyBpbWFnZXMgd2Fz
IGZvdW5kLgogfQogCitjbGFzcyBNeURpcgoreworcHVibGljOgorICAgIE15RGlyKCk7CisgICAg
TXlEaXIoY29uc3QgUVN0cmluZyAmcGF0aCk7CisgICAgdmlydHVhbCBRU3RyaW5nTGlzdCBlbnRy
eUxpc3Qodm9pZCkgY29uc3Q7CisgICAgdmlydHVhbCB+TXlEaXIoKTsKK3ByaXZhdGU6CisgICAg
UVN0cmluZyBwYXRoXzsKK307CisKK015RGlyOjpNeURpcigpCisgIDogcGF0aF8oUVN0cmluZzo6
ZnJvbUxhdGluMSgiLiIpKQoreworfQorCitNeURpcjo6TXlEaXIoY29uc3QgUVN0cmluZyAmcGF0
aCkKKyAgOiBwYXRoXyhwYXRoKQoreworfQorCitNeURpcjo6fk15RGlyKCkKK3sKK30KKworUVN0
cmluZ0xpc3QgTXlEaXI6OmVudHJ5TGlzdCh2b2lkKSBjb25zdAoreworICAgIFFTdHJpbmdMaXN0
IGFuc3dlcjsKKyAgICBESVIgKmRpcjsKKyAgICBkaXJlbnQgKmZpbGU7CisgICAgZGlyID0gb3Bl
bmRpciggUUZpbGU6OmVuY29kZU5hbWUocGF0aF8pICk7CisgICAgaWYgKCAhZGlyICkKKwlyZXR1
cm4gYW5zd2VyOyAvLyBjYW5ub3QgcmVhZCB0aGUgZGlyZWN0b3J5CisKKyNpZiBkZWZpbmVkKFFU
X1RIUkVBRF9TVVBQT1JUKSAmJiBkZWZpbmVkKF9QT1NJWF9USFJFQURfU0FGRV9GVU5DVElPTlMp
ICYmICFkZWZpbmVkKFFfT1NfQ1lHV0lOKQorICAgIHVuaW9uIHsKKwlzdHJ1Y3QgZGlyZW50IG10
X2ZpbGU7CisJY2hhciBiW3NpemVvZihzdHJ1Y3QgZGlyZW50KSArIE1BWE5BTUxFTiArIDFdOwor
ICAgIH0gdTsKKyAgICB3aGlsZSAoIHJlYWRkaXJfcihkaXIsICZ1Lm10X2ZpbGUsICZmaWxlICkg
PT0gMCAmJiBmaWxlICkKKyNlbHNlCisgICAgd2hpbGUgKCAoZmlsZSA9IHJlYWRkaXIoZGlyKSkg
KQorI2VuZGlmIC8vIFFUX1RIUkVBRF9TVVBQT1JUICYmIF9QT1NJWF9USFJFQURfU0FGRV9GVU5D
VElPTlMKKwlhbnN3ZXIuYXBwZW5kKFFGaWxlOjpkZWNvZGVOYW1lKGZpbGUtPmRfbmFtZSkpOwor
ICAgICh2b2lkKSBjbG9zZWRpcihkaXIpOworICAgIHJldHVybiBhbnN3ZXI7Cit9CisKIHZvaWQg
TmV3SW1hZ2VGaW5kZXI6OnNlYXJjaEZvck5ld0ZpbGVzKCBjb25zdCBRRGljdDx2b2lkPiYgbG9h
ZGVkRmlsZXMsIFFTdHJpbmcgZGlyZWN0b3J5ICkKIHsKICAgICBpZiAoIGRpcmVjdG9yeS5lbmRz
V2l0aCggUVN0cmluZzo6ZnJvbUxhdGluMSgiLyIpICkgKQpAQCAtNjUsMTggKzExNSwyNCBAQAog
ICAgIGlmICggaW1hZ2VEaXIuZW5kc1dpdGgoIFFTdHJpbmc6OmZyb21MYXRpbjEoIi8iKSApICkK
ICAgICAgICAgaW1hZ2VEaXIgPSBpbWFnZURpci5taWQoIDAsIGltYWdlRGlyLmxlbmd0aCgpLTEg
KTsKIAotICAgIFFEaXIgZGlyKCBkaXJlY3RvcnkgKTsKLSAgICBRU3RyaW5nTGlzdCBkaXJMaXN0
ID0gZGlyLmVudHJ5TGlzdCggUURpcjo6QWxsICk7CisgICAgTXlEaXIgZGlyKCBkaXJlY3Rvcnkg
KTsKKyAgICBRU3RyaW5nTGlzdCBkaXJMaXN0ID0gZGlyLmVudHJ5TGlzdCggKTsKKyAgICBJbWFn
ZU1hbmFnZXI6OlJBV0ltYWdlRGVjb2RlciBkZWM7CiAgICAgZm9yKCBRU3RyaW5nTGlzdDo6SXRl
cmF0b3IgaXQgPSBkaXJMaXN0LmJlZ2luKCk7IGl0ICE9IGRpckxpc3QuZW5kKCk7ICsraXQgKSB7
CiAgICAgICAgIFFTdHJpbmcgZmlsZSA9IGRpcmVjdG9yeSArIFFTdHJpbmc6OmZyb21MYXRpbjEo
Ii8iKSArICppdDsKLSAgICAgICAgUUZpbGVJbmZvIGZpKCBmaWxlICk7CiAgICAgICAgIGlmICgg
KCppdCkgPT0gUVN0cmluZzo6ZnJvbUxhdGluMSgiLiIpIHx8ICgqaXQpID09IFFTdHJpbmc6OmZy
b21MYXRpbjEoIi4uIikgfHwKICAgICAgICAgICAgICAoKml0KSA9PSBRU3RyaW5nOjpmcm9tTGF0
aW4xKCJUaHVtYk5haWxzIikgfHwKICAgICAgICAgICAgICAoKml0KSA9PSBRU3RyaW5nOjpmcm9t
TGF0aW4xKCJDYXRlZ29yeUltYWdlcyIpIHx8Ci0gICAgICAgICAgICAgIWZpLmlzUmVhZGFibGUo
KSApCisJICAgICBsb2FkZWRGaWxlcy5maW5kKCBmaWxlICkgfHwKKwkgICAgIGRlYy5fc2tpcFRo
aXNGaWxlKGxvYWRlZEZpbGVzLCBmaWxlKSApCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAg
ICAgICBpZiAoIGZpLmlzRmlsZSgpICYmIGxvYWRlZEZpbGVzLmZpbmQoIGZpbGUgKSA9PSAwKSB7
CisgICAgICAgIFFGaWxlSW5mbyBmaSggZmlsZSApOworCisJaWYgKCAhZmkuaXNSZWFkYWJsZSgp
ICkKKwkgICAgY29udGludWU7CisKKyAgICAgICAgaWYgKCBmaS5pc0ZpbGUoKSApIHsKICAgICAg
ICAgICAgIFFTdHJpbmcgYmFzZU5hbWUgPSBmaWxlLm1pZCggaW1hZ2VEaXIubGVuZ3RoKCkrMSAp
OwogICAgICAgICAgICAgaWYgKCAhIERCOjpJbWFnZURCOjppbnN0YW5jZSgpLT5pc0Jsb2NraW5n
KCBiYXNlTmFtZSApICkgewogICAgICAgICAgICAgICAgIGlmICggVXRpbGl0aWVzOjpjYW5SZWFk
SW1hZ2UoZmlsZSkgKQpJbmRleDogU3VydmV5L1N1cnZleURpYWxvZy5jcHAKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU3VydmV5L1N1cnZleURpYWxvZy5jcHAJKHJldmlzaW9uIDY2MzM0MikKKysrIFN1cnZleS9T
dXJ2ZXlEaWFsb2cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NSw2ICs3NSw3IEBACiAKIHZvaWQg
U3VydmV5OjpTdXJ2ZXlEaWFsb2c6OmV4ZWMoKQogeworICAgIHJldHVybjsKICAgICBpZiAoICFk
LT5zdGFjayApIHsKICAgICAgICAgUVZCb3hMYXlvdXQqIHZsYXkgPSBuZXcgUVZCb3hMYXlvdXQo
IHRoaXMsIDYgKTsKIApJbmRleDogSW1hZ2VNYW5hZ2VyL1Jhd0ltYWdlRGVjb2Rlci5jcHAKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gSW1hZ2VNYW5hZ2VyL1Jhd0ltYWdlRGVjb2Rlci5jcHAJKHJldmlzaW9uIDY2
MzM0MikKKysrIEltYWdlTWFuYWdlci9SYXdJbWFnZURlY29kZXIuY3BwCSh3b3JraW5nIGNvcHkp
CkBAIC05NCw0ICs5NCw1MiBAQAogCXJldHVybiBmYWxzZTsKIH0KIAorYm9vbCBSQVdJbWFnZURl
Y29kZXI6Ol9za2lwVGhpc0ZpbGUoIGNvbnN0IFFEaWN0PHZvaWQ+JiBsb2FkZWRGaWxlcywgY29u
c3QgUVN0cmluZyYgaW1hZ2VGaWxlICkKK3sKKwkvKiBLbm93biBSQVcgZmlsZSBleHRlbnNpb25z
LiBUT0RPOiBDb21wbGV0ZSAqLworCXN0YXRpYyBjb25zdCBRU3RyaW5nIGV4dGVuc2lvbnNbXSA9
IHsgUVN0cmluZzo6ZnJvbUxhdGluMSgiY3J3IiksCisJCQkJCQkJCQkJICBRU3RyaW5nOjpmcm9t
TGF0aW4xKCJjcjIiKSwKKwkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEoIm5lZiIpLAor
CQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgiYmF5IiksCisJCQkJCQkJCQkJICBRU3Ry
aW5nOjpmcm9tTGF0aW4xKCJtb3MiKSwKKwkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEo
Im1ydyIpLAorCQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgib3JmIiksCisJCQkJCQkJ
CQkJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJjczEiKSwKKwkJCQkJCQkJCQkgIFFTdHJpbmc6OmZy
b21MYXRpbjEoImRjMiIpLAorCQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgia2RjIiks
CisJCQkJCQkJCQkJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJyYWYiKSwKKwkJCQkJCQkJCQkgIFFT
dHJpbmc6OmZyb21MYXRpbjEoInJkYyIpLAorCQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGlu
MSgieDNmIiksCisJCQkJCQkJCQkJICBRU3RyaW5nOjpudWxsIH07CisJaWYgKGltYWdlRmlsZS5l
bmRzV2l0aChRU3RyaW5nOjpmcm9tTGF0aW4xKCIudGhtIikpIHx8CisJICAgIGltYWdlRmlsZS5l
bmRzV2l0aChRU3RyaW5nOjpmcm9tTGF0aW4xKCIuVEhNIikpKQorCSAgcmV0dXJuIHRydWU7CisJ
aWYgKCEgKFNldHRpbmdzOjpTZXR0aW5nc0RhdGE6Omluc3RhbmNlKCktPmRvbnRSZWFkUmF3Rmls
ZXNXaXRoT3RoZXJNYXRjaGluZ0ZpbGUoKSkpCisJICByZXR1cm4gZmFsc2U7CisJYm9vbCBpc1Jh
dyA9IGZhbHNlOworCWZvciggaW50IGkgPSAwOyAhZXh0ZW5zaW9uc1tpXS5pc051bGwoKTsgKytp
ICkgeworCSAgaWYoIGltYWdlRmlsZS5lbmRzV2l0aCggZXh0ZW5zaW9uc1tpXSwgZmFsc2UgKSAp
IHsKKwkgICAgaXNSYXcgPSB0cnVlOworCSAgICBicmVhazsKKwkgIH0KKwl9CisJaWYgKCFpc1Jh
dykKKwkgIHJldHVybiBmYWxzZTsKKwlzdGF0aWMgY29uc3QgUVN0cmluZyBzdGFuZGFyZEV4dGVu
c2lvbnNbXSA9IHsKKwkgIFFTdHJpbmc6OmZyb21MYXRpbjEoImpwZyIpLAorCSAgUVN0cmluZzo6
ZnJvbUxhdGluMSgiSlBHIiksCisJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJ0aWYiKSwKKwkgIFFT
dHJpbmc6OmZyb21MYXRpbjEoIlRJRiIpLAorCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgicG5nIiks
CisJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJQTkciKSwKKwkgIFFTdHJpbmc6Om51bGwgfTsKKwlR
U3RyaW5nIGJhc2VGaWxlTmFtZSA9IGltYWdlRmlsZTsKKwliYXNlRmlsZU5hbWUucmVtb3ZlKGJh
c2VGaWxlTmFtZS5sZW5ndGgoKSAtIDMsIDMpOworCWZvciAoaW50IGkgPSAwOyAhc3RhbmRhcmRF
eHRlbnNpb25zW2ldLmlzTnVsbCgpOyArK2kpIHsKKwkgIGlmIChsb2FkZWRGaWxlcy5maW5kKGJh
c2VGaWxlTmFtZSArIHN0YW5kYXJkRXh0ZW5zaW9uc1tpXSkpCisJICAgIHJldHVybiB0cnVlOwor
CX0KKwlyZXR1cm4gZmFsc2U7CiB9CisKK30KSW5kZXg6IEltYWdlTWFuYWdlci9SYXdJbWFnZURl
Y29kZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBJbWFnZU1hbmFnZXIvUmF3SW1hZ2VEZWNvZGVyLmgJKHJl
dmlzaW9uIDY2MzM0MikKKysrIEltYWdlTWFuYWdlci9SYXdJbWFnZURlY29kZXIuaAkod29ya2lu
ZyBjb3B5KQpAQCAtMTksNiArMTksNyBAQAogI2RlZmluZSBSQVdJTUFHRURFQ09ERVJfSAogCiAj
aW5jbHVkZSAiSW1hZ2VEZWNvZGVyLmgiCisjaW5jbHVkZSA8cWRpY3QuaD4KIAogbmFtZXNwYWNl
IEltYWdlTWFuYWdlcgogewpAQCAtMjksNiArMzAsNyBAQAogCiAJdmlydHVhbCBib29sIF9kZWNv
ZGUoUUltYWdlICppbWcsIGNvbnN0IFFTdHJpbmcmIGltYWdlRmlsZSwgUVNpemUqIGZ1bGxTaXpl
LCBpbnQgZGltPS0xKTsKIAl2aXJ0dWFsIGJvb2wgX21pZ2h0RGVjb2RlKCBjb25zdCBRU3RyaW5n
JiBpbWFnZUZpbGUgKTsKKwl2aXJ0dWFsIGJvb2wgX3NraXBUaGlzRmlsZSggY29uc3QgUURpY3Q8
dm9pZD4mIGxvYWRlZEZpbGVzLCBjb25zdCBRU3RyaW5nJiBpbWFnZUZpbGUgKTsKIH07CiAKIH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>20544</attachid>
            <date>2007-05-12 01:31:44 +0000</date>
            <delta_ts>2007-07-22 23:07:40 +0000</delta_ts>
            <desc>Patch to greatly speed up scanning for new images</desc>
            <filename>scan-speedup-2.patch</filename>
            <type>text/plain</type>
            <size>6195</size>
            <attacher>rlk</attacher>
            
              <data encoding="base64">SW5kZXg6IERCL05ld0ltYWdlRmluZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBEQi9OZXdJbWFnZUZp
bmRlci5jcHAJKHJldmlzaW9uIDY2MzM0MikKKysrIERCL05ld0ltYWdlRmluZGVyLmNwcAkod29y
a2luZyBjb3B5KQpAQCAtMjAsNyArMjAsOSBAQAogI2luY2x1ZGUgPHFmaWxlaW5mby5oPgogI2lu
Y2x1ZGUgIlNldHRpbmdzL1NldHRpbmdzRGF0YS5oIgogI2luY2x1ZGUgIkJyb3dzZXIvQnJvd3Nl
cldpZGdldC5oIgotI2luY2x1ZGUgPHFkaXIuaD4KKyNpbmNsdWRlICJJbWFnZU1hbmFnZXIvUmF3
SW1hZ2VEZWNvZGVyLmgiCisjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CisjaW5jbHVkZSA8ZGlyZW50
Lmg+CiAjaW5jbHVkZSAiVXRpbGl0aWVzL1V0aWwuaCIKICNpbmNsdWRlIDxxcHJvZ3Jlc3NkaWFs
b2cuaD4KICNpbmNsdWRlIDxrbG9jYWxlLmg+CkBAIC01Niw2ICs1OCw1NyBAQAogICAgIHJldHVy
biAoIV9wZW5kaW5nTG9hZC5pc0VtcHR5KCkpOyAvLyByZXR1cm5zIGlmIG5ldyBpbWFnZXMgd2Fz
IGZvdW5kLgogfQogCisvLyBGYXN0RGlyIGlzIHVzZWQgaW4gcGxhY2Ugb2YgUURpciBiZWNhdXNl
IFFEaXIgc3RhdCgpcyBldmVyeSBmaWxlIGluCisvLyB0aGUgZGlyZWN0b3J5LCBldmVuIGlmIHdl
IHRlbGwgaXQgbm90IHRvIHJlc3RyaWN0IGFueXRoaW5nLiAgV2hlbgorLy8gc2Nhbm5pbmcgZm9y
IG5ldyBpbWFnZXMsIHdlIGRvbid0IHdhbnQgdG8gbG9vayBhdCBmaWxlcyB3ZSBhbHJlYWR5Cisv
LyBoYXZlIGluIG91ciBkYXRhYmFzZSwgYW5kIHdlIGFsc28gZG9uJ3Qgd2FudCB0byBsb29rIGF0
IGZpbGVzIHdob3NlCisvLyBuYW1lcyBpbmRpY2F0ZSB0aGF0IHdlIGRvbid0IGNhcmUgYWJvdXQg
dGhlbS4gIFNvIHdoYXQgd2UgZG8gaXMKKy8vIHNpbXBseSByZWFkIHRoZSBuYW1lcyBmcm9tIHRo
ZSBkaXJlY3RvcnkgYW5kIGxldCB0aGUgaGlnaGVyIGxheWVycworLy8gZGVjaWRlIHdoYXQgdG8g
ZG8gd2l0aCB0aGVtLgorLy8KKy8vIE9uIG15IHNhbXBsZSBkYXRhYmFzZSB3aXRoIH4yMCwwMDAg
aW1hZ2VzLCB0aGlzIGltcHJvdmVzIHRoZSB0aW1lCisvLyB0byByZXNjYW4gZm9yIGltYWdlcyBv
biBhIGNvbGQgc3lzdGVtIGZyb20gYWJvdXQgMTAwIHNlY29uZHMgdG8KKy8vIGFib3V0IDMgc2Vj
b25kcy4KK2NsYXNzIEZhc3REaXIKK3sKK3B1YmxpYzoKKyAgICBGYXN0RGlyKGNvbnN0IFFTdHJp
bmcgJnBhdGgpOworICAgIFFTdHJpbmdMaXN0IGVudHJ5TGlzdCh2b2lkKSBjb25zdDsKK3ByaXZh
dGU6CisgICAgY29uc3QgUVN0cmluZyBwYXRoXzsKK307CisKK0Zhc3REaXI6OkZhc3REaXIoY29u
c3QgUVN0cmluZyAmcGF0aCkKKyAgOiBwYXRoXyhwYXRoKQoreworfQorCitRU3RyaW5nTGlzdCBG
YXN0RGlyOjplbnRyeUxpc3Qodm9pZCkgY29uc3QKK3sKKyAgICBRU3RyaW5nTGlzdCBhbnN3ZXI7
CisgICAgRElSICpkaXI7CisgICAgZGlyZW50ICpmaWxlOworICAgIGRpciA9IG9wZW5kaXIoIFFG
aWxlOjplbmNvZGVOYW1lKHBhdGhfKSApOworICAgIGlmICggIWRpciApCisJcmV0dXJuIGFuc3dl
cjsgLy8gY2Fubm90IHJlYWQgdGhlIGRpcmVjdG9yeQorCisjaWYgZGVmaW5lZChRVF9USFJFQURf
U1VQUE9SVCkgJiYgZGVmaW5lZChfUE9TSVhfVEhSRUFEX1NBRkVfRlVOQ1RJT05TKSAmJiAhZGVm
aW5lZChRX09TX0NZR1dJTikKKyAgICB1bmlvbiBkaXJlbnRfYnVmIHsKKwlzdHJ1Y3QgZGlyZW50
IG10X2ZpbGU7CisJY2hhciBiW3NpemVvZihzdHJ1Y3QgZGlyZW50KSArIE1BWE5BTUxFTiArIDFd
OworICAgIH0gKnUgPSBuZXcgdW5pb24gZGlyZW50X2J1ZjsKKyAgICB3aGlsZSAoIHJlYWRkaXJf
cihkaXIsICYodS0+bXRfZmlsZSksICZmaWxlICkgPT0gMCAmJiBmaWxlICkKKyNlbHNlCisgICAg
d2hpbGUgKCAoZmlsZSA9IHJlYWRkaXIoZGlyKSkgKQorI2VuZGlmIC8vIFFUX1RIUkVBRF9TVVBQ
T1JUICYmIF9QT1NJWF9USFJFQURfU0FGRV9GVU5DVElPTlMKKwlhbnN3ZXIuYXBwZW5kKFFGaWxl
OjpkZWNvZGVOYW1lKGZpbGUtPmRfbmFtZSkpOworI2lmIGRlZmluZWQoUVRfVEhSRUFEX1NVUFBP
UlQpICYmIGRlZmluZWQoX1BPU0lYX1RIUkVBRF9TQUZFX0ZVTkNUSU9OUykgJiYgIWRlZmluZWQo
UV9PU19DWUdXSU4pCisgICAgZGVsZXRlIHU7CisjZW5kaWYKKyAgICAodm9pZCkgY2xvc2VkaXIo
ZGlyKTsKKyAgICByZXR1cm4gYW5zd2VyOworfQorCiB2b2lkIE5ld0ltYWdlRmluZGVyOjpzZWFy
Y2hGb3JOZXdGaWxlcyggY29uc3QgUURpY3Q8dm9pZD4mIGxvYWRlZEZpbGVzLCBRU3RyaW5nIGRp
cmVjdG9yeSApCiB7CiAgICAgaWYgKCBkaXJlY3RvcnkuZW5kc1dpdGgoIFFTdHJpbmc6OmZyb21M
YXRpbjEoIi8iKSApICkKQEAgLTY1LDE4ICsxMTgsMjQgQEAKICAgICBpZiAoIGltYWdlRGlyLmVu
ZHNXaXRoKCBRU3RyaW5nOjpmcm9tTGF0aW4xKCIvIikgKSApCiAgICAgICAgIGltYWdlRGlyID0g
aW1hZ2VEaXIubWlkKCAwLCBpbWFnZURpci5sZW5ndGgoKS0xICk7CiAKLSAgICBRRGlyIGRpcigg
ZGlyZWN0b3J5ICk7Ci0gICAgUVN0cmluZ0xpc3QgZGlyTGlzdCA9IGRpci5lbnRyeUxpc3QoIFFE
aXI6OkFsbCApOworICAgIEZhc3REaXIgZGlyKCBkaXJlY3RvcnkgKTsKKyAgICBRU3RyaW5nTGlz
dCBkaXJMaXN0ID0gZGlyLmVudHJ5TGlzdCggKTsKKyAgICBJbWFnZU1hbmFnZXI6OlJBV0ltYWdl
RGVjb2RlciBkZWM7CiAgICAgZm9yKCBRU3RyaW5nTGlzdDo6SXRlcmF0b3IgaXQgPSBkaXJMaXN0
LmJlZ2luKCk7IGl0ICE9IGRpckxpc3QuZW5kKCk7ICsraXQgKSB7CiAgICAgICAgIFFTdHJpbmcg
ZmlsZSA9IGRpcmVjdG9yeSArIFFTdHJpbmc6OmZyb21MYXRpbjEoIi8iKSArICppdDsKLSAgICAg
ICAgUUZpbGVJbmZvIGZpKCBmaWxlICk7CiAgICAgICAgIGlmICggKCppdCkgPT0gUVN0cmluZzo6
ZnJvbUxhdGluMSgiLiIpIHx8ICgqaXQpID09IFFTdHJpbmc6OmZyb21MYXRpbjEoIi4uIikgfHwK
ICAgICAgICAgICAgICAoKml0KSA9PSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJUaHVtYk5haWxzIikg
fHwKICAgICAgICAgICAgICAoKml0KSA9PSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJDYXRlZ29yeUlt
YWdlcyIpIHx8Ci0gICAgICAgICAgICAgIWZpLmlzUmVhZGFibGUoKSApCisJICAgICBsb2FkZWRG
aWxlcy5maW5kKCBmaWxlICkgfHwKKwkgICAgIGRlYy5fc2tpcFRoaXNGaWxlKGxvYWRlZEZpbGVz
LCBmaWxlKSApCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAoIGZpLmlzRmls
ZSgpICYmIGxvYWRlZEZpbGVzLmZpbmQoIGZpbGUgKSA9PSAwKSB7CisgICAgICAgIFFGaWxlSW5m
byBmaSggZmlsZSApOworCisJaWYgKCAhZmkuaXNSZWFkYWJsZSgpICkKKwkgICAgY29udGludWU7
CisKKyAgICAgICAgaWYgKCBmaS5pc0ZpbGUoKSApIHsKICAgICAgICAgICAgIFFTdHJpbmcgYmFz
ZU5hbWUgPSBmaWxlLm1pZCggaW1hZ2VEaXIubGVuZ3RoKCkrMSApOwogICAgICAgICAgICAgaWYg
KCAhIERCOjpJbWFnZURCOjppbnN0YW5jZSgpLT5pc0Jsb2NraW5nKCBiYXNlTmFtZSApICkgewog
ICAgICAgICAgICAgICAgIGlmICggVXRpbGl0aWVzOjpjYW5SZWFkSW1hZ2UoZmlsZSkgKQpJbmRl
eDogSW1hZ2VNYW5hZ2VyL1Jhd0ltYWdlRGVjb2Rlci5jcHAKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSW1hZ2VN
YW5hZ2VyL1Jhd0ltYWdlRGVjb2Rlci5jcHAJKHJldmlzaW9uIDY2MzM0MikKKysrIEltYWdlTWFu
YWdlci9SYXdJbWFnZURlY29kZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCw0ICs5NCw1MiBA
QAogCXJldHVybiBmYWxzZTsKIH0KIAorYm9vbCBSQVdJbWFnZURlY29kZXI6Ol9za2lwVGhpc0Zp
bGUoIGNvbnN0IFFEaWN0PHZvaWQ+JiBsb2FkZWRGaWxlcywgY29uc3QgUVN0cmluZyYgaW1hZ2VG
aWxlICkKK3sKKwkvKiBLbm93biBSQVcgZmlsZSBleHRlbnNpb25zLiBUT0RPOiBDb21wbGV0ZSAq
LworCXN0YXRpYyBjb25zdCBRU3RyaW5nIGV4dGVuc2lvbnNbXSA9IHsgUVN0cmluZzo6ZnJvbUxh
dGluMSgiY3J3IiksCisJCQkJCQkJCQkJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJjcjIiKSwKKwkJ
CQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEoIm5lZiIpLAorCQkJCQkJCQkJCSAgUVN0cmlu
Zzo6ZnJvbUxhdGluMSgiYmF5IiksCisJCQkJCQkJCQkJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJt
b3MiKSwKKwkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEoIm1ydyIpLAorCQkJCQkJCQkJ
CSAgUVN0cmluZzo6ZnJvbUxhdGluMSgib3JmIiksCisJCQkJCQkJCQkJICBRU3RyaW5nOjpmcm9t
TGF0aW4xKCJjczEiKSwKKwkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEoImRjMiIpLAor
CQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgia2RjIiksCisJCQkJCQkJCQkJICBRU3Ry
aW5nOjpmcm9tTGF0aW4xKCJyYWYiKSwKKwkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEo
InJkYyIpLAorCQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgieDNmIiksCisJCQkJCQkJ
CQkJICBRU3RyaW5nOjpudWxsIH07CisJaWYgKGltYWdlRmlsZS5lbmRzV2l0aChRU3RyaW5nOjpm
cm9tTGF0aW4xKCIudGhtIikpIHx8CisJICAgIGltYWdlRmlsZS5lbmRzV2l0aChRU3RyaW5nOjpm
cm9tTGF0aW4xKCIuVEhNIikpKQorCSAgcmV0dXJuIHRydWU7CisJaWYgKCEgKFNldHRpbmdzOjpT
ZXR0aW5nc0RhdGE6Omluc3RhbmNlKCktPmRvbnRSZWFkUmF3RmlsZXNXaXRoT3RoZXJNYXRjaGlu
Z0ZpbGUoKSkpCisJICByZXR1cm4gZmFsc2U7CisJYm9vbCBpc1JhdyA9IGZhbHNlOworCWZvcigg
aW50IGkgPSAwOyAhZXh0ZW5zaW9uc1tpXS5pc051bGwoKTsgKytpICkgeworCSAgaWYoIGltYWdl
RmlsZS5lbmRzV2l0aCggZXh0ZW5zaW9uc1tpXSwgZmFsc2UgKSApIHsKKwkgICAgaXNSYXcgPSB0
cnVlOworCSAgICBicmVhazsKKwkgIH0KKwl9CisJaWYgKCFpc1JhdykKKwkgIHJldHVybiBmYWxz
ZTsKKwlzdGF0aWMgY29uc3QgUVN0cmluZyBzdGFuZGFyZEV4dGVuc2lvbnNbXSA9IHsKKwkgIFFT
dHJpbmc6OmZyb21MYXRpbjEoImpwZyIpLAorCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgiSlBHIiks
CisJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJ0aWYiKSwKKwkgIFFTdHJpbmc6OmZyb21MYXRpbjEo
IlRJRiIpLAorCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgicG5nIiksCisJICBRU3RyaW5nOjpmcm9t
TGF0aW4xKCJQTkciKSwKKwkgIFFTdHJpbmc6Om51bGwgfTsKKwlRU3RyaW5nIGJhc2VGaWxlTmFt
ZSA9IGltYWdlRmlsZTsKKwliYXNlRmlsZU5hbWUucmVtb3ZlKGJhc2VGaWxlTmFtZS5sZW5ndGgo
KSAtIDMsIDMpOworCWZvciAoaW50IGkgPSAwOyAhc3RhbmRhcmRFeHRlbnNpb25zW2ldLmlzTnVs
bCgpOyArK2kpIHsKKwkgIGlmIChsb2FkZWRGaWxlcy5maW5kKGJhc2VGaWxlTmFtZSArIHN0YW5k
YXJkRXh0ZW5zaW9uc1tpXSkpCisJICAgIHJldHVybiB0cnVlOworCX0KKwlyZXR1cm4gZmFsc2U7
CiB9CisKK30KSW5kZXg6IEltYWdlTWFuYWdlci9SYXdJbWFnZURlY29kZXIuaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBJbWFnZU1hbmFnZXIvUmF3SW1hZ2VEZWNvZGVyLmgJKHJldmlzaW9uIDY2MzM0MikKKysr
IEltYWdlTWFuYWdlci9SYXdJbWFnZURlY29kZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTksNiAr
MTksNyBAQAogI2RlZmluZSBSQVdJTUFHRURFQ09ERVJfSAogCiAjaW5jbHVkZSAiSW1hZ2VEZWNv
ZGVyLmgiCisjaW5jbHVkZSA8cWRpY3QuaD4KIAogbmFtZXNwYWNlIEltYWdlTWFuYWdlcgogewpA
QCAtMjksNiArMzAsNyBAQAogCiAJdmlydHVhbCBib29sIF9kZWNvZGUoUUltYWdlICppbWcsIGNv
bnN0IFFTdHJpbmcmIGltYWdlRmlsZSwgUVNpemUqIGZ1bGxTaXplLCBpbnQgZGltPS0xKTsKIAl2
aXJ0dWFsIGJvb2wgX21pZ2h0RGVjb2RlKCBjb25zdCBRU3RyaW5nJiBpbWFnZUZpbGUgKTsKKwl2
aXJ0dWFsIGJvb2wgX3NraXBUaGlzRmlsZSggY29uc3QgUURpY3Q8dm9pZD4mIGxvYWRlZEZpbGVz
LCBjb25zdCBRU3RyaW5nJiBpbWFnZUZpbGUgKTsKIH07CiAKIH0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>21223</attachid>
            <date>2007-07-22 23:07:39 +0000</date>
            <delta_ts>2007-07-22 23:07:39 +0000</delta_ts>
            <desc>Patch to greatly speed up scanning for new images</desc>
            <filename>diffs</filename>
            <type>text/plain</type>
            <size>11826</size>
            <attacher>rlk</attacher>
            
              <data encoding="base64">SW5kZXg6IERCL05ld0ltYWdlRmluZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBEQi9OZXdJbWFnZUZp
bmRlci5jcHAJKHJldmlzaW9uIDY5MDk1NykKKysrIERCL05ld0ltYWdlRmluZGVyLmNwcAkod29y
a2luZyBjb3B5KQpAQCAtMjAsNyArMjAsOSBAQAogI2luY2x1ZGUgPHFmaWxlaW5mby5oPgogI2lu
Y2x1ZGUgIlNldHRpbmdzL1NldHRpbmdzRGF0YS5oIgogI2luY2x1ZGUgIkJyb3dzZXIvQnJvd3Nl
cldpZGdldC5oIgotI2luY2x1ZGUgPHFkaXIuaD4KKyNpbmNsdWRlICJJbWFnZU1hbmFnZXIvUmF3
SW1hZ2VEZWNvZGVyLmgiCisjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CisjaW5jbHVkZSA8ZGlyZW50
Lmg+CiAjaW5jbHVkZSAiVXRpbGl0aWVzL1V0aWwuaCIKICNpbmNsdWRlIDxxcHJvZ3Jlc3NkaWFs
b2cuaD4KICNpbmNsdWRlIDxrbG9jYWxlLmg+CkBAIC01Niw2ICs1OCw1OSBAQAogICAgIHJldHVy
biAoIV9wZW5kaW5nTG9hZC5pc0VtcHR5KCkpOyAvLyByZXR1cm5zIGlmIG5ldyBpbWFnZXMgd2Fz
IGZvdW5kLgogfQogCisvLyBGYXN0RGlyIGlzIHVzZWQgaW4gcGxhY2Ugb2YgUURpciBiZWNhdXNl
IFFEaXIgc3RhdCgpcyBldmVyeSBmaWxlIGluCisvLyB0aGUgZGlyZWN0b3J5LCBldmVuIGlmIHdl
IHRlbGwgaXQgbm90IHRvIHJlc3RyaWN0IGFueXRoaW5nLiAgV2hlbgorLy8gc2Nhbm5pbmcgZm9y
IG5ldyBpbWFnZXMsIHdlIGRvbid0IHdhbnQgdG8gbG9vayBhdCBmaWxlcyB3ZSBhbHJlYWR5Cisv
LyBoYXZlIGluIG91ciBkYXRhYmFzZSwgYW5kIHdlIGFsc28gZG9uJ3Qgd2FudCB0byBsb29rIGF0
IGZpbGVzIHdob3NlCisvLyBuYW1lcyBpbmRpY2F0ZSB0aGF0IHdlIGRvbid0IGNhcmUgYWJvdXQg
dGhlbS4gIFNvIHdoYXQgd2UgZG8gaXMKKy8vIHNpbXBseSByZWFkIHRoZSBuYW1lcyBmcm9tIHRo
ZSBkaXJlY3RvcnkgYW5kIGxldCB0aGUgaGlnaGVyIGxheWVycworLy8gZGVjaWRlIHdoYXQgdG8g
ZG8gd2l0aCB0aGVtLgorLy8KKy8vIE9uIG15IHNhbXBsZSBkYXRhYmFzZSB3aXRoIH4yMCwwMDAg
aW1hZ2VzLCB0aGlzIGltcHJvdmVzIHRoZSB0aW1lCisvLyB0byByZXNjYW4gZm9yIGltYWdlcyBv
biBhIGNvbGQgc3lzdGVtIGZyb20gYWJvdXQgMTAwIHNlY29uZHMgdG8KKy8vIGFib3V0IDMgc2Vj
b25kcy4KKy8vCisvLyAtLSBSb2JlcnQgS3Jhd2l0eiwgcmxrQGFsdW0ubWl0LmVkdSAyMDA3LTA3
LTIyCitjbGFzcyBGYXN0RGlyCit7CitwdWJsaWM6CisgICAgRmFzdERpcihjb25zdCBRU3RyaW5n
ICZwYXRoKTsKKyAgICBRU3RyaW5nTGlzdCBlbnRyeUxpc3QoKSBjb25zdDsKK3ByaXZhdGU6Cisg
ICAgY29uc3QgUVN0cmluZyBfcGF0aDsKK307CisKK0Zhc3REaXI6OkZhc3REaXIoY29uc3QgUVN0
cmluZyAmcGF0aCkKKyAgOiBfcGF0aChwYXRoKQoreworfQorCitRU3RyaW5nTGlzdCBGYXN0RGly
OjplbnRyeUxpc3QoKSBjb25zdAoreworICAgIFFTdHJpbmdMaXN0IGFuc3dlcjsKKyAgICBESVIg
KmRpcjsKKyAgICBkaXJlbnQgKmZpbGU7CisgICAgZGlyID0gb3BlbmRpciggUUZpbGU6OmVuY29k
ZU5hbWUoX3BhdGgpICk7CisgICAgaWYgKCAhZGlyICkKKwlyZXR1cm4gYW5zd2VyOyAvLyBjYW5u
b3QgcmVhZCB0aGUgZGlyZWN0b3J5CisKKyNpZiBkZWZpbmVkKFFUX1RIUkVBRF9TVVBQT1JUKSAm
JiBkZWZpbmVkKF9QT1NJWF9USFJFQURfU0FGRV9GVU5DVElPTlMpICYmICFkZWZpbmVkKFFfT1Nf
Q1lHV0lOKQorICAgIHVuaW9uIGRpcmVudF9idWYgeworCXN0cnVjdCBkaXJlbnQgbXRfZmlsZTsK
KwljaGFyIGJbc2l6ZW9mKHN0cnVjdCBkaXJlbnQpICsgTUFYTkFNTEVOICsgMV07CisgICAgfSAq
dSA9IG5ldyB1bmlvbiBkaXJlbnRfYnVmOworICAgIHdoaWxlICggcmVhZGRpcl9yKGRpciwgJih1
LT5tdF9maWxlKSwgJmZpbGUgKSA9PSAwICYmIGZpbGUgKQorI2Vsc2UKKyAgICB3aGlsZSAoIChm
aWxlID0gcmVhZGRpcihkaXIpKSApCisjZW5kaWYgLy8gUVRfVEhSRUFEX1NVUFBPUlQgJiYgX1BP
U0lYX1RIUkVBRF9TQUZFX0ZVTkNUSU9OUworCWFuc3dlci5hcHBlbmQoUUZpbGU6OmRlY29kZU5h
bWUoZmlsZS0+ZF9uYW1lKSk7CisjaWYgZGVmaW5lZChRVF9USFJFQURfU1VQUE9SVCkgJiYgZGVm
aW5lZChfUE9TSVhfVEhSRUFEX1NBRkVfRlVOQ1RJT05TKSAmJiAhZGVmaW5lZChRX09TX0NZR1dJ
TikKKyAgICBkZWxldGUgdTsKKyNlbmRpZgorICAgICh2b2lkKSBjbG9zZWRpcihkaXIpOworICAg
IHJldHVybiBhbnN3ZXI7Cit9CisKIHZvaWQgTmV3SW1hZ2VGaW5kZXI6OnNlYXJjaEZvck5ld0Zp
bGVzKCBjb25zdCBRRGljdDx2b2lkPiYgbG9hZGVkRmlsZXMsIFFTdHJpbmcgZGlyZWN0b3J5ICkK
IHsKICAgICBpZiAoIGRpcmVjdG9yeS5lbmRzV2l0aCggUVN0cmluZzo6ZnJvbUxhdGluMSgiLyIp
ICkgKQpAQCAtNjUsMTggKzEyMCwyNCBAQAogICAgIGlmICggaW1hZ2VEaXIuZW5kc1dpdGgoIFFT
dHJpbmc6OmZyb21MYXRpbjEoIi8iKSApICkKICAgICAgICAgaW1hZ2VEaXIgPSBpbWFnZURpci5t
aWQoIDAsIGltYWdlRGlyLmxlbmd0aCgpLTEgKTsKIAotICAgIFFEaXIgZGlyKCBkaXJlY3Rvcnkg
KTsKLSAgICBRU3RyaW5nTGlzdCBkaXJMaXN0ID0gZGlyLmVudHJ5TGlzdCggUURpcjo6QWxsICk7
CisgICAgRmFzdERpciBkaXIoIGRpcmVjdG9yeSApOworICAgIFFTdHJpbmdMaXN0IGRpckxpc3Qg
PSBkaXIuZW50cnlMaXN0KCApOworICAgIEltYWdlTWFuYWdlcjo6UkFXSW1hZ2VEZWNvZGVyIGRl
YzsKICAgICBmb3IoIFFTdHJpbmdMaXN0OjpJdGVyYXRvciBpdCA9IGRpckxpc3QuYmVnaW4oKTsg
aXQgIT0gZGlyTGlzdC5lbmQoKTsgKytpdCApIHsKICAgICAgICAgUVN0cmluZyBmaWxlID0gZGly
ZWN0b3J5ICsgUVN0cmluZzo6ZnJvbUxhdGluMSgiLyIpICsgKml0OwotICAgICAgICBRRmlsZUlu
Zm8gZmkoIGZpbGUgKTsKICAgICAgICAgaWYgKCAoKml0KSA9PSBRU3RyaW5nOjpmcm9tTGF0aW4x
KCIuIikgfHwgKCppdCkgPT0gUVN0cmluZzo6ZnJvbUxhdGluMSgiLi4iKSB8fAogICAgICAgICAg
ICAgICgqaXQpID09IFFTdHJpbmc6OmZyb21MYXRpbjEoIlRodW1iTmFpbHMiKSB8fAogICAgICAg
ICAgICAgICgqaXQpID09IFFTdHJpbmc6OmZyb21MYXRpbjEoIkNhdGVnb3J5SW1hZ2VzIikgfHwK
LSAgICAgICAgICAgICAhZmkuaXNSZWFkYWJsZSgpICkKKwkgICAgIGxvYWRlZEZpbGVzLmZpbmQo
IGZpbGUgKSB8fAorCSAgICAgZGVjLl9za2lwVGhpc0ZpbGUobG9hZGVkRmlsZXMsIGZpbGUpICkK
ICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGlmICggZmkuaXNGaWxlKCkgJiYgbG9h
ZGVkRmlsZXMuZmluZCggZmlsZSApID09IDApIHsKKyAgICAgICAgUUZpbGVJbmZvIGZpKCBmaWxl
ICk7CisKKwlpZiAoICFmaS5pc1JlYWRhYmxlKCkgKQorCSAgICBjb250aW51ZTsKKworICAgICAg
ICBpZiAoIGZpLmlzRmlsZSgpICkgewogICAgICAgICAgICAgUVN0cmluZyBiYXNlTmFtZSA9IGZp
bGUubWlkKCBpbWFnZURpci5sZW5ndGgoKSsxICk7CiAgICAgICAgICAgICBpZiAoICEgREI6Oklt
YWdlREI6Omluc3RhbmNlKCktPmlzQmxvY2tpbmcoIGJhc2VOYW1lICkgKSB7CiAgICAgICAgICAg
ICAgICAgaWYgKCBVdGlsaXRpZXM6OmNhblJlYWRJbWFnZShmaWxlKSApCkluZGV4OiBJbWFnZU1h
bmFnZXIvUmF3SW1hZ2VEZWNvZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBJbWFnZU1hbmFnZXIvUmF3
SW1hZ2VEZWNvZGVyLmNwcAkocmV2aXNpb24gNjkwOTU3KQorKysgSW1hZ2VNYW5hZ2VyL1Jhd0lt
YWdlRGVjb2Rlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxLDYgKzIxLDcgQEAKICNpbmNsdWRl
IDxxZmlsZS5oPgogI2luY2x1ZGUgPHFpbWFnZS5oPgogI2luY2x1ZGUgPHF3bWF0cml4Lmg+Cisj
aW5jbHVkZSA8cXN0cmluZ2xpc3QuaD4KICNpbmNsdWRlICJTZXR0aW5ncy9TZXR0aW5nc0RhdGEu
aCIKIAogLyogTWFpbiBlbnRyeSBwb2ludCBpbnRvIHJhdyBwYXJzZXIgKi8KQEAgLTU0LDQ2ICs1
NSwxMzAgQEAKICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgUkFXSW1hZ2VEZWNvZGVyOjpfbWln
aHREZWNvZGUoIGNvbnN0IFFTdHJpbmcmIGltYWdlRmlsZSApCitRU3RyaW5nTGlzdCBSQVdJbWFn
ZURlY29kZXI6Ol9yYXdFeHRlbnNpb25zOworUVN0cmluZ0xpc3QgUkFXSW1hZ2VEZWNvZGVyOjpf
c3RhbmRhcmRFeHRlbnNpb25zOworUVN0cmluZ0xpc3QgUkFXSW1hZ2VEZWNvZGVyOjpfaWdub3Jl
ZEV4dGVuc2lvbnM7CisKK3ZvaWQgUkFXSW1hZ2VEZWNvZGVyOjpfaW5pdGlhbGl6ZUV4dGVuc2lv
bkxpc3RzKCkKIHsKLQkvKiBLbm93biBSQVcgZmlsZSBleHRlbnNpb25zLiBUT0RPOiBDb21wbGV0
ZSAqLwotCXN0YXRpYyBjb25zdCBRU3RyaW5nIGV4dGVuc2lvbnNbXSA9IHsgUVN0cmluZzo6ZnJv
bUxhdGluMSgiY3J3IiksCi0JCQkJCQkJCQkJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJjcjIiKSwK
LQkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEoIm5lZiIpLAotCQkJCQkJCQkJCSAgUVN0
cmluZzo6ZnJvbUxhdGluMSgiYmF5IiksCi0JCQkJCQkJCQkJICBRU3RyaW5nOjpmcm9tTGF0aW4x
KCJtb3MiKSwKLQkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEoIm1ydyIpLAotCQkJCQkJ
CQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgib3JmIiksCi0JCQkJCQkJCQkJICBRU3RyaW5nOjpm
cm9tTGF0aW4xKCJjczEiKSwKLQkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRpbjEoImRjMiIp
LAotCQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgia2RjIiksCi0JCQkJCQkJCQkJICBR
U3RyaW5nOjpmcm9tTGF0aW4xKCJyYWYiKSwKLQkJCQkJCQkJCQkgIFFTdHJpbmc6OmZyb21MYXRp
bjEoInJkYyIpLAotCQkJCQkJCQkJCSAgUVN0cmluZzo6ZnJvbUxhdGluMSgieDNmIiksCi0JCQkJ
CQkJCQkJICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJlcmYiKSwKLQkJCQkJCQkJCQkgIFFTdHJpbmc6
OmZyb21MYXRpbjEoInBlZiIpLAotCQkJCQkJCQkJCSAgUVN0cmluZzo6bnVsbCB9OwotCWlmIChT
ZXR0aW5nczo6U2V0dGluZ3NEYXRhOjppbnN0YW5jZSgpLT5kb250UmVhZFJhd0ZpbGVzV2l0aE90
aGVyTWF0Y2hpbmdGaWxlKCkpIHsKLSAgICAgICAgICAgIHN0YXRpYyBjb25zdCBRU3RyaW5nIHN0
YW5kYXJkRXh0ZW5zaW9uc1tdID0gewotICAgICAgICAgICAgICAgIFFTdHJpbmc6OmZyb21MYXRp
bjEoImpwZyIpLAotICAgICAgICAgICAgICAgIFFTdHJpbmc6OmZyb21MYXRpbjEoIkpQRyIpLAot
ICAgICAgICAgICAgICAgIFFTdHJpbmc6OmZyb21MYXRpbjEoInRpZiIpLAotICAgICAgICAgICAg
ICAgIFFTdHJpbmc6OmZyb21MYXRpbjEoIlRJRiIpLAotICAgICAgICAgICAgICAgIFFTdHJpbmc6
OmZyb21MYXRpbjEoInBuZyIpLAotICAgICAgICAgICAgICAgIFFTdHJpbmc6OmZyb21MYXRpbjEo
IlBORyIpLAotICAgICAgICAgICAgICAgIFFTdHJpbmc6Om51bGwgfTsKLSAgICAgICAgICAgIFFT
dHJpbmcgYmFzZUZpbGVOYW1lID0gaW1hZ2VGaWxlOwotICAgICAgICAgICAgYmFzZUZpbGVOYW1l
LnJlbW92ZShiYXNlRmlsZU5hbWUubGVuZ3RoKCkgLSAzLCAzKTsKLSAgICAgICAgICAgIGZvciAo
aW50IGkgPSAwOyAhc3RhbmRhcmRFeHRlbnNpb25zW2ldLmlzTnVsbCgpOyArK2kpIHsKLSAgICAg
ICAgICAgICAgICBpZiAoUUZpbGU6OmV4aXN0cyhiYXNlRmlsZU5hbWUgKyBzdGFuZGFyZEV4dGVu
c2lvbnNbaV0pKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAg
ICB9CisgIHN0YXRpYyBib29sIGV4dGVuc2lvbkxpc3RzSW5pdGlhbGl6ZWQgPSAwOworICBpZiAo
ISBleHRlbnNpb25MaXN0c0luaXRpYWxpemVkKSB7CisgICAgLyogS25vd24gUkFXIGZpbGUgZXh0
ZW5zaW9ucy4gVE9ETzogQ29tcGxldGUgKi8KKyAgICBfcmF3RXh0ZW5zaW9ucyA8PCBRU3RyaW5n
Ojpmcm9tTGF0aW4xKCJjcnciKQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJjcjIiKQor
CQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJuZWYiKQorCQkgICA8PCBRU3RyaW5nOjpmcm9t
TGF0aW4xKCJiYXkiKQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJtb3MiKQorCQkgICA8
PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJtcnciKQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4x
KCJvcmYiKQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJjczEiKQorCQkgICA8PCBRU3Ry
aW5nOjpmcm9tTGF0aW4xKCJkYzIiKQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJrZGMi
KQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJyYWYiKQorCQkgICA8PCBRU3RyaW5nOjpm
cm9tTGF0aW4xKCJyZGMiKQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJ4M2YiKQorCQkg
ICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJlcmYiKQorCQkgICA8PCBRU3RyaW5nOjpmcm9tTGF0
aW4xKCJwZWYiKTsKKyAgICBfc3RhbmRhcmRFeHRlbnNpb25zIDw8IFFTdHJpbmc6OmZyb21MYXRp
bjEoImpwZyIpCisJCQk8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJKUEciKQorCQkJPDwgUVN0cmlu
Zzo6ZnJvbUxhdGluMSgianBlZyIpCisJCQk8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJKUEVHIikK
KwkJCTw8IFFTdHJpbmc6OmZyb21MYXRpbjEoInRpZiIpCisJCQk8PCBRU3RyaW5nOjpmcm9tTGF0
aW4xKCJUSUYiKQorCQkJPDwgUVN0cmluZzo6ZnJvbUxhdGluMSgidGlmZiIpCisJCQk8PCBRU3Ry
aW5nOjpmcm9tTGF0aW4xKCJUSUZGIikKKwkJCTw8IFFTdHJpbmc6OmZyb21MYXRpbjEoInBuZyIp
CisJCQk8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJQTkciKTsKKyAgICBfaWdub3JlZEV4dGVuc2lv
bnMgPDwgUVN0cmluZzo6ZnJvbUxhdGluMSgidGhtIikgLy8gVGh1bWJuYWlscworCQkgICAgICAg
PDwgUVN0cmluZzo6ZnJvbUxhdGluMSgiVEhNIikKKwkJICAgICAgIDw8IFFTdHJpbmc6OmZyb21M
YXRpbjEoInRodW1iIikgLy8gdGh1bWJuYWlsIGZpbGVzCisJCQkJCQkgICAgICAgLy8gZnJvbSBk
Y3JhdworCQkgICAgICAgPDwgUVN0cmluZzo6ZnJvbUxhdGluMSgiY3RnIikgLy8gQ2F0YWxvZyBm
aWxlcworCQkgICAgICAgPDwgUVN0cmluZzo6ZnJvbUxhdGluMSgiZ3oiKSAvLyBDb21wcmVzc2Vk
IGZpbGVzCisJCSAgICAgICA8PCBRU3RyaW5nOjpmcm9tTGF0aW4xKCJaIikKKwkJICAgICAgIDw8
IFFTdHJpbmc6OmZyb21MYXRpbjEoImJ6MiIpCisJCSAgICAgICA8PCBRU3RyaW5nOjpmcm9tTGF0
aW4xKCJ6aXAiKQorCQkgICAgICAgPDwgUVN0cmluZzo6ZnJvbUxhdGluMSgieG1sIikKKwkJICAg
ICAgIDw8IFFTdHJpbmc6OmZyb21MYXRpbjEoIlhNTCIpCisJCSAgICAgICA8PCBRU3RyaW5nOjpm
cm9tTGF0aW4xKCJodG1sIikKKwkJICAgICAgIDw8IFFTdHJpbmc6OmZyb21MYXRpbjEoIkhUTUwi
KQorCQkgICAgICAgPDwgUVN0cmluZzo6ZnJvbUxhdGluMSgiaHRtIikKKwkJICAgICAgIDw8IFFT
dHJpbmc6OmZyb21MYXRpbjEoIkhUTSIpOworICAgIGV4dGVuc2lvbkxpc3RzSW5pdGlhbGl6ZWQg
PSAxOworICB9Cit9CisKK2Jvb2wgUkFXSW1hZ2VEZWNvZGVyOjpfZmlsZUV4aXN0c1dpdGhFeHRl
bnNpb25zKCBjb25zdCBRU3RyaW5nJiBmaWxlTmFtZSwKKwkJCQkJCWNvbnN0IFFTdHJpbmdMaXN0
JiBleHRlbnNpb25MaXN0KSBjb25zdAoreworCVFTdHJpbmcgYmFzZUZpbGVOYW1lID0gZmlsZU5h
bWU7CisJaW50IGV4dFN0YXJ0ID0gZmlsZU5hbWUuZmluZFJldignLicpICsgMTsKKwkvLyBXZSdy
ZSBpbnRlcmVzdGVkIGluIHh4eC55eXksIG5vdCAueXl5CisJaWYgKGV4dFN0YXJ0IDw9IDEpIHJl
dHVybiBmYWxzZTsKKwliYXNlRmlsZU5hbWUucmVtb3ZlKGV4dFN0YXJ0LCBiYXNlRmlsZU5hbWUu
bGVuZ3RoKCkgLSBleHRTdGFydCk7CisJZm9yICggUVN0cmluZ0xpc3Q6OkNvbnN0SXRlcmF0b3Ig
aXQgPSBleHRlbnNpb25MaXN0LmJlZ2luKCk7CisJICAgICAgaXQgIT0gZXh0ZW5zaW9uTGlzdC5l
bmQoKTsgKytpdCApIHsKKwkgICAgaWYgKFFGaWxlOjpleGlzdHMoYmFzZUZpbGVOYW1lICsgKml0
KSkgcmV0dXJuIHRydWU7CiAJfQorCXJldHVybiBmYWxzZTsKK30KIAotCWZvciggaW50IGkgPSAw
OyAhZXh0ZW5zaW9uc1tpXS5pc051bGwoKTsgKytpICkgewotCQlpZiggaW1hZ2VGaWxlLmVuZHNX
aXRoKCBleHRlbnNpb25zW2ldLCBmYWxzZSApICkgcmV0dXJuIHRydWU7Citib29sIFJBV0ltYWdl
RGVjb2Rlcjo6X2ZpbGVJc0tub3duV2l0aEV4dGVuc2lvbnMoIGNvbnN0IFFEaWN0PHZvaWQ+JiBm
aWxlcywKKwkJCQkJCSBjb25zdCBRU3RyaW5nJiBmaWxlTmFtZSwKKwkJCQkJCSBjb25zdCBRU3Ry
aW5nTGlzdCYgZXh0ZW5zaW9uTGlzdCkgY29uc3QKK3sKKwlRU3RyaW5nIGJhc2VGaWxlTmFtZSA9
IGZpbGVOYW1lOworCWludCBleHRTdGFydCA9IGZpbGVOYW1lLmZpbmRSZXYoJy4nKSArIDE7CisJ
aWYgKGV4dFN0YXJ0IDw9IDEpIHJldHVybiBmYWxzZTsKKwliYXNlRmlsZU5hbWUucmVtb3ZlKGV4
dFN0YXJ0LCBiYXNlRmlsZU5hbWUubGVuZ3RoKCkgLSBleHRTdGFydCk7CisJZm9yICggUVN0cmlu
Z0xpc3Q6OkNvbnN0SXRlcmF0b3IgaXQgPSBleHRlbnNpb25MaXN0LmJlZ2luKCk7CisJICAgICAg
aXQgIT0gZXh0ZW5zaW9uTGlzdC5lbmQoKTsgKytpdCApIHsKKwkgICAgaWYgKGZpbGVzLmZpbmQo
YmFzZUZpbGVOYW1lICsgKml0KSApIHJldHVybiB0cnVlOwogCX0KIAlyZXR1cm4gZmFsc2U7CiB9
CiAKK2Jvb2wgUkFXSW1hZ2VEZWNvZGVyOjpfZmlsZUVuZHNXaXRoRXh0ZW5zaW9ucyggY29uc3Qg
UVN0cmluZyYgZmlsZU5hbWUsCisJCQkJCSAgICAgIGNvbnN0IFFTdHJpbmdMaXN0JiBleHRlbnNp
b25MaXN0KSBjb25zdAoreworCWZvciAoIFFTdHJpbmdMaXN0OjpDb25zdEl0ZXJhdG9yIGl0ID0g
ZXh0ZW5zaW9uTGlzdC5iZWdpbigpOworCSAgICAgIGl0ICE9IGV4dGVuc2lvbkxpc3QuZW5kKCk7
ICsraXQgKSB7CisJICAgIGlmKCBmaWxlTmFtZS5lbmRzV2l0aCggKml0LCBmYWxzZSApICkgcmV0
dXJuIHRydWU7CisJfQorCXJldHVybiBmYWxzZTsKIH0KKworYm9vbCBSQVdJbWFnZURlY29kZXI6
Ol9taWdodERlY29kZSggY29uc3QgUVN0cmluZyYgaW1hZ2VGaWxlICkKK3sKKwlpZiAoU2V0dGlu
Z3M6OlNldHRpbmdzRGF0YTo6aW5zdGFuY2UoKS0+ZG9udFJlYWRSYXdGaWxlc1dpdGhPdGhlck1h
dGNoaW5nRmlsZSgpICYmCisJICAgIF9maWxlRXhpc3RzV2l0aEV4dGVuc2lvbnMoaW1hZ2VGaWxl
LCBfc3RhbmRhcmRFeHRlbnNpb25zKSkgcmV0dXJuIGZhbHNlOworCWlmIChfZmlsZUVuZHNXaXRo
RXh0ZW5zaW9ucyhpbWFnZUZpbGUsIF9yYXdFeHRlbnNpb25zKSkgcmV0dXJuIHRydWU7CisJcmV0
dXJuIGZhbHNlOworfQorCitib29sIFJBV0ltYWdlRGVjb2Rlcjo6X3NraXBUaGlzRmlsZSggY29u
c3QgUURpY3Q8dm9pZD4mIGxvYWRlZEZpbGVzLCBjb25zdCBRU3RyaW5nJiBpbWFnZUZpbGUgKQor
eworCS8vIFdlJ3JlIG5vdCBpbnRlcmVzdGVkIGluIHRodW1ibmFpbCBhbmQgb3RoZXIgZmlsZXMu
CisJaWYgKF9maWxlRW5kc1dpdGhFeHRlbnNpb25zKGltYWdlRmlsZSwgX2lnbm9yZWRFeHRlbnNp
b25zKSkgcmV0dXJuIHRydWU7CisKKwkvLyBJZiB3ZSAqYXJlKiBpbnRlcmVzdGVkIGluIHJhdyBm
aWxlcyBldmVuIHdoZW4gb3RoZXIgZXF1aXZhbGVudAorCS8vIG5vbi1yYXcgZmlsZXMgYXJlIGF2
YWlsYWJsZSwgdGhlbiB3ZSdyZSBpbnRlcmVzdGVkIGluIHRoaXMgZmlsZS4KKwlpZiAoISAoU2V0
dGluZ3M6OlNldHRpbmdzRGF0YTo6aW5zdGFuY2UoKS0+ZG9udFJlYWRSYXdGaWxlc1dpdGhPdGhl
ck1hdGNoaW5nRmlsZSgpKSkgcmV0dXJuIGZhbHNlOworCisJLy8gSWYgdGhlIGZpbGUgZW5kcyB3
aXRoIHNvbWV0aGluZyBvdGhlciB0aGFuIGEga25vd24gcmF3IGV4dGVuc2lvbiwKKwkvLyB3ZSdy
ZSBpbnRlcmVzdGVkIGluIGl0LgorCWlmICghIF9maWxlRW5kc1dpdGhFeHRlbnNpb25zKGltYWdl
RmlsZSwgX3Jhd0V4dGVuc2lvbnMpKSByZXR1cm4gZmFsc2U7CisKKwkvLyBBdCB0aGlzIHBvaW50
LCB0aGUgZmlsZSBlbmRzIHdpdGggYSBrbm93biByYXcgZXh0ZW5zaW9uLCBhbmQgd2UncmUKKwkv
LyBub3QgaW50ZXJlc3RlZCBpbiByYXcgZmlsZXMgd2hlbiBvdGhlciBub24tcmF3IGZpbGVzIGFy
ZSBhdmFpbGFibGUuCisJLy8gU28gc2VhcmNoIGZvciBhbiBleGlzdGluZyBmaWxlIHdpdGggb25l
IG9mIHRoZSBzdGFuZGFyZAorCS8vIGV4dGVuc2lvbnMuCisJLy8KKwkvLyBUaGlzIG1heSBub3Qg
YmUgdGhlIGJlc3Qgd2F5IHRvIGRvIHRoaXMsIGJ1dCBpdCdzIHVzaW5nIHRoZQorCS8vIHNhbWUg
YWxnb3JpdGhtIGFzIF9taWdodERlY29kZSBhYm92ZS4KKwkvLyAtLSBSb2JlcnQgS3Jhd2l0eiBy
bGtAYWx1bS5taXQuZWR1IDIwMDctMDctMjIKKworCXJldHVybiBfZmlsZUlzS25vd25XaXRoRXh0
ZW5zaW9ucyhsb2FkZWRGaWxlcywgaW1hZ2VGaWxlLCBfc3RhbmRhcmRFeHRlbnNpb25zKTsKK30K
KworfQpJbmRleDogSW1hZ2VNYW5hZ2VyL1Jhd0ltYWdlRGVjb2Rlci5oCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IEltYWdlTWFuYWdlci9SYXdJbWFnZURlY29kZXIuaAkocmV2aXNpb24gNjkwOTU3KQorKysgSW1h
Z2VNYW5hZ2VyL1Jhd0ltYWdlRGVjb2Rlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOSwxNiArMTks
MjYgQEAKICNkZWZpbmUgUkFXSU1BR0VERUNPREVSX0gKIAogI2luY2x1ZGUgIkltYWdlRGVjb2Rl
ci5oIgorI2luY2x1ZGUgPHFkaWN0Lmg+CiAKIG5hbWVzcGFjZSBJbWFnZU1hbmFnZXIKIHsKIAog
Y2xhc3MgUkFXSW1hZ2VEZWNvZGVyIDogcHVibGljIEltYWdlRGVjb2RlciB7CiBwdWJsaWM6Ci0J
UkFXSW1hZ2VEZWNvZGVyKCkge30KKwlSQVdJbWFnZURlY29kZXIoKSB7IF9pbml0aWFsaXplRXh0
ZW5zaW9uTGlzdHMoKTsgfQogCiAJdmlydHVhbCBib29sIF9kZWNvZGUoUUltYWdlICppbWcsIGNv
bnN0IFFTdHJpbmcmIGltYWdlRmlsZSwgUVNpemUqIGZ1bGxTaXplLCBpbnQgZGltPS0xKTsKIAl2
aXJ0dWFsIGJvb2wgX21pZ2h0RGVjb2RlKCBjb25zdCBRU3RyaW5nJiBpbWFnZUZpbGUgKTsKKwl2
aXJ0dWFsIGJvb2wgX3NraXBUaGlzRmlsZSggY29uc3QgUURpY3Q8dm9pZD4mIGxvYWRlZEZpbGVz
LCBjb25zdCBRU3RyaW5nJiBpbWFnZUZpbGUgKTsKKwlib29sIF9maWxlRXhpc3RzV2l0aEV4dGVu
c2lvbnMoIGNvbnN0IFFTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBRU3RyaW5nTGlzdCYgZXh0ZW5z
aW9uTGlzdCApIGNvbnN0OworCWJvb2wgX2ZpbGVFbmRzV2l0aEV4dGVuc2lvbnMoIGNvbnN0IFFT
dHJpbmcmIGZpbGVOYW1lLCBjb25zdCBRU3RyaW5nTGlzdCYgZXh0ZW5zaW9uTGlzdCApIGNvbnN0
OworCWJvb2wgX2ZpbGVJc0tub3duV2l0aEV4dGVuc2lvbnMoIGNvbnN0IFFEaWN0PHZvaWQ+JiBm
aWxlcywgY29uc3QgUVN0cmluZyYgZmlsZU5hbWUsIGNvbnN0IFFTdHJpbmdMaXN0JiBleHRlbnNp
b25MaXN0ICkgY29uc3Q7Citwcml2YXRlOgorCXN0YXRpYyBRU3RyaW5nTGlzdCBfcmF3RXh0ZW5z
aW9uczsKKwlzdGF0aWMgUVN0cmluZ0xpc3QgX3N0YW5kYXJkRXh0ZW5zaW9uczsKKwlzdGF0aWMg
UVN0cmluZ0xpc3QgX2lnbm9yZWRFeHRlbnNpb25zOworCXN0YXRpYyB2b2lkIF9pbml0aWFsaXpl
RXh0ZW5zaW9uTGlzdHMoKTsKIH07CiAKIH0K
</data>

          </attachment>
      

    </bug>

</bugzilla>