[Box Backup-commit] COMMIT r2783 - box/trunk/bin/bbackupquery
subversion at boxbackup.org
subversion at boxbackup.org
Thu Oct 7 14:44:05 BST 2010
Author: chris
Date: 2010-10-07 14:44:04 +0100 (Thu, 07 Oct 2010)
New Revision: 2783
Modified:
box/trunk/bin/bbackupquery/BackupQueries.cpp
Log:
Finish support for -i option in bbackupquery (thanks to Achim for
noticing) (forward port to trunk).
Modified: box/trunk/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/trunk/bin/bbackupquery/BackupQueries.cpp 2010-10-07 13:40:00 UTC (rev 2782)
+++ box/trunk/bin/bbackupquery/BackupQueries.cpp 2010-10-07 13:44:04 UTC (rev 2783)
@@ -455,9 +455,9 @@
{CompleteRestoreRemoteDirOrId, CompleteLocalDir} },
{ "help", "", Command_Help, {} },
{ "usage", "m", Command_Usage, {} },
- { "undelete", "", Command_Undelete,
+ { "undelete", "i", Command_Undelete,
{CompleteGetFileOrId} },
- { "delete", "", Command_Delete, {CompleteGetFileOrId} },
+ { "delete", "i", Command_Delete, {CompleteGetFileOrId} },
{ NULL, NULL, Command_Unknown, {} }
};
@@ -1418,8 +1418,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
//
// --------------------------------------------------------------------------
@@ -1449,11 +1448,6 @@
return 0;
}
}
-
- if(pFileNameOut)
- {
- *pFileNameOut = fileName;
- }
}
BackupStoreFilenameClear fn(fileName);
@@ -1516,6 +1510,12 @@
*pFlagsOut = en->GetFlags();
}
+ if(pFileNameOut)
+ {
+ BackupStoreFilenameClear entryName(en->GetName());
+ *pFileNameOut = entryName.GetClearFilename();
+ }
+
return fileId;
}
More information about the Boxbackup-commit
mailing list