From 203f6c073a47e4958294e0eac8e09aa74ed6c861 Mon Sep 17 00:00:00 2001
From: "rjc%netscape.com" <rjc%netscape.com>
Date: Fri, 26 Feb 1999 02:04:28 +0000
Subject: [PATCH] Add RDF file system datasource into builds.

---
 rdf/base/src/nsRDFService.cpp                 |   7 ++-----
 rdf/datasource/public/Makefile.in             |   1 +
 rdf/datasource/public/makefile.win            |   1 +
 rdf/datasource/src/Makefile.in                |   1 +
 rdf/datasource/src/makefile.win               |   1 +
 rdf/datasource/src/nsFileSystemDataSource.cpp |   4 ++--
 rdf/macbuild/rdf.mcp                          | Bin 77740 -> 77740 bytes
 rdf/resources/sidebar.xul                     |   8 +++++++-
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/src/nsRDFService.cpp
index 0b4a515ce465..99ebc02a9726 100644
--- a/rdf/base/src/nsRDFService.cpp
+++ b/rdf/base/src/nsRDFService.cpp
@@ -682,9 +682,6 @@ ServiceImpl::RegisterBuiltInResourceFactories(void)
         "",                NS_NewRDFDefaultResourceFactory,
 //        "mailaccount:",    NS_NewRDFMailAccountResourceFactory,
 //        "mailbox:",        NS_NewRDFMailResourceFactory,
-#if 0
-        "file:",           NS_NewRDFFileResourceFactory,
-#endif
         nsnull,     nsnull
     };
 
