[Box Backup-commit] COMMIT r2782 - box/RELEASE/0.11/bin/bbackupquery

subversion at boxbackup.org subversion at boxbackup.org
Thu Oct 7 14:40:00 BST 2010


Author: chris
Date: 2010-10-07 14:40:00 +0100 (Thu, 07 Oct 2010)
New Revision: 2782

Modified:
   box/RELEASE/0.11/bin/bbackupquery/BackupQueries.cpp
Log:
Finish support for -i option in bbackupquery (thanks to Achim for 
noticing).


Modified: box/RELEASE/0.11/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/RELEASE/0.11/bin/bbackupquery/BackupQueries.cpp	2010-10-05 14:58:10 UTC (rev 2781)
+++ box/RELEASE/0.11/bin/bbackupquery/BackupQueries.cpp	2010-10-07 13:40:00 UTC (rev 2782)
@@ -223,8 +223,8 @@
 		{ "restore", "drif" },
 		{ "help", "" },
 		{ "usage", "m" },
-		{ "undelete", "" },
-		{ "delete", "" },
+		{ "undelete", "i" },
+		{ "delete", "i" },
 		{ NULL, NULL } 
 	};
 
@@ -1008,8 +1008,7 @@
 //			 object ID, depending on opts['i'], where name can
 //			 include a path) and return the file ID, placing the
 //			 directory ID in *pDirIdOut and the filename part
-//			 of the path (if not looking up by ID and not NULL)
-//			 in *pFileNameOut.
+//			 of the path in *pFileNameOut (if not NULL).
 //		Created: 2008-09-12
 //
 // --------------------------------------------------------------------------
@@ -1039,11 +1038,6 @@
 				return 0;
 			}
 		}
-
-		if(pFileNameOut)
-		{
-			*pFileNameOut = fileName;
-		}
 	}
 
 	BackupStoreFilenameClear fn(fileName);
@@ -1106,6 +1100,12 @@
 		*pFlagsOut = en->GetFlags();
 	}
 
+	if(pFileNameOut)
+	{
+		BackupStoreFilenameClear entryName(en->GetName());
+		*pFileNameOut = entryName.GetClearFilename();
+	}
+
 	return fileId;
 }
 




More information about the Boxbackup-commit mailing list