Changeset 2754 for box/trunk/bin

Timestamp:

22/09/2010 22:12:02 (20 months ago)

Author:

chris

Message:

Allow restoring directories with a single argument, using the remote name
as the local destination name also.

Location:

box/trunk/bin/bbackupquery

Files:

• BackupQueries.cpp (modified) (3 diffs)
• documentation.txt (modified) (1 diff)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -1952 +1952 @@
 {
         // Check arguments
-        if(args.size() != 2)
-        {
-                BOX_ERROR("Incorrect usage. restore [-drif] <remote-name> <local-name>");
+        if(args.size() < 1 || args.size() > 2)
+        {
+                BOX_ERROR("Incorrect usage. restore [-drif] <remote-name> "
+                        "[<local-name>]");
                 return;
         }
@@ -1995 +1996 @@
                 return;
         }
+
         if(dirID == BackupProtocolClientListDirectory::RootDirectory)
         {
@@ -2000 +2002 @@
                 return;
         }
-        
-#ifdef WIN32
+
         std::string localName;
-        if(!ConvertConsoleToUtf8(args[1].c_str(), localName)) return;
-#else
-        std::string localName(args[1]);
-#endif
+
+        if(args.size() == 2)
+        {
+                #ifdef WIN32
+                        if(!ConvertConsoleToUtf8(args[1].c_str(), localName))
+                        {
+                                return;
+                        }
+                #else
+                        localName = args[1];
+                #endif
+        }
+        else
+        {
+                localName = args[0];
+        }
 
         // Go and restore...

box/trunk/bin/bbackupquery/documentation.txt

@@ -120 +120 @@
 <
 
-> restore [-drif] <directory-name> <local-directory-name>
+> restore [-drif] <directory-name> [<local-directory-name>]
 
         Restores a directory to the local disc. The local directory specified
-        must not exist (unless a previous restore is being restarted).
+        must not exist (unless a previous restore is being restarted). If the
+        local directory is omitted, the default is to restore to the same
+        directory name and path, relative to the current local directory,
+        as set with the "lcd" command.
 
         The root cannot be restored -- restore locations individually.