@@ -725,15 +722,15 @@ ServiceImpl::RegisterBuiltInNamedDataSources(void)
 {
     extern nsresult NS_NewRDFBookmarkDataSource(nsIRDFDataSource** result);
     extern nsresult NS_NewRDFHistoryDataSource(nsIRDFDataSource** result);
-    extern nsresult NS_NewRDFLocalFileSystemDataSource(nsIRDFDataSource** result);
+    extern nsresult NS_NewRDFFileSystemDataSource(nsIRDFDataSource** result);
 //    extern nsresult NS_NewRDFMailDataSource(nsIRDFDataSource** result);
 
     static DataSourceTable gTable[] = {
         "rdf:bookmarks",      NS_NewRDFBookmarkDataSource,
+        "rdf:files",          NS_NewRDFFileSystemDataSource,
 //        "rdf:mail",           NS_NewRDFMailDataSource, 
 #if 0
         "rdf:history",        NS_NewRDFHistoryDataSource,
-        "rdf:lfs",            NS_NewRDFLocalFileSystemDataSource,
 #endif
         nsnull,               nsnull
     };
diff --git a/rdf/datasource/public/Makefile.in b/rdf/datasource/public/Makefile.in
index abcde3591767..26e9d429f9e3 100644
--- a/rdf/datasource/public/Makefile.in
+++ b/rdf/datasource/public/Makefile.in
@@ -26,6 +26,7 @@ MODULE = rdf
 
 EXPORTS =				\
 	nsIXULContentSink.h		\
+	nsIRDFFileSystem.h		\
         $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/rdf/datasource/public/makefile.win b/rdf/datasource/public/makefile.win
index 867fc0bf148b..a6a8fa5ee615 100644
--- a/rdf/datasource/public/makefile.win
+++ b/rdf/datasource/public/makefile.win
@@ -22,6 +22,7 @@ DEPTH=..\..\..
 
 EXPORTS	= \
         nsIXULContentSink.h \
+	nsIRDFFileSystem.h \
 	$(NULL)
 
 include <$(DEPTH)/config/rules.mak>
diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in
index 688ebf888648..f6b8ca6e1842 100644
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -28,6 +28,7 @@ LIBRARY_NAME = rdfdatasource_s
 
 CPPSRCS =				\
         nsBookmarkDataSource.cpp	\
+        nsFileSystemDataSource.cpp	\
 	nsXULContentSink.cpp		\
 	nsXULDataSource.cpp		\
 	$(NULL)
diff --git a/rdf/datasource/src/makefile.win b/rdf/datasource/src/makefile.win
index df382c036959..95665abd1f7b 100644
--- a/rdf/datasource/src/makefile.win
+++ b/rdf/datasource/src/makefile.win
@@ -21,6 +21,7 @@ LIBRARY_NAME=rdfdatasource_s
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsBookmarkDataSource.obj    \
+        .\$(OBJDIR)\nsFileSystemDataSource.obj  \
         .\$(OBJDIR)\nsXULContentSink.obj        \
         .\$(OBJDIR)\nsXULDataSource.obj         \
 	$(NULL)
diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp
index fc3cd9c8b827..519c47b75904 100644
--- a/rdf/datasource/src/nsFileSystemDataSource.cpp
+++ b/rdf/datasource/src/nsFileSystemDataSource.cpp
@@ -796,9 +796,9 @@ GetFolderList(nsIRDFResource *source, nsVoidArray **array /* out */)
 
 	nsFileURL 		parentDir(uri);
 	nsNativeFileSpec 	nativeDir(parentDir);
-	for (nsDirectoryIterator i(nativeDir); i; i++)
+	for (nsDirectoryIterator i(nativeDir); i.Exists(); i++)
 	{
-		nsNativeFileSpec	nativeSpec = (const nsNativeFileSpec &)i;
+		const nsNativeFileSpec	nativeSpec = (const nsNativeFileSpec &)i;
 		if (!isVisible(nativeSpec))	continue;
 		nsFilePath		filePath(nativeSpec);
 		char			*childURL = filePath;
diff --git a/rdf/macbuild/rdf.mcp b/rdf/macbuild/rdf.mcp
index d15a568752cd382c1456b9503b01ba93efac271a..65a66296ffafad549fd27b1c99322d878326f1d2 100644
GIT binary patch
delta 495
zcmZ2;pJmN`mJO>pWHlHV7#tXZ1Q6!|DKMW2$N=Kf$tO5IGd6AB!MUGtay9oHM)iq~
z$*Rpj$ps7y92E=<JU}KxGefFdK!A}!Ua@D8i(61?aeir0^5z9RM}%ddW-<d+aRD)i
z=GgSxGWP%fdlr-L8_7=IuPVJ+K<Yl@<jG24(-SsNQC`P1S)Y+(v%eZQ8yiO~$b!v`
zQVEQcCn(Qh0Xb@Ov|cEmWL~jbW=?8wWpPPru1jJ`Vlc?oRK4Va>59sX@|zFXWHWCL
zc93A>fV!c1@_B!S&GSPJGfxill4dgx`~QDt8qnb1jFXFe#DRPU28oS8{tw2@?S4RQ
zAe%sTL$w`b-rN!KBA8KNa_Ji9$rsi*ZT`0Ax#{MEx|WQBEN-4Yu0ZuZP`Y$8v%WW@
zrUDQYrLq{kY*6qEj`#Prj^VA1;RP~1eO*I5{9QbK0~BI-<KvU32l6vIP7JV`T-nk(
zdF_4m&F5Y)GHyQn{EI!K_4FO;jFTA`O!v`X)Mm_>UZKGl&zcK#SIhJ}AdxB4IW!sF
cq;z)!g%;$N<m3Zspi5xj(VguXnv5=N0Qql{VgLXD

delta 368
zcmZ2;pJmN`mJO>pWYrlM7#tXZ1Q6!}DKMW2$N=J!$tO5IZ{E+jhjC&6%j9bAITKw{
z1e<_z3m6zUVi_2CfJ}y_iH@R^->FJ%-p#X8SOh4*48&Yenq$*%t!<MPn?*KHP*}_~
z(Is*6ZrwSXbyUQdCI+xh)@S6{?4`!dw)wk3I^*WMk1QEC|I*vWJDpjO(RuR%w*=<R
z!448^o9&vd8G+mlOp_-luuP8f5@%D}!oZMcviYOIZ^p?*KH_W|-3$zx_kjE#jGNp2
z5L(tTZSIJ85zGp74TJFH!Zpsqi6DOhK@tNWm`-M3n!J9E`(~lFr%fl@T)wxN>jFFT
z=5sF?88;t({>7frVfqer#>tFxru%3xYBQ!xuh3wOXDtM3oiqIoNMyov4oyZkDdh<u
Xq1=+3d>{=9Jt)vUusuVQ(S;2FUU_PH

diff --git a/rdf/resources/sidebar.xul b/rdf/resources/sidebar.xul
index 61e5a3b18f9a..0d8fe1467f8c 100644
--- a/rdf/resources/sidebar.xul
+++ b/rdf/resources/sidebar.xul
@@ -6,7 +6,7 @@
   xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns:rdf="http://www.w3.org/TR/WD-rdf-syntax#">
 
-<xul:tree xul:datasources="rdf:bookmarks rdf:mail">
+<xul:tree xul:datasources="rdf:files rdf:bookmarks rdf:mail">
   <xul:treecol rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
   <xul:treecol rdf:resource="http://home.netscape.com/NC-rdf#URL"/>
   <xul:treecol rdf:resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"/>
@@ -49,6 +49,12 @@
       <xul:treecell></xul:treecell>
     </xul:treeitem>
 
+    <xul:treeitem xul:id="NC:FilesRoot">
+      <xul:treecell>File System</xul:treecell>
+      <xul:treecell></xul:treecell>
+      <xul:treecell></xul:treecell>
+    </xul:treeitem>
+
     <xul:treeitem xul:id="NC:MailRoot">
       <xul:treecell>Mail</xul:treecell>
       <xul:treecell></xul:treecell>